0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor the [language] loading a bit

Browse source
This commit is contained in:
Alexander van Gessel 2010-12-30 16:47:33 +01:00
parent e5779c6a68
commit d5d59e71d2
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/game.cpp
View file

@ -655,8 +655,7 @@ bool game_controller::init_config(const bool force)
hotkey::load_hotkeys(game_config());
paths_manager_.set_paths(game_config());
if(!::init_textdomains(game_config()))
return false;
::init_textdomains(game_config());
about::set_about(game_config());
ai::configuration::init(game_config());
@ -1609,7 +1608,7 @@ void game_controller::load_game_cfg(const bool force)
terrain_builder::set_terrain_rules_cfg(game_config());
::init_textdomains(game_config());
::init_strings(game_config());
} catch(game::error& e) {
ERR_CONFIG << "Error loading game configuration files\n";

6
src/language.cpp
View file

@ -281,7 +281,7 @@ const language_def& get_locale()
return known_languages[0];
}
bool init_textdomains(const config& cfg)
void init_textdomains(const config& cfg)
{
foreach (const config &t, cfg.child_range("textdomain"))
{
@ -302,6 +302,10 @@ bool init_textdomains(const config& cfg)
}
}
}
}
bool init_strings(const config& cfg)
{
languages_.clear();
foreach(const config &l, cfg.child_range("language")) {
languages_.push_back(l);

5
src/language.hpp
View file

@ -85,7 +85,10 @@ bool current_language_rtl();
const language_def& get_locale();
/** Initializes the list of textdomains from a configuration object */
bool init_textdomains(const config& cfg);
void init_textdomains(const config& cfg);
/** Initializes certain english strings */
bool init_strings(const config& cfg);
bool load_language_list();