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/llviewermenu.cpp | |
| 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/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 20 |
1 files changed, 1 insertions, 19 deletions
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; |