Missing i18n tags.

diff --git a/src/wx/cinema_dialog.cc b/src/wx/cinema_dialog.cc
index 43017b56b541efa2af0d4324f79e82fa4f968256..df56b9cbee224cab31ed1d9a21fbb756cef97779 100644 (file)
--- a/src/wx/cinema_dialog.cc
+++ b/src/wx/cinema_dialog.cc
@@ -37,8 +37,8 @@ column (string s)
        return s;
 }
 
-CinemaDialog::CinemaDialog (wxWindow* parent, string title, string name, list<string> emails, int utc_offset_hour, int utc_offset_minute)
-       : wxDialog (parent, wxID_ANY, std_to_wx (title))
+CinemaDialog::CinemaDialog (wxWindow* parent, wxString title, string name, list<string> emails, int utc_offset_hour, int utc_offset_minute)
+       : wxDialog (parent, wxID_ANY, title)
 {
        wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
        SetSizer (overall_sizer);

diff --git a/src/wx/cinema_dialog.h b/src/wx/cinema_dialog.h
index 2949d6c8c3eb27412ae004af159087923709a818..187bd11f22948a7ae08b2fa4d8010435b2d8e170 100644 (file)
--- a/src/wx/cinema_dialog.h
+++ b/src/wx/cinema_dialog.h
@@ -29,7 +29,7 @@ class CinemaDialog : public wxDialog
 public:
        CinemaDialog (
                wxWindow *,
-               std::string,
+               wxString,
                std::string name = "",
                std::list<std::string> emails = std::list<std::string> (),
                int utc_offset_hour = 0,

diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index f640cdbc27262b8e60cb389a64748cb90f327ff2..ddedb71ecc351bdaae0697ce58eb3193fad201cd 100644 (file)
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -50,8 +50,8 @@ public:
        }
 };
 
-ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, optional<dcp::Certificate> recipient, vector<dcp::Certificate> trusted_devices)
-       : wxDialog (parent, wxID_ANY, std_to_wx (title))
+ScreenDialog::ScreenDialog (wxWindow* parent, wxString title, string name, optional<dcp::Certificate> recipient, vector<dcp::Certificate> trusted_devices)
+       : wxDialog (parent, wxID_ANY, title)
        , _recipient (recipient)
        , _trusted_devices (trusted_devices)
 {

diff --git a/src/wx/screen_dialog.h b/src/wx/screen_dialog.h
index 5ae369415e001cdf9cf145adeafdbf1bcb0d1573..5b786f6c16bc14c560cf11d00500e98484836698 100644 (file)
--- a/src/wx/screen_dialog.h
+++ b/src/wx/screen_dialog.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@ class ScreenDialog : public wxDialog
 public:
        ScreenDialog (
                wxWindow *,
-               std::string,
+               wxString,
                std::string name = "",
                boost::optional<dcp::Certificate> c = boost::optional<dcp::Certificate> (),
                std::vector<dcp::Certificate> d = std::vector<dcp::Certificate> ()

diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc
index 4f95ff40868ee1c953ec53140b7907c4fbffe0a0..8eb8ba6707cda10a8ac184950f190b174da1ff8d 100644 (file)
--- a/src/wx/screens_panel.cc
+++ b/src/wx/screens_panel.cc
@@ -146,7 +146,7 @@ ScreensPanel::add_screen (shared_ptr<Cinema> c, shared_ptr<Screen> s)
 void
 ScreensPanel::add_cinema_clicked ()
 {
-       CinemaDialog* d = new CinemaDialog (this, "Add Cinema");
+       CinemaDialog* d = new CinemaDialog (this, _("Add Cinema"));
        if (d->ShowModal () == wxID_OK) {
                shared_ptr<Cinema> c (new Cinema (d->name(), d->emails(), d->utc_offset_hour(), d->utc_offset_minute()));
                Config::instance()->add_cinema (c);
@@ -165,7 +165,10 @@ ScreensPanel::edit_cinema_clicked ()
 
        pair<wxTreeItemId, shared_ptr<Cinema> > c = *_selected_cinemas.begin();
 
-       CinemaDialog* d = new CinemaDialog (this, "Edit cinema", c.second->name, c.second->emails, c.second->utc_offset_hour(), c.second->utc_offset_minute());
+       CinemaDialog* d = new CinemaDialog (
+               this, _("Edit cinema"), c.second->name, c.second->emails, c.second->utc_offset_hour(), c.second->utc_offset_minute()
+               );
+
        if (d->ShowModal () == wxID_OK) {
                c.second->name = d->name ();
                c.second->emails = d->emails ();
@@ -198,7 +201,7 @@ ScreensPanel::add_screen_clicked ()
 
        shared_ptr<Cinema> c = _selected_cinemas.begin()->second;
 
-       ScreenDialog* d = new ScreenDialog (this, "Add Screen");
+       ScreenDialog* d = new ScreenDialog (this, _("Add Screen"));
        if (d->ShowModal () != wxID_OK) {
                return;
        }
@@ -224,7 +227,7 @@ ScreensPanel::edit_screen_clicked ()
 
        pair<wxTreeItemId, shared_ptr<Screen> > s = *_selected_screens.begin();
 
-       ScreenDialog* d = new ScreenDialog (this, "Edit screen", s.second->name, s.second->recipient, s.second->trusted_devices);
+       ScreenDialog* d = new ScreenDialog (this, _("Edit screen"), s.second->name, s.second->recipient, s.second->trusted_devices);
        if (d->ShowModal () == wxID_OK) {
                s.second->name = d->name ();
                s.second->recipient = d->recipient ();