mirror of
https://github.com/loot/libloot.git
synced 2026-07-27 14:16:01 -07:00
Use member constant for language names.
This commit is contained in:
@@ -331,6 +331,20 @@ namespace loot {
|
||||
return _locale;
|
||||
}
|
||||
|
||||
const std::vector<std::string> 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
|
||||
//////////////////////////////
|
||||
|
||||
+1
-15
@@ -89,21 +89,7 @@ namespace loot {
|
||||
static const unsigned int danish = 10;
|
||||
static const unsigned int korean = 11;
|
||||
|
||||
static std::vector<std::string> Names() {
|
||||
std::vector<std::string> 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<std::string> Names;
|
||||
private:
|
||||
unsigned int _code;
|
||||
std::string _name;
|
||||
|
||||
+1
-2
@@ -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<string> 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();
|
||||
|
||||
Reference in New Issue
Block a user