From c645e9e59e9e0a83a25f2c782ac79c21d519939e Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Mon, 25 Jul 2011 17:34:06 +0300 Subject: STORM-1220 FIXED Localized sim product name (e.g. "Estate / Full Region") everywhere. --- indra/newview/llviewerregion.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra/newview/llviewerregion.cpp') diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index bb7170e0f7..c33b39b449 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -558,6 +558,12 @@ const std::string LLViewerRegion::getSimAccessString() const return accessToString(mSimAccess); } +std::string LLViewerRegion::getLocalizedSimProductName() const +{ + const std::string& spn = getSimProductName(); + std::string localized_spn; + return LLTrans::findString(localized_spn, spn) ? localized_spn : spn; +} // static std::string LLViewerRegion::regionFlagsToString(U32 flags) -- cgit v1.2.3 From 7e405ef0e3efce400db53ddc16d367680da659c9 Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Mon, 25 Jul 2011 23:46:28 +0300 Subject: STORM-1220 FOLLOWUP Prevent displaying unlocalized sim product name. Removed LLViewerRegion::getSimProductName() so that it doesn't mistakenly get used in UI code, thus causing localization bugs. --- indra/newview/llviewerregion.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'indra/newview/llviewerregion.cpp') diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index c33b39b449..d4e0831c33 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -560,9 +560,8 @@ const std::string LLViewerRegion::getSimAccessString() const std::string LLViewerRegion::getLocalizedSimProductName() const { - const std::string& spn = getSimProductName(); std::string localized_spn; - return LLTrans::findString(localized_spn, spn) ? localized_spn : spn; + return LLTrans::findString(localized_spn, mProductName) ? localized_spn : mProductName; } // static -- cgit v1.2.3