summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAdam <Adam@anope.org>2014-05-20 11:41:05 -0400
committerAdam <Adam@anope.org>2014-05-20 11:41:05 -0400
commit4034b3054aaff28da1db5545063cf8b3c2e8aa24 (patch)
tree0bb3100a6df2a97965eeea345c9395fcd446a692 /src
parente5811586450a8818f46f7d668afbfbcb42c08037 (diff)
Add English language file which users can edit to modify language strings
Diffstat (limited to 'src')
-rw-r--r--src/language.cpp7
-rw-r--r--src/win32/windows.cpp1
2 files changed, 1 insertions, 7 deletions
diff --git a/src/language.cpp b/src/language.cpp
index fdfb4c15e..bf99a4707 100644
--- a/src/language.cpp
+++ b/src/language.cpp
@@ -76,19 +76,12 @@ const char *Language::Translate(const NickCore *nc, const char *string)
#if GETTEXT_FOUND
-/* Used by gettext to make it always dynamically load language strings (so we can drop them in while Anope is running) */
extern "C" int _nl_msg_cat_cntr;
const char *Language::Translate(const char *lang, const char *string)
{
if (!string || !*string)
return "";
-
- if (!lang || !*lang)
- lang = Config->DefLanguage.c_str();
-
- if (Anope::string(lang) == "en")
- return string;
++_nl_msg_cat_cntr;
#ifdef _WIN32
diff --git a/src/win32/windows.cpp b/src/win32/windows.cpp
index a9e0521d0..04eb2fae3 100644
--- a/src/win32/windows.cpp
+++ b/src/win32/windows.cpp
@@ -26,6 +26,7 @@ static struct WindowsLanguage
{"ca_ES", LANG_CATALAN},
{"de_DE", LANG_GERMAN},
{"el_GR", LANG_GREEK},
+ {"en_US", LANG_ENGLISH},
{"es_ES", LANG_SPANISH},
{"fr_FR", LANG_FRENCH},
{"hu_HU", LANG_HUNGARIAN},