Try to fix completely broken i18n.

diff --git a/debian/rules b/debian/rules
index 3e75b00900597184667c2f05c5b08382f50a10f9..6d6dbf906c4231f63ddd2a3bdf000494b88cc390 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -22,17 +22,17 @@ override_dh_auto_build:
 override_dh_auto_install:
        ./waf install --destdir=debian/dcpomatic
        mkdir -p debian/dcpomatic/usr/share/locale/de/LC_MESSAGES/
-       cp -a $(CDIST_LOCALE_PREFIX)/de/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/de/LC_MESSAGES/dcpomatic-wxstd.mo
+       cp -a $(CDIST_LOCALE_PREFIX)/de/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/de/LC_MESSAGES/dcpomatic2-wxstd.mo
        mkdir -p debian/dcpomatic/usr/share/locale/es/LC_MESSAGES/
-       cp -a $(CDIST_LOCALE_PREFIX)/es/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/es/LC_MESSAGES/dcpomatic-wxstd.mo
+       cp -a $(CDIST_LOCALE_PREFIX)/es/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/es/LC_MESSAGES/dcpomatic2-wxstd.mo
        mkdir -p debian/dcpomatic/usr/share/locale/fr/LC_MESSAGES/
-       cp -a $(CDIST_LOCALE_PREFIX)/fr/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/fr/LC_MESSAGES/dcpomatic-wxstd.mo
+       cp -a $(CDIST_LOCALE_PREFIX)/fr/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/fr/LC_MESSAGES/dcpomatic2-wxstd.mo
        mkdir -p debian/dcpomatic/usr/share/locale/it/LC_MESSAGES/
-       cp -a $(CDIST_LOCALE_PREFIX)/it/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/it/LC_MESSAGES/dcpomatic-wxstd.mo
+       cp -a $(CDIST_LOCALE_PREFIX)/it/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/it/LC_MESSAGES/dcpomatic2-wxstd.mo
        mkdir -p debian/dcpomatic/usr/share/locale/sv/LC_MESSAGES/
-       cp -a $(CDIST_LOCALE_PREFIX)/sv/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/sv/LC_MESSAGES/dcpomatic-wxstd.mo
+       cp -a $(CDIST_LOCALE_PREFIX)/sv/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/sv/LC_MESSAGES/dcpomatic2-wxstd.mo
        mkdir -p debian/dcpomatic/usr/share/locale/nl/LC_MESSAGES/
-       cp -a $(CDIST_LOCALE_PREFIX)/nl/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/nl/LC_MESSAGES/dcpomatic-wxstd.mo
+       cp -a $(CDIST_LOCALE_PREFIX)/nl/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/nl/LC_MESSAGES/dcpomatic2-wxstd.mo
 
 .PHONY: override_dh_strip
 override_dh_strip:

diff --git a/src/lib/util.cc b/src/lib/util.cc
index 92b8847bd121685ba9729430c7e100e81336d5a8..ad4349da202d61d81811629db950882e2279bb17 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -377,15 +377,15 @@ dcpomatic_setup_gettext_i18n (string lang)
        }
 
        setlocale (LC_ALL, "");
-       textdomain ("libdcpomatic");
+       textdomain ("libdcpomatic2");
 
 #if defined(DCPOMATIC_WINDOWS) || defined(DCPOMATIC_OSX)
-       bindtextdomain ("libdcpomatic", mo_path().string().c_str());
-       bind_textdomain_codeset ("libdcpomatic", "UTF8");
+       bindtextdomain ("libdcpomatic2", mo_path().string().c_str());
+       bind_textdomain_codeset ("libdcpomatic2", "UTF8");
 #endif 
 
 #ifdef DCPOMATIC_LINUX
-       bindtextdomain ("libdcpomatic", LINUX_LOCALE_PREFIX);
+       bindtextdomain ("libdcpomatic2", LINUX_LOCALE_PREFIX);
 #endif
 }
 

diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index 9c13cfbcb69e741cbff7f8d8e42c8804bf62494e..218b24b02dee1943f05ae8ca387a94a4fb8f7557 100644 (file)
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -278,11 +278,11 @@ dcpomatic_setup_i18n ()
                   so we rename it to avoid clashes with any other installation
                   of wxWidgets.
                */
-               locale->AddCatalog (wxT ("dcpomatic-wxstd"));
+               locale->AddCatalog (wxT ("dcpomatic2-wxstd"));
 #endif         
                
-               locale->AddCatalog (wxT ("libdcpomatic-wx"));
-               locale->AddCatalog (wxT ("dcpomatic"));
+               locale->AddCatalog (wxT ("libdcpomatic2-wx"));
+               locale->AddCatalog (wxT ("dcpomatic2"));
                
                if (!locale->IsOk()) {
                        delete locale;