diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-04-16 10:07:27 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-04-16 10:07:27 +0100 |
| commit | be5dfa3ed0459392cc65d21f563f136b97a295ba (patch) | |
| tree | 4d572831bdf7d9a97a10e14ae5482ef004d60b6f /src/tools | |
| parent | 9fcaaf1cc7582598b06f5a43878cbd9aa2b4ff17 (diff) | |
| parent | 9ad15a56a0c57b703ddb8236e6334785812dfb0d (diff) | |
Merge branch 'master' into trimming
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dvdomatic.cc | 15 | ||||
| -rw-r--r-- | src/tools/po/sv_SE.po | 4 |
2 files changed, 15 insertions, 4 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/tools/po/sv_SE.po b/src/tools/po/sv_SE.po index 57254770c..28566d876 100644 --- a/src/tools/po/sv_SE.po +++ b/src/tools/po/sv_SE.po @@ -107,8 +107,8 @@ msgid "S&how DCP" msgstr "&Visa DCP" #: src/tools/dvdomatic.cc:74 -msgid "Save changes to film \"%s\" before closing?" -msgstr "Spara ändringarna till filmen \"%s\" före avslut?" +msgid "Save changes to film \"%1\" before closing?" +msgstr "Spara ändringarna till filmen \"%1\" före avslut?" #: src/tools/dvdomatic.cc:319 msgid "Select film to open" |