Move i18n setup into 3 separate platform files.

10 files changed, 21 insertions, 10 deletions

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index b3b3d1c87..4ab9c03ed 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -38,6 +38,7 @@
 #include "wx/hints_dialog.h"
 #include "wx/html_dialog.h"
 #include "wx/file_dialog.h"
+#include "wx/i18n_setup.h"
 #include "wx/id.h"
 #include "wx/job_manager_view.h"
 #include "wx/kdm_dialog.h"
@@ -1685,7 +1686,7 @@ private:
 			   hasn't yet been called and there aren't any filters etc.
 			   set up yet.
 			*/
-			dcpomatic_setup_i18n ();
+			dcpomatic::wx::setup_i18n();
 
 			/* Set things up, including filters etc.
 			   which will now be internationalised correctly.
diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc
index ed60aae37..c6a58f741 100644
--- a/src/tools/dcpomatic_batch.cc
+++ b/src/tools/dcpomatic_batch.cc
@@ -22,6 +22,7 @@
 #include "wx/about_dialog.h"
 #include "wx/dcpomatic_button.h"
 #include "wx/full_config_dialog.h"
+#include "wx/i18n_setup.h"
 #include "wx/id.h"
 #include "wx/job_manager_view.h"
 #include "wx/servers_list_dialog.h"
@@ -447,7 +448,7 @@ class App : public wxApp
 		   hasn't yet been called and there aren't any filters etc.
 		   set up yet.
 		*/
-		dcpomatic_setup_i18n ();
+		dcpomatic::wx::setup_i18n();
 
 		/* Set things up, including filters etc.
 		   which will now be internationalised correctly.
diff --git a/src/tools/dcpomatic_combiner.cc b/src/tools/dcpomatic_combiner.cc
index 38c8cf97f..67ca73539 100644
--- a/src/tools/dcpomatic_combiner.cc
+++ b/src/tools/dcpomatic_combiner.cc
@@ -22,6 +22,7 @@
 #include "wx/dir_dialog.h"
 #include "wx/dir_picker_ctrl.h"
 #include "wx/editable_list.h"
+#include "wx/i18n_setup.h"
 #include "wx/wx_signal_manager.h"
 #include "wx/wx_util.h"
 #include "wx/wx_variant.h"
@@ -244,7 +245,7 @@ public:
 			   hasn't yet been called and there aren't any filters etc.
 			   set up yet.
 			*/
-			dcpomatic_setup_i18n ();
+			dcpomatic::wx::setup_i18n();
 
 			/* Set things up, including filters etc.
 			   which will now be internationalised correctly.
diff --git a/src/tools/dcpomatic_disk.cc b/src/tools/dcpomatic_disk.cc
index c83d57b8f..be527eaab 100644
--- a/src/tools/dcpomatic_disk.cc
+++ b/src/tools/dcpomatic_disk.cc
@@ -21,6 +21,7 @@
 
 #include "wx/drive_wipe_warning_dialog.h"
 #include "wx/editable_list.h"
+#include "wx/i18n_setup.h"
 #include "wx/id.h"
 #include "wx/job_manager_view.h"
 #include "wx/message_dialog.h"
@@ -477,7 +478,7 @@ public:
 			   hasn't yet been called and there aren't any filters etc.
 			   set up yet.
 			*/
-			dcpomatic_setup_i18n ();
+			dcpomatic::wx::setup_i18n();
 
 			/* Set things up, including filters etc.
 			   which will now be internationalised correctly.
diff --git a/src/tools/dcpomatic_editor.cc b/src/tools/dcpomatic_editor.cc
index e02f23b68..1cb79681d 100644
--- a/src/tools/dcpomatic_editor.cc
+++ b/src/tools/dcpomatic_editor.cc
@@ -22,6 +22,7 @@
 #include "wx/about_dialog.h"
 #include "wx/dcpomatic_spin_ctrl.h"
 #include "wx/editable_list.h"
+#include "wx/i18n_setup.h"
 #include "wx/id.h"
 #include "wx/wx_signal_manager.h"
 #include "wx/wx_util.h"
@@ -531,7 +532,7 @@ private:
 			   hasn't yet been called and there aren't any filters etc.
 			   set up yet.
 			*/
