diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-02-08 16:47:07 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-02-08 16:47:07 +0200 |
| commit | 9b3d316bf51e5615d7259f93aa7acace3df0268e (patch) | |
| tree | e76b1b61477032ec8b54f8542ca21150d0fb3a70 /indra/newview | |
| parent | e35fc6042e6f15d2d7c26fbfcce8a534eb7f6e16 (diff) | |
MAINT-6109 Translate some strings received from server
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llviewermessage.cpp | 19 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/strings.xml | 2 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/ru/strings.xml | 6 |
3 files changed, 27 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index e5abbf7683..05e00ea987 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2360,6 +2360,20 @@ static void god_message_name_cb(const LLAvatarName& av_name, LLChat chat, std::s } } +const std::string NOT_ONLINE_MSG("User not online - message will be stored and delivered later."); +const std::string NOT_ONLINE_INVENTORY("User not online - inventory has been saved."); +void translate_if_needed(std::string& message) +{ + if (message == NOT_ONLINE_MSG) + { + message = LLTrans::getString("not_online_msg"); + } + else if (message == NOT_ONLINE_INVENTORY) + { + message = LLTrans::getString("not_online_inventory"); + } +} + void process_improved_im(LLMessageSystem *msg, void **user_data) { LLUUID from_id; @@ -2424,6 +2438,11 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) chat.mFromID = from_id; chat.mFromName = name; chat.mSourceType = (from_id.isNull() || (name == std::string(SYSTEM_FROM))) ? CHAT_SOURCE_SYSTEM : CHAT_SOURCE_AGENT; + + if (chat.mSourceType == CHAT_SOURCE_SYSTEM) + { // Translate server message if required (MAINT-6109) + translate_if_needed(message); + } LLViewerObject *source = gObjectList.findObject(session_id); //Session ID is probably the wrong thing. if (source) diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index f2eddbb38e..ff98d2f109 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3530,6 +3530,8 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="IM_unblock_only_groups_friends">To see this message, you must uncheck 'Only friends and groups can call or IM me' in Preferences/Privacy.</string> <string name="OnlineStatus">Online</string> <string name="OfflineStatus">Offline</string> + <string name="not_online_msg">User not online - message will be stored and delivered later.</string> + <string name="not_online_inventory">User not online - inventory has been saved.</string> <!-- voice calls --> <string name="answered_call">Your call has been answered</string> diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml index 0d64b2cae9..18ae202230 100755 --- a/indra/newview/skins/default/xui/ru/strings.xml +++ b/indra/newview/skins/default/xui/ru/strings.xml @@ -4223,6 +4223,12 @@ support@secondlife.com. <string name="OfflineStatus"> Оффлайн </string> + <string name="not_online_msg"> + Пользователь оффлайн - сообщение будет сохранено и доставлено позже. + </string> + <string name="not_online_inventory"> + Пользователь оффлайн - инвентарь сохранен. + </string> <string name="answered_call"> На ваш звонок ответили </string> |