summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAnsariel Hiller <ansarielhiller@yahoo.de>2017-02-03 21:28:36 +0000
committerAnsariel Hiller <ansarielhiller@yahoo.de>2017-02-03 21:28:36 +0000
commit2ee1d1b93af51e10b867396309edd3f9b1e4b42f (patch)
tree3676aedc5c8766cc87e7f91d686663e9daba45a2 /indra
parentfd81f83f6b571b16369b7d581198285d5a8ec363 (diff)
MAINT-6959: Use localized category names
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llfloaterpreference.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 30dfff4ac8..df4bc043e5 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -1993,13 +1993,19 @@ void LLFloaterPreference::onChangeMaturity()
std::string get_category_path(LLUUID cat_id)
{
LLViewerInventoryCategory* cat = gInventory.getCategory(cat_id);
+ std::string localized_cat_name;
+ if (!LLTrans::findString(localized_cat_name, "InvFolder " + cat->getName()))
+ {
+ localized_cat_name = cat->getName();
+ }
+
if (cat->getParentUUID().notNull())
{
- return get_category_path(cat->getParentUUID()) + " > " + cat->getName();
+ return get_category_path(cat->getParentUUID()) + " > " + localized_cat_name;
}
else
{
- return cat->getName();
+ return localized_cat_name;
}
}