Merge branch 'master' into trimming

4 files changed, 19 insertions, 10 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 <adam.klotblixt@gmail.com>\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/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"
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");