Merge branch 'master' into trimming

[dcpomatic.git] / src / tools / dvdomatic.cc

diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc
index 4a778100c8e657cb1537bae03e8515a44b178dc5..2a995bee8d79b88fd478d6a8a523b0c74913a6ba 100644 (file)
--- 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;
@@ -71,7 +73,7 @@ public:
        {
                _dialog = new wxMessageDialog (
                        0,
-                       std_to_wx (String::compose ("Save changes to film \"%1\" before closing?", film->name())),
+                       wxString::Format (_("Save changes to film \"%s\" before closing?"), std_to_wx (film->name ()).data()),
                        _("Film changed"),
                        wxYES_NO | wxYES_DEFAULT | wxICON_QUESTION
                        );
@@ -284,7 +286,7 @@ private:
        void file_changed (string f)
        {
                stringstream s;
-               s << _("DVD-o-matic");
+               s << wx_to_std (_("DVD-o-matic"));
                if (!f.empty ()) {
                        s << " - " << f;
                }
@@ -300,7 +302,7 @@ private:
                if (r == wxID_OK) {
 
                        if (boost::filesystem::exists (d->get_path())) {
-                               error_dialog (this, wxString::Format (_("The directory %s already exists."), d->get_path().c_str()));
+                               error_dialog (this, std_to_wx (String::compose (wx_to_std (_("The directory %1 already exists.")), d->get_path().c_str())));
                                return;
                        }
                        
@@ -317,8 +319,16 @@ private:
        void file_open (wxCommandEvent &)
        {
                wxDirDialog* c = new wxDirDialog (this, _("Select film to open"), wxStandardPaths::Get().GetDocumentsDir(), wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST);
-               int const r = c->ShowModal ();
-               
+               int r;
+               while (1) {
+                       r = c->ShowModal ();
+                       if (r == wxID_OK && c->GetPath() == wxStandardPaths::Get().GetDocumentsDir()) {
+                               error_dialog (this, _("You did not select a folder.  Make sure that you select a folder before clicking Open."));
+                       } else {
+                               break;
+                       }
+               }
+                       
                if (r == wxID_OK) {
                        maybe_save_then_delete_film ();
                        try {
@@ -328,7 +338,7 @@ private:
                        } catch (std::exception& e) {
                                wxString p = c->GetPath ();
                                wxCharBuffer b = p.ToUTF8 ();
-                               error_dialog (this, wxString::Format (_("Could not open film at %s (%s)"), p.data(), e.what()));
+                               error_dialog (this, wxString::Format (_("Could not open film at %s (%s)"), p.data(), std_to_wx (e.what()).data()));
                        }
                }
 
@@ -420,7 +430,8 @@ private:
                translators.Add (wxT ("Lilian Lefranc"));
                translators.Add (wxT ("Thierry Journet"));
                translators.Add (wxT ("Massimiliano Broggi"));
-               translators.Add (wxT ("Manuel Acevedo"));
+               translators.Add (wxT ("Manuel AC"));
+               translators.Add (wxT ("Adam Klotblixt"));
                info.SetTranslators (translators);
                
                info.SetWebSite (wxT ("http://carlh.net/software/dvdomatic"));
@@ -449,12 +460,22 @@ 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;
+       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
@@ -465,13 +486,16 @@ 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;
                }
        }
 
-       dvdomatic_setup_i18n (wx_to_std (locale->GetCanonicalName ()));
+       if (locale) {
+               dvdomatic_setup_i18n (wx_to_std (locale->GetCanonicalName ()));
+       }
 }
 
 class App : public wxApp