From 04defa0670e98e25e6f474659d76603318f8fa37 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 3 Feb 2017 22:21:33 +0100
Subject: [PATCH] Fix folder name localization for MAINT-6959

---
 indra/newview/llfloaterpreference.cpp | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 37c76b2fbf..cad076a3f1 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -3244,11 +3244,27 @@ std::string get_category_path(LLUUID cat_id)
     LLViewerInventoryCategory* cat = gInventory.getCategory(cat_id);
     if (cat->getParentUUID().notNull())
     {
-        return get_category_path(cat->getParentUUID()) + " > " + cat->getName();
+        // <FS:Ansariel> Fix folder name localization
+        //return get_category_path(cat->getParentUUID()) + " > " + cat->getName();
+        std::string localized_name;
+        if (!LLTrans::findString(localized_name, "InvFolder " + cat->getName()))
+        {
+            localized_name = cat->getName();
+        }
+        return get_category_path(cat->getParentUUID()) + " > " + localized_name;
+        // </FS:Ansariel>
     }
     else
     {
-        return cat->getName();
+        // <FS:Ansariel> Fix folder name localization
+        //return cat->getName();
+        std::string localized_name;
+        if (!LLTrans::findString(localized_name, "InvFolder " + cat->getName()))
+        {
+            localized_name = cat->getName();
+        }
+        return localized_name;
+        // </FS:Ansariel>
     }
 }