diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-04-15 22:00:04 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-04-15 22:00:04 +0100 |
| commit | f166fa19db164653e8229133a18f2e53dd722333 (patch) | |
| tree | 2905a28cfa3d77ea6db0cacaf99bf195b15e5d6b /src | |
| parent | 3f2365fcf3a1ffc50901eb2e4af246aa4c83e272 (diff) | |
| parent | 9ad15a56a0c57b703ddb8236e6334785812dfb0d (diff) | |
Merge branch 'master' into fix-early-audio-take2
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/dvdomatic.cc | 15 | ||||
| -rw-r--r-- | src/wx/config_dialog.cc | 2 |
2 files changed, 14 insertions, 3 deletions
diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc index 212d4848e..2a995bee8 100644 --- a/src/tools/dvdomatic.cc +++ b/src/tools/dvdomatic.cc @@ -18,6 +18,7 @@ */ #include <iostream> +#include <fstream> #include <boost/filesystem.hpp> #ifdef __WXMSW__ #include <shellapi.h> @@ -52,6 +53,7 @@ using std::stringstream; using std::map; using std::make_pair; using std::exception; +using std::ofstream; using boost::shared_ptr; static FilmEditor* film_editor = 0; @@ -458,14 +460,22 @@ setup_i18n () { int language = wxLANGUAGE_DEFAULT; - if (Config::instance()->language()) { - wxLanguageInfo const * li = wxLocale::FindLanguageInfo (std_to_wx (Config::instance()->language().get())); + ofstream f ("c:/users/carl hetherington/foo", std::ios::app); + f << "Hello.\n"; + + boost::optional<string> config_lang = Config::instance()->language (); + if (config_lang && !config_lang->empty ()) { + f << "Configured language " << config_lang.get() << "\n"; + wxLanguageInfo const * li = wxLocale::FindLanguageInfo (std_to_wx (config_lang.get ())); + f << "LanguageInfo " << li << "\n"; if (li) { language = li->Language; + f << "language=" << language << " cf " << wxLANGUAGE_DEFAULT << " " << wxLANGUAGE_ENGLISH << "\n"; } } if (wxLocale::IsAvailable (language)) { + f << "Language is available.\n"; locale = new wxLocale (language, wxLOCALE_LOAD_DEFAULT); #ifdef DVDOMATIC_WINDOWS @@ -476,6 +486,7 @@ setup_i18n () locale->AddCatalog (wxT ("dvdomatic")); if (!locale->IsOk()) { + f << "Locale is not ok.\n"; delete locale; locale = new wxLocale (wxLANGUAGE_ENGLISH); language = wxLANGUAGE_ENGLISH; diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc index 1d025f3fa..c32b03ec0 100644 --- a/src/wx/config_dialog.cc +++ b/src/wx/config_dialog.cc @@ -226,7 +226,7 @@ ConfigDialog::language_changed (wxCommandEvent &) { switch (_language->GetSelection ()) { case 0: - Config::instance()->set_language (""); + Config::instance()->set_language ("en"); break; case 1: Config::instance()->set_language ("fr"); |