Synchronize a bit more with MAINT-8061

Wed, 13 Dec 2017 14:00:21 +0100

author
Ansariel
date
Wed, 13 Dec 2017 14:00:21 +0100
changeset 53572
0229c29c8001
parent 53571
887b2e45b2ee
child 53573
bdaff19f9ef0

Synchronize a bit more with MAINT-8061

indra/newview/llinventorybridge.cpp file | annotate | diff | revisions
indra/newview/skins/default/xui/de/strings.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/en/strings.xml file | annotate | diff | revisions
     1.1 --- a/indra/newview/llinventorybridge.cpp	Wed Dec 13 13:20:29 2017 +0100
     1.2 +++ b/indra/newview/llinventorybridge.cpp	Wed Dec 13 14:00:21 2017 +0100
     1.3 @@ -2427,7 +2427,7 @@
     1.4      
     1.5      if (mIsLoading && mTimeSinceRequestStart.getElapsedTimeF32() >= folder_loading_message_delay())
     1.6      {
     1.7 -        return llformat(" ( %s ) ", LLTrans::getString("LoadingData").c_str());
     1.8 +        return llformat(" (%s) ", LLTrans::getString("LoadingData").c_str());
     1.9      }
    1.10      std::string suffix = "";
    1.11      if(mShowDescendantsCount)
    1.12 @@ -2441,7 +2441,9 @@
    1.13          //{
    1.14          //    std::ostringstream oss;
    1.15          //    oss << count;
    1.16 -        //    suffix = " ( " + oss.str() + " Items )";
    1.17 +        //    LLStringUtil::format_map_t args;
    1.18 +        //    args["[ITEMS_COUNT]"] = oss.str();
    1.19 +        //    suffix = " " + LLTrans::getString("InventoryItemsCount", args);
    1.20          //}
    1.21          if (cat_array.size() > 0 || item_array.size() > 0)
    1.22          {
    1.23 @@ -2451,8 +2453,8 @@
    1.24              LLResMgr::getInstance()->getIntegerString(count_str, item_array.size());
    1.25              args["ITEMS"] = count_str;
    1.26              LLResMgr::getInstance()->getIntegerString(count_str, cat_array.size());
    1.27 -            args["FOLDERS"] = count_str;
    1.28 -            suffix = " " + LLTrans::getString("FolderItemCount", args);
    1.29 +            args["CATEGORIES"] = count_str;
    1.30 +            suffix = " " + LLTrans::getString("InventoryItemsCount", args);
    1.31          }
    1.32          // </FS:Ansariel>
    1.33      }
    1.34 @@ -4889,7 +4891,7 @@
    1.35      
    1.36      if (mIsLoading && mTimeSinceRequestStart.getElapsedTimeF32() >= folder_loading_message_delay())
    1.37      {
    1.38 -        return llformat(" ( %s ) ", LLTrans::getString("LoadingData").c_str());
    1.39 +        return llformat(" (%s) ", LLTrans::getString("LoadingData").c_str());
    1.40      }
    1.41      
    1.42      std::string suffix = "";
     2.1 --- a/indra/newview/skins/default/xui/de/strings.xml	Wed Dec 13 13:20:29 2017 +0100
     2.2 +++ b/indra/newview/skins/default/xui/de/strings.xml	Wed Dec 13 14:00:21 2017 +0100
     2.3 @@ -1704,6 +1704,9 @@
     2.4  	<string name="InventoryMarketplaceListingsNoItems">
     2.5  		Ziehen Sie Ordner in diesen Bereich, um sie im [[MARKETPLACE_DASHBOARD_URL] Marktplatz] zum Verkauf anzubieten.
     2.6  	</string>
     2.7 +	<string name="InventoryItemsCount">
     2.8 +		([ITEMS]/[CATEGORIES] Elemente)
     2.9 +	</string>
    2.10  	<string name="Marketplace Validation Warning Stock">
    2.11  		Bestandsordner müssen in einem Versionsordner gespeichert sein
    2.12  	</string>
     3.1 --- a/indra/newview/skins/default/xui/en/strings.xml	Wed Dec 13 13:20:29 2017 +0100
     3.2 +++ b/indra/newview/skins/default/xui/en/strings.xml	Wed Dec 13 14:00:21 2017 +0100
     3.3 @@ -773,7 +773,7 @@
     3.4  	<string name="InventoryMarketplaceListingsNoItems">
     3.5          Drag folders to this area to list them for sale on the [[MARKETPLACE_DASHBOARD_URL] Marketplace].
     3.6  	</string>
     3.7 -
     3.8 +	<string name="InventoryItemsCount">([ITEMS]/[CATEGORIES] Elements)</string>
     3.9  	<string name="Marketplace Validation Log"></string>
    3.10  	<string name="Marketplace Validation Warning Stock">stock folder must be contained by a version folder</string>
    3.11  	<string name="Marketplace Validation Error Mixed Stock">: Error: all items in a stock folder must be no-copy and of the same type</string>
    3.12 @@ -3080,5 +3080,4 @@
    3.13  
    3.14  [ASSET_NAME]
    3.15    </string>
    3.16 -  <string name="FolderItemCount">([ITEMS]/[FOLDERS] Elements)</string>
    3.17  </strings>

mercurial