diff options
author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2020-09-23 12:27:38 +0300 |
---|---|---|
committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2020-09-23 12:27:38 +0300 |
commit | 74f8fd572164ba84f3b4e47a83c93b56f6fc91fc (patch) | |
tree | 84b03196ad5d0a94e2f1322ea753206da2b24044 /indra/newview | |
parent | f6bc93ceed7d462b232ce2711a7525bb71e5f691 (diff) |
Revert "SL-13814 Updated label text"
This reverts commit 1557cd8fe2733c32c7788daf752fe23c7190947f.
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/llfloaterbuycurrency.cpp | 7 | ||||
-rw-r--r-- | indra/newview/llviewermenu.cpp | 2 | ||||
-rw-r--r-- | indra/newview/llviewermenufile.cpp | 10 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 8 |
4 files changed, 15 insertions, 12 deletions
diff --git a/indra/newview/llfloaterbuycurrency.cpp b/indra/newview/llfloaterbuycurrency.cpp index dfc755c370..b183ba6912 100644 --- a/indra/newview/llfloaterbuycurrency.cpp +++ b/indra/newview/llfloaterbuycurrency.cpp @@ -59,6 +59,7 @@ public: LLCurrencyUIManager mManager; bool mHasTarget; + std::string mTargetName; S32 mTargetPrice; S32 mRequiredAmount; @@ -115,13 +116,9 @@ void LLFloaterBuyCurrencyUI::noTarget() void LLFloaterBuyCurrencyUI::target(const std::string& name, S32 price) { mHasTarget = true; + mTargetName = name; mTargetPrice = price; - if (!name.empty()) - { - getChild<LLUICtrl>("target_price_label")->setValue(name); - } - S32 balance = gStatusBar->getBalance(); S32 need = price - balance; if (need < 0) diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 546d8e5377..b333b94462 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -4897,7 +4897,7 @@ void handle_buy_or_take() { LLStringUtil::format_map_t args; args["AMOUNT"] = llformat("%d", total_price); - LLBuyCurrencyHTML::openCurrencyFloater( LLTrans::getString( "this_object_costs", args ), total_price ); + LLBuyCurrencyHTML::openCurrencyFloater( LLTrans::getString( "BuyingCosts", args ), total_price ); } } else diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index 7d52607cba..cd48b1e8e7 100644 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -825,7 +825,10 @@ void upload_done_callback( if(!(can_afford_transaction(expected_upload_cost))) { - LLBuyCurrencyHTML::openCurrencyFloater( "", expected_upload_cost ); + LLStringUtil::format_map_t args; + args["NAME"] = data->mAssetInfo.getName(); + args["AMOUNT"] = llformat("%d", expected_upload_cost); + LLBuyCurrencyHTML::openCurrencyFloater( LLTrans::getString("UploadingCosts", args), expected_upload_cost ); is_balance_sufficient = FALSE; } else if(region) @@ -959,7 +962,10 @@ void upload_new_resource( if (balance < uploadInfo->getExpectedUploadCost()) { // insufficient funds, bail on this upload - LLBuyCurrencyHTML::openCurrencyFloater("", uploadInfo->getExpectedUploadCost()); + LLStringUtil::format_map_t args; + args["NAME"] = uploadInfo->getName(); + args["AMOUNT"] = llformat("%d", uploadInfo->getExpectedUploadCost()); + LLBuyCurrencyHTML::openCurrencyFloater(LLTrans::getString("UploadingCosts", args), uploadInfo->getExpectedUploadCost()); return; } } diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 3f06d658d7..c9ea423a20 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2833,6 +2833,7 @@ If you continue to receive this message, please contact Second Life support for <string name="AcquiredItems">Acquired Items</string> <string name="Cancel">Cancel</string> <string name="UploadingCosts">Uploading [NAME] costs L$ [AMOUNT]</string> + <string name="BuyingCosts">Buying this costs L$ [AMOUNT]</string> <string name="UnknownFileExtension"> Unknown file extension .%s Expected .wav, .tga, .bmp, .jpg, .jpeg, or .anim @@ -3788,12 +3789,11 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="to upload">to upload</string> <string name="to publish a classified ad">to publish a classified ad</string> + <string name="giving">Giving L$ [AMOUNT]</string> <string name="uploading_costs">Uploading costs L$ [AMOUNT]</string> <string name="this_costs">This costs L$ [AMOUNT]</string> - - <string name="buying_selected_land">This land costs</string> - <string name="this_object_costs">This item costs</string> - <string name="giving">You want to give</string> + <string name="buying_selected_land">Buying selected land for L$ [AMOUNT]</string> + <string name="this_object_costs">This object costs L$ [AMOUNT]</string> <string name="group_role_everyone">Everyone</string> <string name="group_role_officers">Officers</string> |