diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-04-16 11:43:29 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-04-16 11:43:29 +0100 |
| commit | 147cca5876dfbdf56e21289c3a36bec4b4850191 (patch) | |
| tree | 09a59d9e91c7e5ec68b8fb55d1a7b1fcc23c7519 /src/tools | |
| parent | 50dd871c5a924660499b3fd599f1c68af5e3dbc1 (diff) | |
| parent | be5dfa3ed0459392cc65d21f563f136b97a295ba (diff) | |
Merge master.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic.cc | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index ee9f9977c..e053da534 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.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 DCPOMATIC_WINDOWS @@ -476,6 +486,7 @@ setup_i18n () locale->AddCatalog (wxT ("dcpomatic")); if (!locale->IsOk()) { + f << "Locale is not ok.\n"; delete locale; locale = new wxLocale (wxLANGUAGE_ENGLISH); language = wxLANGUAGE_ENGLISH; |