From e7a20bd9ab69f7fecb94bb90aefaa7f7524c401d Mon Sep 17 00:00:00 2001 From: Charles Dang Date: Wed, 25 Apr 2018 16:13:12 +1100 Subject: [PATCH] Cleaned up language completion filtering, but left it disabled here We don't want this enabled on the dev branch. (cherry-picked from commit 301fb933ac8d9713d9dd44fcfb0791b4b06ca585) --- src/language.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/language.cpp b/src/language.cpp index affbb53923dd..e0a0e0251161 100644 --- a/src/language.cpp +++ b/src/language.cpp @@ -39,14 +39,11 @@ extern "C" int _putenv(const char*); #define WRN_G LOG_STREAM(warn, lg::general()) #define ERR_G LOG_STREAM(err, lg::general()) -#ifndef MIN_TRANSLATION_PERCENT -#define MIN_TRANSLATION_PERCENT 80 -#endif - namespace { language_def current_language; std::vector languages_; utils::string_map strings_; + const unsigned MIN_TRANSLATION_PERCENT = 80; } static language_list known_languages; @@ -120,12 +117,11 @@ language_list get_languages() // We sort every time, the local might have changed which can modify the // sort order. std::sort(known_languages.begin(), known_languages.end()); - // FIXME! The translation percent complete script is giving results that don't - // match with gettext.wesnoth.org... need to figure out what the hell is wrong :( #if 0 language_list result; std::copy_if(known_languages.begin(), known_languages.end(), std::back_inserter(result), - [](language_def lang) { return lang.percent >= MIN_TRANSLATION_PERCENT; }); + [](const language_def& lang) { return lang.percent >= MIN_TRANSLATION_PERCENT; }); + return result; #endif return known_languages;