Yet another try at the wxString / std::string / i18n mess.

diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc
index 2ad41b2cb8d08bd6cde0736dfc8282f5fca2dc08..f6dc587c96768268e00ca0bf50e42d446df7d595 100644 (file)
--- a/src/tools/dvdomatic.cc
+++ b/src/tools/dvdomatic.cc
@@ -71,7 +71,7 @@ public:
        {
                _dialog = new wxMessageDialog (
                        0,
-                       std_to_wx (String::compose ("Save changes to film \"%1\" before closing?", film->name())),
+                       std_to_wx (String::compose (wx_to_std (_("Save changes to film \"%1\" before closing?")), film->name())),
                        _("Film changed"),
                        wxYES_NO | wxYES_DEFAULT | wxICON_QUESTION
                        );
@@ -300,7 +300,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;
                        }
                        
@@ -328,7 +328,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(), std_to_wx (e.what())));
+                               error_dialog (this, std_to_wx (String::compose (wx_to_std (_("Could not open film at %1 (%2)")), wx_to_std (p), e.what())));
                        }
                }
 

diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index c330b69cf88098dbd5c534b5ae0eb44580ba9554..5b3330b702d8b6f9b386c560d2f516616fa8fb7a 100644 (file)
--- a/src/tools/po/es_ES.po
+++ b/src/tools/po/es_ES.po
@@ -81,8 +81,8 @@ msgstr "No se pudo cargar la película %1 (%2)"
 
 #: src/tools/dvdomatic.cc:331
 #, c-format
-msgid "Could not open film at %s (%s)"
-msgstr "No se pudo cargar la película en %s (%s)"
+msgid "Could not open film at %1 (%2)"
+msgstr "No se pudo cargar la película en %1 (%2)"
 
 #: src/tools/dvdomatic.cc:287 src/tools/dvdomatic.cc:402
 #: src/tools/dvdomatic.cc:520
@@ -113,5 +113,5 @@ msgstr "Selecciona la película a abrir"
 
 #: src/tools/dvdomatic.cc:303
 #, c-format
-msgid "The directory %s already exists."
-msgstr "La carpeta %s ya existe."
+msgid "The directory %1 already exists."
+msgstr "La carpeta %1 ya existe."

diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po
index 54fb2d0706f274648a24c5be253402cfd7f0c78c..857e5b512501657cc3f256b0671c4397389b20a2 100644 (file)
--- a/src/tools/po/fr_FR.po
+++ b/src/tools/po/fr_FR.po
@@ -80,8 +80,8 @@ msgstr "Impossible de charger le film %1 (%2)"
 
 #: src/tools/dvdomatic.cc:331
 #, c-format
-msgid "Could not open film at %s (%s)"
-msgstr "Impossible d'ouvrir le film à %s (%s)"
+msgid "Could not open film at %1 (%2)"
+msgstr "Impossible d'ouvrir le film à %1 (%2)"
 
 #: src/tools/dvdomatic.cc:287 src/tools/dvdomatic.cc:402
 #: src/tools/dvdomatic.cc:520
@@ -110,5 +110,5 @@ msgstr "Sélectionner le film à ouvrir"
 
 #: src/tools/dvdomatic.cc:303
 #, c-format
-msgid "The directory %s already exists."
-msgstr "Le dossier %s existe déjà."
+msgid "The directory %1 already exists."
+msgstr "Le dossier %1 existe déjà."

diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po
index dce686281c0b2093c31766c07fcde36309ec2236..2ce0cb11e2a93d54ca5546aedc305ec992a0989f 100644 (file)
--- a/src/tools/po/it_IT.po
+++ b/src/tools/po/it_IT.po
@@ -81,8 +81,8 @@ msgstr "Non posso caricare il film %1 (%2)"
 
 #: src/tools/dvdomatic.cc:331
 #, c-format
-msgid "Could not open film at %s (%s)"
-msgstr "Non posso aprire il film in %s (%s)"
+msgid "Could not open film at %1 (%2)"
+msgstr "Non posso aprire il film in %1 (%2)"
 
 #: src/tools/dvdomatic.cc:287 src/tools/dvdomatic.cc:402
 #: src/tools/dvdomatic.cc:520
@@ -111,5 +111,5 @@ msgstr "Seleziona il film da aprire"
 
 #: src/tools/dvdomatic.cc:303
 #, c-format
