diff --git a/src/backend/helpers.cpp b/src/backend/helpers.cpp index 253d11f0..c98c8e28 100644 --- a/src/backend/helpers.cpp +++ b/src/backend/helpers.cpp @@ -331,6 +331,20 @@ namespace loot { return _locale; } + const std::vector Language::Names({ + Language(Language::english).Name(), + Language(Language::spanish).Name(), + Language(Language::russian).Name(), + Language(Language::french).Name(), + Language(Language::chinese).Name(), + Language(Language::polish).Name(), + Language(Language::brazilian_portuguese).Name(), + Language(Language::finnish).Name(), + Language(Language::german).Name(), + Language(Language::danish).Name(), + Language(Language::korean).Name() + }); + ////////////////////////////// // Version Class Functions ////////////////////////////// diff --git a/src/backend/helpers.h b/src/backend/helpers.h index cd187f88..e29d5169 100644 --- a/src/backend/helpers.h +++ b/src/backend/helpers.h @@ -89,21 +89,7 @@ namespace loot { static const unsigned int danish = 10; static const unsigned int korean = 11; - static std::vector Names() { - std::vector vec; - vec.push_back(Language(Language::english).Name()); - vec.push_back(Language(Language::spanish).Name()); - vec.push_back(Language(Language::russian).Name()); - vec.push_back(Language(Language::french).Name()); - vec.push_back(Language(Language::chinese).Name()); - vec.push_back(Language(Language::polish).Name()); - vec.push_back(Language(Language::brazilian_portuguese).Name()); - vec.push_back(Language(Language::finnish).Name()); - vec.push_back(Language(Language::german).Name()); - vec.push_back(Language(Language::danish).Name()); - vec.push_back(Language(Language::korean).Name()); - return vec; - } + static const std::vector Names; private: unsigned int _code; std::string _name; diff --git a/src/gui/handler.cpp b/src/gui/handler.cpp index 4aaf41a2..e13b9681 100644 --- a/src/gui/handler.cpp +++ b/src/gui/handler.cpp @@ -541,8 +541,7 @@ namespace loot { BOOST_LOG_TRIVIAL(info) << "Getting LOOT's supported languages."; // Need to get an array of language names and their corresponding codes. YAML::Node temp; - vector names = Language::Names(); - for (const auto& name : names) { + for (const auto& name : Language::Names) { YAML::Node lang; lang["name"] = name; lang["locale"] = Language(name).Locale();