From d7f5afdc5dbbc5f2b9da031322d9e24669978c46 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Fri, 7 Feb 2014 11:31:04 -0800
Subject: [PATCH] ACME-1312 : Show the filter name without the Missing string
prefix for filters that are not localized
---
indra/newview/llimagefiltersmanager.cpp | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llimagefiltersmanager.cpp b/indra/newview/llimagefiltersmanager.cpp
index 0633dcaefcf..ee6b39efaca 100644
--- a/indra/newview/llimagefiltersmanager.cpp
+++ b/indra/newview/llimagefiltersmanager.cpp
@@ -74,10 +74,14 @@ void LLImageFiltersManager::loadFiltersFromDir(const std::string& dir)
}
// Get the ".xml" out of the file name to get the filter name. That's the one known in strings.xml
- std::string filter_name = file_name.substr(0,file_name.length()-4);
+ std::string filter_name_untranslated = file_name.substr(0,file_name.length()-4);
+
// Get the localized name for the filter
- filter_name = LLTrans::getString(filter_name);
+ std::string filter_name_translated;
+ bool translated = LLTrans::findString(filter_name_translated, filter_name_untranslated);
+ std::string filter_name = (translated ? filter_name_translated: filter_name_untranslated);
+ // Store the filter in the list with its associated file name
mFiltersList[filter_name] = file_name;
}
}
--
GitLab