-msgid "The directory %s already exists."
-msgstr "La directory %s esiste gia'."
+msgid "The directory %1 already exists."
+msgstr "La directory %1 esiste gia'."

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index ec99f4d9d06e359c92d5e0a37426c6c14945aab9..4ef30fd050fab0cb77ad1eed5e76c7f1e55cdc60 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -501,7 +501,7 @@ FilmEditor::content_changed (wxCommandEvent &)
                _film->set_content (wx_to_std (_content->GetPath ()));
        } catch (std::exception& e) {
                _content->SetPath (std_to_wx (_film->directory ()));
-               error_dialog (this, wxString::Format (_("Could not set content: %s"), e.what ()));
+               error_dialog (this, std_to_wx (String::compose (wx_to_std (_("Could not set content: %1")), e.what ())));
        }
 }
 

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index a40a3c78df34b2892b5de52bed3e40aab28f888d..a7f370f00188c8acc8a65dee722783ee8680c75e 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -105,7 +105,7 @@ FilmViewer::film_changed (Film::Property p)
                try {
                        _decoders = decoder_factory (_film, o);
                } catch (StringError& e) {
-                       error_dialog (this, wxString::Format (_("Could not open content file (%s)"), e.what()));
+                       error_dialog (this, std_to_wx (String::compose (wx_to_std (_("Could not open content file (%1)")), e.what())));
                        return;
                }
                
@@ -411,7 +411,7 @@ FilmViewer::get_frame ()
        } catch (DecodeError& e) {
                _play_button->SetValue (false);
                check_play_state ();
-               error_dialog (this, wxString::Format (_("Could not decode video for view (%s)"), e.what()));
+               error_dialog (this, std_to_wx (String::compose (wx_to_std (_("Could not decode video for view (%1)")), e.what())));
        }
 }
 

diff --git a/src/wx/job_wrapper.cc b/src/wx/job_wrapper.cc
index ede11762ccc7329018b0b5408129b07ab4795e18..f0b506ba5a2cc2db2bef294ba9ceb13a5e0aa0e2 100644 (file)
--- a/src/wx/job_wrapper.cc
+++ b/src/wx/job_wrapper.cc
@@ -35,8 +35,8 @@ JobWrapper::make_dcp (wxWindow* parent, shared_ptr<Film> film)
        try {
                film->make_dcp ();
        } catch (BadSettingError& e) {
-               error_dialog (parent, wxString::Format (_("Bad setting for %s (%s)"), std_to_wx (e.setting().c_str()), std_to_wx (e.what())));
+               error_dialog (parent, std_to_wx (String::compose (wx_to_std (_("Bad setting for %1 (%2)")), e.setting(), e.what())));
        } catch (std::exception& e) {
-               error_dialog (parent, wxString::Format (_("Could not make DCP: %s"), std_to_wx (e.what ())));
+               error_dialog (parent, std_to_wx (String::compose (wx_to_std (_("Could not make DCP: %1")), e.what())));
        }
 }

diff --git a/src/wx/po/es_ES.po b/src/wx/po/es_ES.po
index 23d9e1a32ab28dfc8859b904a12684f787c61243..b142f832168f37e8f1c2280046d4424dbbad0ea4 100644 (file)
--- a/src/wx/po/es_ES.po
+++ b/src/wx/po/es_ES.po
@@ -55,8 +55,8 @@ msgstr "Idioma del audio (ej. ES)"
 
 #: src/wx/job_wrapper.cc:38
 #, c-format
-msgid "Bad setting for %s (%s)"
-msgstr "Configuración erronea para %s (%s)"
+msgid "Bad setting for %1 (%2)"
+msgstr "Configuración erronea para %1 (%2)"
 
 #: src/wx/film_editor.cc:296
 msgid "Bottom crop"
@@ -96,23 +96,23 @@ msgstr "Tipo de contenido"
 
 #: src/wx/film_viewer.cc:414
 #, c-format
-msgid "Could not decode video for view (%s)"
-msgstr "No se pudo decodificar el vídeo para mostrarlo (%s)"
+msgid "Could not decode video for view (%1)"
+msgstr "No se pudo decodificar el vídeo para mostrarlo (%1)"
 
 #: src/wx/job_wrapper.cc:40
 #, c-format
-msgid "Could not make DCP: %s"
-msgstr "No se pudo crear el DCP: %s"
+msgid "Could not make DCP: %1"
+msgstr "No se pudo crear el DCP: %1"
 
 #: src/wx/film_viewer.cc:108
 #, c-format
