diff options
| author | Lynx Linden <lynx@lindenlab.com> | 2010-02-03 13:44:13 +0000 |
|---|---|---|
| committer | Lynx Linden <lynx@lindenlab.com> | 2010-02-03 13:44:13 +0000 |
| commit | 98a4d472bed18e11d71631e7c0cc9abd29b9a5d2 (patch) | |
| tree | 739562b4da885c32da484f074977a0fdee001752 /indra/newview | |
| parent | 8cbea388eaad8b40faa604f9d7fa2a64570548e2 (diff) | |
EXT-4898: Changed English language code to "en" on Mac.
Now LLUI::getLanguage() returns a result that is consistent on Mac,
Windows, and Linux. Also, cleaned up some legacy language code.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/English.lproj/language.txt | 2 | ||||
| -rw-r--r-- | indra/newview/llmediactrl.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 20 |
3 files changed, 4 insertions, 22 deletions
diff --git a/indra/newview/English.lproj/language.txt b/indra/newview/English.lproj/language.txt index bc0aa577f9..2c4c454fdd 100644 --- a/indra/newview/English.lproj/language.txt +++ b/indra/newview/English.lproj/language.txt @@ -1 +1 @@ -en-us
\ No newline at end of file +en
\ No newline at end of file diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp index d464862eed..3c34d26692 100644 --- a/indra/newview/llmediactrl.cpp +++ b/indra/newview/llmediactrl.cpp @@ -542,9 +542,9 @@ void LLMediaCtrl::navigateToLocalPage( const std::string& subdir, const std::str if (! gDirUtilp->fileExists(expanded_filename)) { - if (language != "en-us") + if (language != "en") { - expanded_filename = gDirUtilp->findSkinnedFilename("html", "en-us", filename); + expanded_filename = gDirUtilp->findSkinnedFilename("html", "en", filename); if (! gDirUtilp->fileExists(expanded_filename)) { llwarns << "File " << subdir << delim << filename_in << "not found" << llendl; diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index f7f30a5136..3e23ac4a1c 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -7179,25 +7179,7 @@ void handle_buy_currency_test(void*) LLStringUtil::format_map_t replace; replace["[AGENT_ID]"] = gAgent.getID().asString(); replace["[SESSION_ID]"] = gAgent.getSecureSessionID().asString(); - - // *TODO: Replace with call to LLUI::getLanguage() after windows-setup - // branch merges in. JC - std::string language = "en"; - language = gSavedSettings.getString("Language"); - if (language.empty() || language == "default") - { - language = gSavedSettings.getString("InstallLanguage"); - } - if (language.empty() || language == "default") - { - language = gSavedSettings.getString("SystemLanguage"); - } - if (language.empty() || language == "default") - { - language = "en"; - } - - replace["[LANGUAGE]"] = language; + replace["[LANGUAGE]"] = LLUI::getLanguage(); LLStringUtil::format(url, replace); llinfos << "buy currency url " << url << llendl; |