diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-03-08 00:24:51 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-03-08 00:24:51 +0000 |
| commit | df499ab4fd81b3cf4686f2e97fd4c9cd339dfdff (patch) | |
| tree | c0d1fcb48fc92bce963d98960d8456ff7aa07b35 | |
| parent | 793988bf48d6dcc0455dc30343e0bb7d316fc512 (diff) | |
More Windows i18n tinkering.
| -rw-r--r-- | src/tools/dvdomatic.cc | 3 | ||||
| -rw-r--r-- | windows/installer.nsi.32.in | 10 | ||||
| -rw-r--r-- | windows/installer.nsi.64.in | 10 |
3 files changed, 13 insertions, 10 deletions
diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc index d08975061..4874e6ef8 100644 --- 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 0a993d6bf..c90c97e71 100644 --- 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 33e3c7fe1..6f7bc5830 100644 --- 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" "" |