*/
#include <iostream>
+#include <fstream>
#include <boost/filesystem.hpp>
#ifdef __WXMSW__
#include <shellapi.h>
using std::map;
using std::make_pair;
using std::exception;
+using std::ofstream;
using boost::shared_ptr;
static FilmEditor* film_editor = 0;
{
_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
);
void file_changed (string f)
{
stringstream s;
- s << _("DVD-o-matic");
+ s << wx_to_std (_("DVD-o-matic"));
if (!f.empty ()) {
s << " - " << f;
}
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;
}
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 {
} 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()));
}
}
info.SetDevelopers (authors);
wxArrayString translators;
- translators.Add (wxT ("Olivier (freedcp.net)"));
+ 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"));
+ translators.Add (wxT ("Adam Klotblixt"));
info.SetTranslators (translators);
info.SetWebSite (wxT ("http://carlh.net/software/dvdomatic"));
{
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 __WXGTK__
- locale->AddCatalogLookupPathPrefix (wxT (LOCALE_PREFIX "/locale"));
-#endif
+#ifdef DVDOMATIC_WINDOWS
+ locale->AddCatalogLookupPathPrefix (std_to_wx (mo_path().string()));
+#endif
locale->AddCatalog (wxT ("libdvdomatic-wx"));
locale->AddCatalog (wxT ("dvdomatic"));
if (!locale->IsOk()) {
+ f << "Locale is not ok.\n";
delete locale;
locale = new wxLocale (wxLANGUAGE_ENGLISH);
language = wxLANGUAGE_ENGLISH;
}
}
+
+ if (locale) {
+ dvdomatic_setup_i18n (wx_to_std (locale->GetCanonicalName ()));
+ }
}
class App : public wxApp
unsetenv ("UBUNTU_MENUPROXY");
#endif
- /* This needs to be before setup_i18n, as setup_i18n() will
- create a Config object, which needs Scalers to have
- been created.
+ 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 ();
- wxInitAllImageHandlers ();
- setup_i18n ();
-
+ /* 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));