More Windows i18n tinkering.

diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc
index d089750614fbcf23b4bf2a6ca9a4817f3dd311a7..4874e6ef856478406fe3571e5e49e52cc0dc2b3c 100644 (file)
--- a/src/tools/dvdomatic.cc
+++ b/src/tools/dvdomatic.cc
@@ -456,6 +456,9 @@ 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 0a993d6bf03f7949fe39fa4dad827edc48947e6d..c90c97e71aa894fb1e14b1af15510c1bd299298e 100644 (file)
--- a/windows/installer.nsi.32.in
+++ b/windows/installer.nsi.32.in
@@ -86,11 +86,6 @@ File "%binaries%/src/tools/dvdomatic.exe"
 File "%binaries%/src/tools/servomatic_cli.exe"
 File "%binaries%/src/tools/servomatic_gui.exe"
 
-SetOutPath "$INSTDIR\locale\fr_FR"
-
-File "%binaries%/src/tools/mo/fr_FR/dvdomatic.mo"
-File "%binaries%/src/lib/mo/fr_FR/libdvdomatic.mo"
-
 # I don't know why, but sometimes it seems that 
 # delegates.xml must be in with the binaries, and
 # sometimes in the $PROFILE.  Meh.
@@ -98,6 +93,11 @@ File "%deps%/etc/ImageMagick/delegates.xml"
 SetOutPath "$PROFILE\.magick"
 File "%deps%/etc/ImageMagick/delegates.xml"
 
+SetOutPath "$INSTDIR\locale\fr_FR"
+
+File "%binaries%/src/tools/mo/fr_FR/dvdomatic.mo"
+File "%binaries%/src/lib/mo/fr_FR/libdvdomatic.mo"
+
 CreateShortCut "$DESKTOP\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" ""
 CreateShortCut "$DESKTOP\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" ""
  

diff --git a/windows/installer.nsi.64.in b/windows/installer.nsi.64.in
index 33e3c7fe17da437525e869ec5623e678b94fe65a..6f7bc583027e3c306c36b74e11f4abaa36d2f16a 100644 (file)
--- a/windows/installer.nsi.64.in
+++ b/windows/installer.nsi.64.in
@@ -96,11 +96,6 @@ File "%binaries%/src/tools/dvdomatic.exe"
 File "%binaries%/src/tools/servomatic_cli.exe"
 File "%binaries%/src/tools/servomatic_gui.exe"
 
-SetOutPath "$INSTDIR\locale\fr_FR"
-
-File "%binaries%/src/tools/mo/fr_FR/dvdomatic.mo"
-File "%binaries%/src/lib/mo/fr_FR/libdvdomatic.mo"
-
 # I don't know why, but sometimes it seems that 
 # delegates.xml must be in with the binaries, and
 # sometimes in the $PROFILE.  Meh.
@@ -108,6 +103,11 @@ File "%deps%/etc/ImageMagick/delegates.xml"
 SetOutPath "$PROFILE\.magick"
 File "%deps%/etc/ImageMagick/delegates.xml"
 
+SetOutPath "$INSTDIR\locale\fr_FR"
+
+File "%binaries%/src/tools/mo/fr_FR/dvdomatic.mo"
+File "%binaries%/src/lib/mo/fr_FR/libdvdomatic.mo"
+
 CreateShortCut "$DESKTOP\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" ""
 CreateShortCut "$DESKTOP\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" ""