diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-13 23:00:39 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-13 23:00:39 +0100 |
| commit | 2ed96cf8baea81ab3b6331ae029bfa76ef2522e1 (patch) | |
| tree | 2bb00e2c89e16b4423982e9fc1f8eb65d1194020 | |
| parent | c71b3d2b9de7dbc3ba237b550efd721b5fd480ac (diff) | |
Try to fix completely broken i18n.
| -rwxr-xr-x | debian/rules | 12 | ||||
| -rw-r--r-- | src/lib/util.cc | 8 | ||||
| -rw-r--r-- | src/wx/wx_util.cc | 6 |
3 files changed, 13 insertions, 13 deletions
diff --git a/debian/rules b/debian/rules index 3e75b0090..6d6dbf906 100755 --- 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 92b8847bd..ad4349da2 100644 --- 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 9c13cfbcb..218b24b02 100644 --- 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; |