diff options
| author | Seth ProductEngine <slitovchuk@productengine.com> | 2010-09-29 21:44:30 +0300 |
|---|---|---|
| committer | Seth ProductEngine <slitovchuk@productengine.com> | 2010-09-29 21:44:30 +0300 |
| commit | 62a46df736cf88d7a2ad4bd55e285e4026328eb9 (patch) | |
| tree | ae6a5e8e4fb834a8fb69e086913c7065d01b702b | |
| parent | cb3042d84d51532c0b6953b69bdc8f9651ea7631 (diff) | |
STORM-269 FIXED Added strings for missing land types in strings.xml
If localized land type name is not found it is displayed as original string to avoid MissingString error.
| -rw-r--r-- | indra/newview/llfloaterland.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index df0d22561e..e124263db5 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -565,7 +565,10 @@ void LLPanelLandGeneral::refresh() if (regionp) { insert_maturity_into_textbox(mContentRating, gFloaterView->getParentFloater(this), MATURITY); - mLandType->setText(LLTrans::getString(regionp->getSimProductName())); + + std::string land_type; + bool is_land_type_localized = LLTrans::findString(land_type, regionp->getSimProductName()); + mLandType->setText(is_land_type_localized ? land_type : regionp->getSimProductName()); } // estate owner/manager cannot edit other parts of the parcel diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 6b3fd9ff9e..8470d91b8c 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -321,6 +321,8 @@ <!-- For land type back from the simulator --> <string name="Estate / Full Region">Estate / Full Region</string> + <string name="Estate / Homestead">Estate / Homestead</string> + <string name="Mainland / Homestead">Mainland / Homestead</string> <string name="Mainland / Full Region">Mainland / Full Region</string> <!-- File load/save dialogs --> |