X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdvdomatic.cc;h=66f366a24148d7ea1ee1f07966ed73b04b172389;hb=99d08c12756cd936585d777b7a91ecbba35fa4c3;hp=5f06b67866f3c9fa1e4bdd307c22e36290bf5271;hpb=bc83f9ba294697528cee2be41ec6aac905371f1f;p=dcpomatic.git

diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc
index 5f06b6786..66f366a24 100644
--- a/src/tools/dvdomatic.cc
+++ b/src/tools/dvdomatic.cc
@@ -149,7 +149,7 @@ enum {
 	ID_jobs_make_dcp,
 	ID_jobs_send_dcp_to_tms,
 	ID_jobs_show_dcp,
-	ID_jobs_examine_content,
+	ID_jobs_analyse_audio,
 	ID_help_about
 };
 
@@ -174,7 +174,7 @@ setup_menu (wxMenuBar* m)
 	add_item (jobs_menu, _("&Send DCP to TMS"), ID_jobs_send_dcp_to_tms, NEEDS_FILM);
 	add_item (jobs_menu, _("S&how DCP"), ID_jobs_show_dcp, NEEDS_FILM);
 	jobs_menu->AppendSeparator ();
-	add_item (jobs_menu, _("&Examine content"), ID_jobs_examine_content, NEEDS_FILM);
+	add_item (jobs_menu, _("&Analyse audio"), ID_jobs_analyse_audio, NEEDS_FILM);
 
 	wxMenu* help = new wxMenu;
 	add_item (help, _("About"), ID_help_about, ALWAYS);
@@ -211,7 +211,7 @@ public:
 		Connect (ID_jobs_make_dcp, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::jobs_make_dcp));
 		Connect (ID_jobs_send_dcp_to_tms, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::jobs_send_dcp_to_tms));
 		Connect (ID_jobs_show_dcp, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::jobs_show_dcp));
-		Connect (ID_jobs_examine_content, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::jobs_examine_content));
+		Connect (ID_jobs_analyse_audio, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::jobs_analyse_audio));
 		Connect (ID_help_about, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::help_about));
 
 		Connect (wxID_ANY, wxEVT_MENU_OPEN, wxMenuEventHandler (Frame::menu_opened));
@@ -390,10 +390,10 @@ private:
 		}
 #endif		
 	}
-	
-	void jobs_examine_content (wxCommandEvent &)
+
+	void jobs_analyse_audio (wxCommandEvent &)
 	{
-		film->examine_content ();
+		film->analyse_audio ();
 	}
 	
 	void help_about (wxCommandEvent &)
@@ -407,12 +407,22 @@ private:
 		}
 		info.SetDescription (_("Free, open-source DCP generation from almost anything."));
 		info.SetCopyright (_("(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"));
+
 		wxArrayString authors;
 		authors.Add (wxT ("Carl Hetherington"));
 		authors.Add (wxT ("Terrence Meiczinger"));
 		authors.Add (wxT ("Paul Davis"));
 		authors.Add (wxT ("Ole Laursen"));
 		info.SetDevelopers (authors);
+
+		wxArrayString translators;
+		translators.Add (wxT ("Olivier Perriere"));
+		translators.Add (wxT ("Lilian Lefranc"));
+		translators.Add (wxT ("Thierry Journet"));
+		translators.Add (wxT ("Massimiliano Broggi"));
+		translators.Add (wxT ("Manuel AC"));
+		info.SetTranslators (translators);
+		
 		info.SetWebSite (wxT ("http://carlh.net/software/dvdomatic"));
 		wxAboutBox (info);
 	}
@@ -438,16 +448,21 @@ void
 setup_i18n ()
 {
 	int language = wxLANGUAGE_DEFAULT;
+
+	if (Config::instance()->language()) {
+		wxLanguageInfo const * li = wxLocale::FindLanguageInfo (std_to_wx (Config::instance()->language().get()));
+		language = li->Language;
+	}
  
 	if (wxLocale::IsAvailable (language)) {
 		locale = new wxLocale (language, wxLOCALE_LOAD_DEFAULT);
 
-#ifdef __WXGTK__
-		locale->AddCatalogLookupPathPrefix (wxT (LOCALE_PREFIX "/locale"));
-#endif
+#ifdef DVDOMATIC_WINDOWS
+		locale->AddCatalogLookupPathPrefix (std_to_wx (mo_path().string()));
+#endif		
 
-		locale->AddCatalog ("libdvdomatic-wx");
-		locale->AddCatalog ("dvdomatic");
+		locale->AddCatalog (wxT ("libdvdomatic-wx"));
+		locale->AddCatalog (wxT ("dvdomatic"));
 		
 		if (!locale->IsOk()) {
 			delete locale;
@@ -455,6 +470,10 @@ setup_i18n ()
 			language = wxLANGUAGE_ENGLISH;
 		}
 	}
+
+	if (locale) {
+		dvdomatic_setup_i18n (wx_to_std (locale->GetCanonicalName ()));
+	}
 }
 
 class App : public wxApp
@@ -468,12 +487,27 @@ class App : public wxApp
 #ifdef DVDOMATIC_POSIX		
 		unsetenv ("UBUNTU_MENUPROXY");
 #endif		
-		
+
 		wxInitAllImageHandlers ();
+
+		/* Enable i18n; this will create a Config object
+		   to look for a force-configured language.  This Config
+		   object will be wrong, however, because dvdomatic_setup
+		   hasn't yet been called and there aren't any scalers, filters etc.
+		   set up yet.
+		*/
 		setup_i18n ();
-		
+
+		/* Set things up, including scalers / filters etc.
+		   which will now be internationalised correctly.
+		*/
 		dvdomatic_setup ();
 
+		/* Force the configuration to be re-loaded correctly next
+		   time it is needed.
+		*/
+		Config::drop ();
+
 		if (!film_to_load.empty() && boost::filesystem::is_directory (film_to_load)) {
 			try {
 				film.reset (new Film (film_to_load));