diff options
| author | Andrew Dyukov <adyukov@productengine.com> | 2010-03-03 15:02:04 +0200 |
|---|---|---|
| committer | Andrew Dyukov <adyukov@productengine.com> | 2010-03-03 15:02:04 +0200 |
| commit | b5df36f81f21cf490695b8f5f47e29b334083925 (patch) | |
| tree | e323a1d5bf221ca8f7a9184fb763a6e28d41aa69 | |
| parent | 36a428c020bae579bc2eccf659f741d1e93d447c (diff) | |
Fixed normal bug EXT-5885 ([HARD CODED] - The busy response should be localized. hard coded in llviewermessage.cpp).
- It wasn't hardcoded in llviewermessage.cpp, but xml which contains it is not localizable. Added string with default busy message to strings.xml
and used it in LLFloaterPreference::cleanupBadSetting().
--HG--
branch : product-engine
| -rw-r--r-- | indra/newview/llfloaterpreference.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 780393a9c0..224514dd48 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -985,7 +985,8 @@ void LLFloaterPreference::cleanupBadSetting() if (gSavedPerAccountSettings.getString("BusyModeResponse2") == "|TOKEN COPY BusyModeResponse|") { llwarns << "cleaning old BusyModeResponse" << llendl; - gSavedPerAccountSettings.setString("BusyModeResponse2", gSavedPerAccountSettings.getText("BusyModeResponse")); + //LLTrans::getString("BusyModeResponseDefault") is used here for localization (EXT-5885) + gSavedPerAccountSettings.setString("BusyModeResponse2", LLTrans::getString("BusyModeResponseDefault")); } } diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 455b4be264..2510d8b49f 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2104,6 +2104,9 @@ Clears (deletes) the media and all params from the given face. <!-- panel contents --> <string name="PanelContentsNewScript">New Script</string> + <!-- panel preferences general --> + <string name="BusyModeResponseDefault">The Resident you messaged is in 'busy mode' which means they have requested not to be disturbed. Your message will still be shown in their IM panel for later viewing.</string> + <!-- Mute --> <string name="MuteByName">(by name)</string> <string name="MuteAgent">(Resident)</string> |