From 9b577fb38b51ccfa1229ceabaf12088c6c9b81e0 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 10 Apr 2013 15:11:40 +0100 Subject: Updated sv_SE from Adam. --- src/lib/po/sv_SE.po | 8 +++----- src/tools/po/sv_SE.po | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po index d574261c8..ef8109dfa 100644 --- a/src/lib/po/sv_SE.po +++ b/src/lib/po/sv_SE.po @@ -8,10 +8,9 @@ msgstr "" "Project-Id-Version: DVD-o-matic\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-04-09 11:14+0100\n" -"PO-Revision-Date: 2013-04-09 10:13+0100\n" +"PO-Revision-Date: 2013-04-10 15:35+0100\n" "Last-Translator: Adam Klotblixt \n" "Language-Team: \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -50,9 +49,8 @@ msgid "16:9 within Flat" msgstr "16:9 innanför Flat" #: src/lib/format.cc:115 -#, fuzzy msgid "16:9 within Scope" -msgstr "16:9 innanför Flat" +msgstr "16:9 innanför Scope" #: src/lib/filter.cc:88 msgid "3D denoiser" @@ -76,7 +74,7 @@ msgstr "Reklam" #: src/lib/job.cc:72 msgid "An error occurred whilst handling the file %1." -msgstr "Ett fel inträffade vid hantering av filen (%1)" +msgstr "Ett fel inträffade vid hantering av filen %1" #: src/lib/analyse_audio_job.cc:49 msgid "Analyse audio of %1" 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" -- cgit v1.2.3 From 8e61be024ddc5a7a6bf03b0c1c71e2add97db965 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 13 Apr 2013 21:00:22 +0100 Subject: Some logging. --- src/tools/dvdomatic.cc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc index 212d4848e..b09f4e554 100644 --- a/src/tools/dvdomatic.cc +++ b/src/tools/dvdomatic.cc @@ -458,14 +458,21 @@ setup_i18n () { int language = wxLANGUAGE_DEFAULT; + ofstream f ("c:/users/carl/foo", ios::app); + f << "Hello.\n"; + if (Config::instance()->language()) { + f << "Configured language " << Config::instance()->language().get() << "\n"; wxLanguageInfo const * li = wxLocale::FindLanguageInfo (std_to_wx (Config::instance()->language().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 +483,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; -- cgit v1.2.3 From b8d4a4326e8dae1bd1b850e6798cda9c6c319c91 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 13 Apr 2013 21:27:00 +0100 Subject: Missing using. --- src/tools/dvdomatic.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc index b09f4e554..70a96866c 100644 --- a/src/tools/dvdomatic.cc +++ b/src/tools/dvdomatic.cc @@ -52,6 +52,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; -- cgit v1.2.3 From aa3c4f99bc31ed85262031bc347a75361f93eb09 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 14 Apr 2013 01:36:51 +0100 Subject: NS fix. --- src/tools/dvdomatic.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc index 70a96866c..3628fd450 100644 --- a/src/tools/dvdomatic.cc +++ b/src/tools/dvdomatic.cc @@ -18,6 +18,7 @@ */ #include +#include #include #ifdef __WXMSW__ #include @@ -459,7 +460,7 @@ setup_i18n () { int language = wxLANGUAGE_DEFAULT; - ofstream f ("c:/users/carl/foo", ios::app); + ofstream f ("c:/users/carl/foo", std::ios::app); f << "Hello.\n"; if (Config::instance()->language()) { -- cgit v1.2.3 From d28d53096798c90e2d04a8f844b0e37d9d9a8d3f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 14 Apr 2013 15:57:10 +0100 Subject: Fix path. --- src/tools/dvdomatic.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc index 3628fd450..fda784048 100644 --- a/src/tools/dvdomatic.cc +++ b/src/tools/dvdomatic.cc @@ -460,7 +460,7 @@ setup_i18n () { int language = wxLANGUAGE_DEFAULT; - ofstream f ("c:/users/carl/foo", std::ios::app); + ofstream f ("c:/users/carl hetherington/foo", ios::app); f << "Hello.\n"; if (Config::instance()->language()) { -- cgit v1.2.3 From 3b85509d3bda75c2402327fbbe55ad008c57df71 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 14 Apr 2013 23:40:15 +0100 Subject: Try to fix path. --- src/tools/dvdomatic.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc index 3628fd450..6c7da4610 100644 --- a/src/tools/dvdomatic.cc +++ b/src/tools/dvdomatic.cc @@ -460,7 +460,7 @@ setup_i18n () { int language = wxLANGUAGE_DEFAULT; - ofstream f ("c:/users/carl/foo", std::ios::app); + ofstream f ("c:/users/carl hetherington/foo", std::ios::app); f << "Hello.\n"; if (Config::instance()->language()) { -- cgit v1.2.3 From 2cc70328d69fab3b08b368e3a2a93ab73c9fba16 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 15 Apr 2013 00:20:56 +0100 Subject: Try to fix problems with empty configured language. --- src/tools/dvdomatic.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc index 6c7da4610..2dc4c4de1 100644 --- a/src/tools/dvdomatic.cc +++ b/src/tools/dvdomatic.cc @@ -463,9 +463,10 @@ setup_i18n () ofstream f ("c:/users/carl hetherington/foo", std::ios::app); f << "Hello.\n"; - if (Config::instance()->language()) { - f << "Configured language " << Config::instance()->language().get() << "\n"; - wxLanguageInfo const * li = wxLocale::FindLanguageInfo (std_to_wx (Config::instance()->language().get())); + boost::optional 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; -- cgit v1.2.3 From 09a0fa8b6b9af3a333ee1918ee711ccc0f75c781 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 15 Apr 2013 08:25:59 +0100 Subject: Fix typo. --- src/tools/dvdomatic.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc index 2dc4c4de1..2a995bee8 100644 --- a/src/tools/dvdomatic.cc +++ b/src/tools/dvdomatic.cc @@ -464,7 +464,7 @@ setup_i18n () f << "Hello.\n"; boost::optional config_lang = Config::instance()->language (); - if (config_lang && !config_lang.empty ()) { + 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"; -- cgit v1.2.3 From 8ef3014198e46957d0a79d4e006e5f82a345bfa7 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 15 Apr 2013 21:36:23 +0100 Subject: Set language for English rather than just using blank string. --- src/wx/config_dialog.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"); -- cgit v1.2.3 From 9ad15a56a0c57b703ddb8236e6334785812dfb0d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 15 Apr 2013 21:51:30 +0100 Subject: ChangeLog. --- ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index a414cf32d..3499d97ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-04-15 Carl Hetherington + + * Fix error message on forcing language to English (#103). + 2013-04-13 Carl Hetherington * Use film-name-derived names for MXFs in DCPs (#54). -- cgit v1.2.3