From 2301c7cff60eca879f605a3ee3f26b960597d8c3 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Thu, 18 Oct 2012 13:16:00 -0700
Subject: [PATCH] CHUI-329: Post code review commit, instead of hard coded the
parenthesis, created a custom string in string.xml. The reasoning for this is
because some languages may not use the parenthesis or perhaps even use
brackets if needed...basically allows for flexibility.
---
indra/newview/llimfloatercontainer.cpp | 11 +----------
indra/newview/skins/default/xui/en/strings.xml | 1 +
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp
index 6edda76ad28..5d328bb2832 100644
--- a/indra/newview/llimfloatercontainer.cpp
+++ b/indra/newview/llimfloatercontainer.cpp
@@ -1175,18 +1175,9 @@ void LLIMFloaterContainer::setNearbyDistances()
void LLIMFloaterContainer::addConversationListItem(const LLUUID& uuid, bool isWidgetSelected /*= false*/)
{
bool is_nearby_chat = uuid.isNull();
- std::string display_name;
//Stores the display name for the conversation line item
- if(is_nearby_chat)
- {
- //Adds parenthesis in code since these are independent of the translated string
- display_name = "(" + LLTrans::getString("NearbyChatTitle") + ")";
- }
- else
- {
- display_name = LLIMModel::instance().getName(uuid);
- }
+ std::string display_name = is_nearby_chat ? LLTrans::getString("NearbyChatLabel") : LLIMModel::instance().getName(uuid);
// Check if the item is not already in the list, exit if it is and has the same name and uuid (nothing to do)
// Note: this happens often, when reattaching a torn off conversation for instance
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 696c2828870..01da0a3686e 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -385,6 +385,7 @@ Please try logging in again in a minute.</string>
<!-- Chat -->
<string name="NearbyChatTitle">Nearby chat</string>
+ <string name="NearbyChatLabel">(Nearby chat)</string>
<string name="whisper">whispers:</string>
<string name="shout">shouts:</string>
<string name="ringing">Connecting to in-world Voice Chat...</string>
--
GitLab