From 1895cfd9642f53dd4ea83e53a655f93c8a65b37e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 8 Mar 2013 11:03:42 +0000 Subject: Fix windows i18n file install path. --- src/tools/dvdomatic.cc | 3 --- windows/installer.nsi.32.in | 2 +- windows/installer.nsi.64.in | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc index 4874e6ef8..d08975061 100644 --- a/src/tools/dvdomatic.cc +++ b/src/tools/dvdomatic.cc @@ -456,9 +456,6 @@ setup_i18n () #ifdef __WXGTK__ locale->AddCatalogLookupPathPrefix (wxT (LOCALE_PREFIX "/locale")); #endif -#ifdef __WXMSW__ - locale->AddCatalogLookupPathPrefix (wxT ("../locale")); -#endif locale->AddCatalog (wxT ("libdvdomatic-wx")); locale->AddCatalog (wxT ("dvdomatic")); diff --git a/windows/installer.nsi.32.in b/windows/installer.nsi.32.in index c90c97e71..5383907d5 100644 --- a/windows/installer.nsi.32.in +++ b/windows/installer.nsi.32.in @@ -93,7 +93,7 @@ File "%deps%/etc/ImageMagick/delegates.xml" SetOutPath "$PROFILE\.magick" File "%deps%/etc/ImageMagick/delegates.xml" -SetOutPath "$INSTDIR\locale\fr_FR" +SetOutPath "$INSTDIR\bin\fr_FR" File "%binaries%/src/tools/mo/fr_FR/dvdomatic.mo" File "%binaries%/src/lib/mo/fr_FR/libdvdomatic.mo" diff --git a/windows/installer.nsi.64.in b/windows/installer.nsi.64.in index 6f7bc5830..5b3f48546 100644 --- a/windows/installer.nsi.64.in +++ b/windows/installer.nsi.64.in @@ -103,7 +103,7 @@ File "%deps%/etc/ImageMagick/delegates.xml" SetOutPath "$PROFILE\.magick" File "%deps%/etc/ImageMagick/delegates.xml" -SetOutPath "$INSTDIR\locale\fr_FR" +SetOutPath "$INSTDIR\bin\fr_FR" File "%binaries%/src/tools/mo/fr_FR/dvdomatic.mo" File "%binaries%/src/lib/mo/fr_FR/libdvdomatic.mo" -- cgit v1.2.3