-msgid "Could not open content file (%s)"
-msgstr "No se pudo abrir el fichero (%s)"
+msgid "Could not open content file (%1)"
+msgstr "No se pudo abrir el fichero (%1)"
 
 #: src/wx/film_editor.cc:504
 #, c-format
-msgid "Could not set content: %s"
-msgstr "No se pudo establecer el contenido: %s"
+msgid "Could not set content: %1"
+msgstr "No se pudo establecer el contenido: %1"
 
 #: src/wx/new_film_dialog.cc:46
 msgid "Create in folder"

diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po
index fdcd91a28f9c9392444d424ce35b3be805e2ffb1..e929598c22f7deae2b225c7c5d47a0c838a1a878 100644 (file)
--- a/src/wx/po/fr_FR.po
+++ b/src/wx/po/fr_FR.po
@@ -54,8 +54,8 @@ msgstr "Langue audio (ex. FR)"
 
 #: src/wx/job_wrapper.cc:38
 #, c-format
-msgid "Bad setting for %s (%s)"
-msgstr "Mauvais paramètre pour %s (%s)"
+msgid "Bad setting for %1 (%2)"
+msgstr "Mauvais paramètre pour %1 (%2)"
 
 #: src/wx/film_editor.cc:296
 msgid "Bottom crop"
@@ -95,23 +95,23 @@ msgstr "Type de Contenu"
 
 #: src/wx/film_viewer.cc:414
 #, c-format
-msgid "Could not decode video for view (%s)"
-msgstr "Décodage de la vidéo pour visualisation impossible (%s)"
+msgid "Could not decode video for view (%1)"
+msgstr "Décodage de la vidéo pour visualisation impossible (%1)"
 
 #: src/wx/job_wrapper.cc:40
 #, c-format
-msgid "Could not make DCP: %s"
-msgstr "Impossible de créer le DCP : %s"
+msgid "Could not make DCP: %1"
+msgstr "Impossible de créer le DCP : %1"
 
 #: src/wx/film_viewer.cc:108
 #, c-format
-msgid "Could not open content file (%s)"
-msgstr "Ouverture du contenu impossible (%s)"
+msgid "Could not open content file (%1)"
+msgstr "Ouverture du contenu impossible (%1)"
 
 #: src/wx/film_editor.cc:504
 #, c-format
-msgid "Could not set content: %s"
-msgstr "Sélectionner du contenu impossible : %s"
+msgid "Could not set content: %1"
+msgstr "Sélectionner du contenu impossible : %1"
 
 #: src/wx/new_film_dialog.cc:46
 msgid "Create in folder"

diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po
index e4e32e9e7d891bc219da8cae7f76a4be7be4f3b1..c33f6a099ae86a78e44b99d7b26bd48068aa94f9 100644 (file)
--- a/src/wx/po/it_IT.po
+++ b/src/wx/po/it_IT.po
@@ -55,8 +55,8 @@ msgstr "Lingua dell'audio (es. EN)"
 
 #: src/wx/job_wrapper.cc:38
 #, c-format
-msgid "Bad setting for %s (%s)"
-msgstr "Valore sbagliato per %s (%s)"
+msgid "Bad setting for %1 (%2)"
+msgstr "Valore sbagliato per %1 (%2)"
 
 #: src/wx/film_editor.cc:296
 msgid "Bottom crop"
@@ -96,23 +96,23 @@ msgstr "Tipo di contenuto"
 
 #: src/wx/film_viewer.cc:414
 #, c-format
-msgid "Could not decode video for view (%s)"
-msgstr "Non posso decodificare il video per guardarlo (%s)"
+msgid "Could not decode video for view (%1)"
+msgstr "Non posso decodificare il video per guardarlo (%1)"
 
 #: src/wx/job_wrapper.cc:40
 #, c-format
-msgid "Could not make DCP: %s"
-msgstr "Non posso creare il DCP: %s"
+msgid "Could not make DCP: %1"
+msgstr "Non posso creare il DCP: %1"
 
 #: src/wx/film_viewer.cc:108
 #, c-format
-msgid "Could not open content file (%s)"
-msgstr "Non posso aprire il file del contenuto (%s)"
+msgid "Could not open content file (%1)"
+msgstr "Non posso aprire il file del contenuto (%1)"
 
 #: src/wx/film_editor.cc:504
 #, c-format
-msgid "Could not set content: %s"
-msgstr "Non posso regolare il contenuto: %s"
+msgid "Could not set content: %1"
+msgstr "Non posso regolare il contenuto: %1"
 
 #: src/wx/new_film_dialog.cc:46
 msgid "Create in folder"