-			dcpomatic_setup_i18n ();
+			dcpomatic::wx::setup_i18n();
 
 			/* Set things up, including filters etc.
 			   which will now be internationalised correctly.
diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 95d9a25b1..843684103 100644
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -22,6 +22,7 @@
 #include "wx/about_dialog.h"
 #include "wx/dcpomatic_button.h"
 #include "wx/editable_list.h"
+#include "wx/i18n_setup.h"
 #include "wx/id.h"
 #include "wx/invalid_certificate_period_dialog.h"
 #include "wx/file_dialog.h"
@@ -913,7 +914,7 @@ private:
 			   hasn't yet been called and there aren't any filters etc.
 			   set up yet.
 			*/
-			dcpomatic_setup_i18n ();
+			dcpomatic::wx::setup_i18n();
 
 			/* Set things up, including filters etc.
 			   which will now be internationalised correctly.
diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index ab508f224..43c071556 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -21,6 +21,7 @@
 #include "wx/about_dialog.h"
 #include "wx/file_dialog.h"
 #include "wx/film_viewer.h"
+#include "wx/i18n_setup.h"
 #include "wx/id.h"
 #include "wx/nag_dialog.h"
 #include "wx/player_config_dialog.h"
@@ -1311,7 +1312,7 @@ private:
 			   hasn't yet been called and there aren't any filters etc.
 			   set up yet.
 			*/
-			dcpomatic_setup_i18n ();
+			dcpomatic::wx::setup_i18n();
 
 			/* Set things up, including filters etc.
 			   which will now be internationalised correctly.
diff --git a/src/tools/dcpomatic_playlist.cc b/src/tools/dcpomatic_playlist.cc
index 264afe27d..54b459634 100644
--- a/src/tools/dcpomatic_playlist.cc
+++ b/src/tools/dcpomatic_playlist.cc
@@ -22,6 +22,7 @@
 #include "wx/about_dialog.h"
 #include "wx/content_view.h"
 #include "wx/dcpomatic_button.h"
+#include "wx/i18n_setup.h"
 #include "wx/playlist_editor_config_dialog.h"
 #include "wx/wx_signal_manager.h"
 #include "wx/wx_util.h"
@@ -660,7 +661,7 @@ private:
 		   hasn't yet been called and there aren't any filters etc.
 		   set up yet.
 		*/
-		dcpomatic_setup_i18n ();
+		dcpomatic::wx::setup_i18n();
 
 		/* Set things up, including filters etc.
 		   which will now be internationalised correctly.
diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index 669d32ec0..e5d8b0a90 100644
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -18,6 +18,8 @@
 
 */
 
+
+#include "wx/i18n_setup.h"
 #include "wx/id.h"
 #include "wx/static_text.h"
 #include "wx/wx_signal_manager.h"
@@ -301,7 +303,7 @@ private:
 		auto splash = maybe_show_splash ();
 
 		dcpomatic_setup_path_encoding ();
-		dcpomatic_setup_i18n ();
+		dcpomatic::wx::setup_i18n();
 		dcpomatic_setup ();
 		Config::drop ();
 
diff --git a/src/tools/dcpomatic_verifier.cc b/src/tools/dcpomatic_verifier.cc
index 238efe552..f53f99e3d 100644
--- a/src/tools/dcpomatic_verifier.cc
+++ b/src/tools/dcpomatic_verifier.cc
@@ -29,6 +29,7 @@
 #include "wx/dcpomatic_button.h"
 #include "wx/dir_picker_ctrl.h"
 #include "wx/editable_list.h"
+#include "wx/i18n_setup.h"
 #include "wx/id.h"
 #include "wx/verify_dcp_progress_panel.h"
 #include "wx/verify_dcp_result_panel.h"
@@ -324,7 +325,7 @@ private:
 			   hasn't yet been called and there aren't any filters etc.
 			   set up yet.
 			*/
-			dcpomatic_setup_i18n();
+			dcpomatic::wx::setup_i18n();
 
 			/* Set things up, including filters etc.
 			   which will now be internationalised correctly.