From a58551c0502e30fd4c4b03e8388fe010ed492fea Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Mon, 15 Mar 2010 10:32:51 +0200
Subject: Fixed normal task EXT-6024 - [TRANSLATED BUT IN EN] Side Bar > Edit
 Pick - "(will update after save)" Replaced hardcoded string with xml string.
 Reviewed by Leyla Farazha
 https://codereview.productengine.com/secondlife/r/8/

--HG--
branch : product-engine
---
 indra/newview/llpanelpick.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'indra/newview/llpanelpick.cpp')

diff --git a/indra/newview/llpanelpick.cpp b/indra/newview/llpanelpick.cpp
index 5ac0587550..82bbcaf38b 100644
--- a/indra/newview/llpanelpick.cpp
+++ b/indra/newview/llpanelpick.cpp
@@ -76,8 +76,6 @@
 #define LABEL_PICK = "Pick"
 #define LABEL_CHANGES = "Changes"
 
-std::string SET_LOCATION_NOTICE("(will update after save)");
-
 //////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////
@@ -410,7 +408,7 @@ void LLPanelPickEdit::onOpen(const LLSD& key)
 		childSetValue("pick_name", pick_name.empty() ? region_name : pick_name);
 		childSetValue("pick_desc", pick_desc);
 		setSnapshotId(snapshot_id);
-		setPickLocation(createLocationText(SET_LOCATION_NOTICE, pick_name, region_name, getPosGlobal()));
+		setPickLocation(createLocationText(getLocationNotice(), pick_name, region_name, getPosGlobal()));
 
 		enableSaveButton(true);
 	}
@@ -578,7 +576,7 @@ void LLPanelPickEdit::onClickSetLocation()
 		region_name = region->getName();
 	}
 
-	setPickLocation(createLocationText(SET_LOCATION_NOTICE, parcel_name, region_name, getPosGlobal()));
+	setPickLocation(createLocationText(getLocationNotice(), parcel_name, region_name, getPosGlobal()));
 
 	mLocationChanged = true;
 	enableSaveButton(TRUE);
@@ -595,6 +593,12 @@ void LLPanelPickEdit::onClickSave()
 	notifyParent(params);
 }
 
+std::string LLPanelPickEdit::getLocationNotice()
+{
+	static std::string notice = getString("location_notice");
+	return notice;
+}
+
 void LLPanelPickEdit::processProperties(void* data, EAvatarProcessorType type)
 {
 	if(mNeedData)
-- 
cgit v1.3


From 220c0e9479b8d4eea92eb0483a59068631eaebbf Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Tue, 16 Mar 2010 17:36:44 +0200
Subject: Fixed normal task EXT-6025 - [HARD CODED] Side Bar : "Save Pick" -
 "Pick" is in EN (Save [WHAT]) Removed unused hardcoded strings, replaced
 "Save [WHAT]" with simple "Save Pick" as it's the only label needed for this
 button. Reviewer by Kent Quirk
 https://codereview.productengine.com/secondlife/r/28/

--HG--
branch : product-engine
---
 indra/newview/llpanelpick.cpp                          | 6 ------
 indra/newview/skins/default/xui/en/panel_edit_pick.xml | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'indra/newview/llpanelpick.cpp')

diff --git a/indra/newview/llpanelpick.cpp b/indra/newview/llpanelpick.cpp
index 82bbcaf38b..f0dc493ebe 100644
--- a/indra/newview/llpanelpick.cpp
+++ b/indra/newview/llpanelpick.cpp
@@ -72,10 +72,6 @@
 #define XML_BTN_ON_TXTR "edit_icon"
 #define XML_BTN_SAVE "save_changes_btn"
 
-#define SAVE_BTN_LABEL "[WHAT]"
-#define LABEL_PICK = "Pick"
-#define LABEL_CHANGES = "Changes"
-
 //////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////
@@ -148,8 +144,6 @@ BOOL LLPanelPickInfo::postBuild()
 {
 	mSnapshotCtrl = getChild<LLTextureCtrl>(XML_SNAPSHOT);
 
-	childSetLabelArg(XML_BTN_SAVE, SAVE_BTN_LABEL, std::string("Pick"));
-
 	childSetAction("teleport_btn", boost::bind(&LLPanelPickInfo::onClickTeleport, this));
 	childSetAction("show_on_map_btn", boost::bind(&LLPanelPickInfo::onClickMap, this));
 	childSetAction("back_btn", boost::bind(&LLPanelPickInfo::onClickBack, this));
diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
index 15517fb805..08ee0306dd 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
@@ -183,7 +183,7 @@
         <button
          follows="bottom|left"
          height="23"
-         label="Save [WHAT]"
+         label="Save Pick"
          layout="topleft"
          name="save_changes_btn"
          left="0"
-- 
cgit v1.3