From 632afda4dd8abc5bfc7b3a47d4f7bef44fa2f821 Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Wed, 17 Mar 2010 14:02:54 +0200 Subject: Code cleanup: remove superfluous call of the setToolTip method. These calls were added while working on two separate tickets - EXT - 6027 ([TRANSLATED BUT IN EN] Bubble shown when you mouseover on system folder within Inventory > Library) (37baa70ea94b) - (EXT-6355) [TRANSLATED BUT IN EN] - Inventory, hovertext of system folders: hovertext isn?t localized. (80b6110ba41e) --HG-- branch : product-engine --- indra/newview/llfolderviewitem.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp index 8b3ba6c72b..72e34594db 100644 --- a/indra/newview/llfolderviewitem.cpp +++ b/indra/newview/llfolderviewitem.cpp @@ -258,7 +258,6 @@ void LLFolderViewItem::refreshFromListener() if (LLFolderType::lookupIsProtectedType(preferred_type)) { LLTrans::findString(mLabel, "InvFolder " + mLabel); - setToolTip(mLabel); }; setToolTip(mLabel); -- cgit v1.2.3 From 464092e2c9354c62143f3cbf5503445e6e6fe84e Mon Sep 17 00:00:00 2001 From: Paul Guslisty Date: Wed, 17 Mar 2010 14:17:35 +0200 Subject: Fixed normal EXT - 6028 ( [HARD CODED]? Inventory > Library > \"Accessories\" folder) Added localization string to the strings.xml for Accessories folder and localization support of Accessories folder from source code (llfolderviewitem.cpp). TRANSLATION TO THE CORRESPONDING LANGUAGE -- this string should be added to the strings.xml for each locale. Note: due to Accessories category is created out of viewer & has the FT_NONE type it can not be localized as other protected (system) categories. So, hack was provided to check this folder (in a Library) & localize it. Reviewd by Mike Antipov at https://codereview.productengine.com/secondlife/r/42/ --HG-- branch : product-engine --- indra/newview/llfolderviewitem.cpp | 20 +++++++++++++++++++- indra/newview/skins/default/xui/en/strings.xml | 1 + 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp index 72e34594db..bb4c75d3ac 100644 --- a/indra/newview/llfolderviewitem.cpp +++ b/indra/newview/llfolderviewitem.cpp @@ -255,7 +255,25 @@ void LLFolderViewItem::refreshFromListener() // temporary attempt to display the inventory folder in the user locale. // mantipov: *NOTE: be sure this code is synchronized with LLFriendCardsManager::findChildFolderUUID // it uses the same way to find localized string - if (LLFolderType::lookupIsProtectedType(preferred_type)) + + // HACK: EXT - 6028 ([HARD CODED]? Inventory > Library > "Accessories" folder) + // Translation of Accessories folder in Library inventory folder + bool accessories = false; + if(mLabel == std::string("Accessories")) + { + //To ensure that Accessories folder is in Library we have to check its parent folder. + //Due to parent LLFolderViewFloder is not set to this item yet we have to check its parent via Inventory Model + LLInventoryCategory* cat = gInventory.getCategory(mListener->getUUID()); + if(cat) + { + const LLUUID& parent_folder_id = cat->getParentUUID(); + accessories = (parent_folder_id == gInventory.getLibraryRootFolderID()); + } + } + + //"Accessories" inventory category has folder type FT_NONE. So, this folder + //can not be detected as protected with LLFolderType::lookupIsProtectedType + if (accessories || LLFolderType::lookupIsProtectedType(preferred_type)) { LLTrans::findString(mLabel, "InvFolder " + mLabel); }; diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index da39f13726..eb45a9765b 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -1894,6 +1894,7 @@ Clears (deletes) the media and all params from the given face. Favorites Current Outfit My Outfits + Accessories Friends -- cgit v1.2.3 From 733a9275a615ffa678f52356ad4eefae80db52f4 Mon Sep 17 00:00:00 2001 From: Igor Borovkov Date: Wed, 17 Mar 2010 14:34:15 +0200 Subject: replaced SL Logo EXT-4819 [NUX] New Application Icon Integration Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/46/ --HG-- branch : product-engine --- indra/newview/skins/default/textures/icons/SL_Logo.png | Bin 973 -> 3999 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/indra/newview/skins/default/textures/icons/SL_Logo.png b/indra/newview/skins/default/textures/icons/SL_Logo.png index c9fbde987a..8342d7cfee 100644 Binary files a/indra/newview/skins/default/textures/icons/SL_Logo.png and b/indra/newview/skins/default/textures/icons/SL_Logo.png differ -- cgit v1.2.3 From 69491cccae0ec7a638abcee34f460aed314997ef Mon Sep 17 00:00:00 2001 From: Paul Guslisty Date: Wed, 17 Mar 2010 14:40:50 +0200 Subject: Fixed normal bug EXT - 6026 ([TRANSLATED BUT IN EN] Side bar : My Appearance > Wearing tab - where it's linked description) - Replaced hardcoded '(active)' string with [GESLABEL] arg. - this line with translation should be added to the rest locales - Corrected \"[ATTACHMENT_POINT]\" arg assigning. Now \"[ATTACHMENT_POINT]\" assigned with LLTrans::getString() and gets translated string. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/45/ --HG-- branch : product-engine --- indra/newview/llinventorybridge.cpp | 6 ++++-- indra/newview/skins/default/xui/en/strings.xml | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index ceeffea1c9..1f918c72ea 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -3808,7 +3808,9 @@ std::string LLGestureBridge::getLabelSuffix() const { if( LLGestureManager::instance().isGestureActive(mUUID) ) { - return LLItemBridge::getLabelSuffix() + " (active)"; + LLStringUtil::format_map_t args; + args["[GESLABEL]"] = LLItemBridge::getLabelSuffix(); + return LLTrans::getString("ActiveGesture", args); } else { @@ -4157,7 +4159,7 @@ std::string LLObjectBridge::getLabelSuffix() const // e.g. "(worn on ...)" / "(attached to ...)" LLStringUtil::format_map_t args; - args["[ATTACHMENT_POINT]"] = attachment_point_name.c_str(); + args["[ATTACHMENT_POINT]"] = LLTrans::getString(attachment_point_name); return LLItemBridge::getLabelSuffix() + LLTrans::getString("WornOnAttachmentPoint", args); } else diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index eb45a9765b..a8f888f0cb 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -1838,6 +1838,7 @@ Clears (deletes) the media and all params from the given face. Loading contents... No contents + Yes No -- cgit v1.2.3