diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llpaneldirfind.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/linden/indra/newview/llpaneldirfind.cpp b/linden/indra/newview/llpaneldirfind.cpp index cc0a700..ff4286b 100644 --- a/linden/indra/newview/llpaneldirfind.cpp +++ b/linden/indra/newview/llpaneldirfind.cpp | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2001-2008, Linden Research, Inc. | 7 | * Copyright (c) 2001-2009, Linden Research, Inc. |
8 | * | 8 | * |
9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
@@ -321,15 +321,8 @@ std::string LLPanelDirFind::getSearchURLSuffix(bool mature_in) | |||
321 | substring = "[SESSION]"; | 321 | substring = "[SESSION]"; |
322 | url.replace(url.find(substring), substring.length(), session_string); | 322 | url.replace(url.find(substring), substring.length(), session_string); |
323 | 323 | ||
324 | // set the currently selected lanaguage by asking the pref setting | 324 | // set the currently selected language by asking the pref setting |
325 | std::string language_string = LLUI::sConfigGroup->getString( "Language" ); | 325 | std::string language_string = LLUI::getLanguage(); |
326 | if ( language_string == "default" ) | ||
327 | { | ||
328 | // if "default system language" setting used, ask again | ||
329 | // (we can't do this directly since it can vary if you install | ||
330 | // under one language and select a different one using prefs) | ||
331 | language_string = gSavedSettings.getString( "SystemLanguage" ); | ||
332 | } | ||
333 | std::string language_tag = "[LANG]"; | 326 | std::string language_tag = "[LANG]"; |
334 | url.replace( url.find( language_tag ), language_tag.length(), language_string ); | 327 | url.replace( url.find( language_tag ), language_tag.length(), language_string ); |
335 | 328 | ||