diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-29 09:53:34 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-29 09:53:34 -0400 |
| commit | 4425f9b8217bcd6515412e4d6e1b885d79b08a9a (patch) | |
| tree | a9b1f8600bffe1f69a52d37de3a27c2080e0c7d3 | |
| parent | 060d2f3c5ef1eb6882fe4f69fcde2471138542c8 (diff) | |
| parent | d66545d17ff1aa30a3840928fa38a919ddec0a53 (diff) | |
merge changes for storm-1326
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/llfloaterauction.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/llfloatersellland.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 3 |
4 files changed, 8 insertions, 2 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index da60b9e47f..93cb035d89 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -450,6 +450,7 @@ Jonathan Yap STORM-899 STORM-1273 STORM-1292 + STORM-1326 Kage Pixel VWR-11 Ken March diff --git a/indra/newview/llfloaterauction.cpp b/indra/newview/llfloaterauction.cpp index c95b046707..c6743ca13b 100644 --- a/indra/newview/llfloaterauction.cpp +++ b/indra/newview/llfloaterauction.cpp @@ -55,6 +55,7 @@ #include "llrender.h" #include "llsdutil.h" #include "llsdutil_math.h" +#include "lltrans.h" ///---------------------------------------------------------------------------- /// Local function declarations, constants, enums, and typedefs @@ -457,7 +458,7 @@ void LLFloaterAuction::onClickSellToAnyone(void* data) LLSD args; args["LAND_SIZE"] = llformat("%d", area); args["SALE_PRICE"] = llformat("%d", sale_price); - args["NAME"] = "Anyone"; + args["NAME"] = LLTrans::getString("Anyone"); LLNotification::Params params("ConfirmLandSaleChange"); // Re-use existing dialog params.substitutions(args) diff --git a/indra/newview/llfloatersellland.cpp b/indra/newview/llfloatersellland.cpp index 8558a1277c..3434841d09 100644 --- a/indra/newview/llfloatersellland.cpp +++ b/indra/newview/llfloatersellland.cpp @@ -41,6 +41,7 @@ #include "llviewerparcelmgr.h" #include "lluictrlfactory.h" #include "llviewerwindow.h" +#include "lltrans.h" class LLAvatarName; @@ -451,7 +452,7 @@ void LLFloaterSellLandUI::doSellLand(void *userdata) // Do a confirmation S32 sale_price = self->getChild<LLUICtrl>("price")->getValue(); S32 area = parcel->getArea(); - std::string authorizedBuyerName = "Anyone"; + std::string authorizedBuyerName = LLTrans::getString("Anyone"); bool sell_to_anyone = true; if ("user" == self->getChild<LLUICtrl>("sell_to")->getValue().asString()) { diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 71f48c833d..143a989d32 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2250,6 +2250,9 @@ Returns a string with the requested data about the region <string name="IMMainland">mainland</string> <string name="IMTeen">teen</string> + <!-- floater about land --> + <string name="Anyone">anyone</string> + <!-- floater region info --> <!-- The following will replace variable [ALL_ESTATES] in notifications EstateAllowed*, EstateBanned*, EstateManager* --> <string name="RegionInfoError">error</string> |