Install the translations in share on win32 and MacOSX

diff --git a/Makefile.am b/Makefile.am
index a351c84a6ec094c603e6df0851ffd8a7d781f6ad..e2e820dd1e81e663610dd401dded8b5862a6d315 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -337,9 +337,9 @@ vlc-bundle: vlc
          done ; \
        fi
        cat $(top_srcdir)/po/LINGUAS | while read i; do \
-         mkdir -p "$(top_builddir)/vlc-bundle/locale/$$i/LC_MESSAGES" ; \
+         mkdir -p "$(top_builddir)/vlc-bundle/share/locale/$$i/LC_MESSAGES" ; \
          cp "$(top_builddir)/po/$$i.gmo" \
-           "$(top_builddir)/vlc-bundle/locale/$$i/LC_MESSAGES/vlc.mo" || true ; \
+           "$(top_builddir)/vlc-bundle/share/locale/$$i/LC_MESSAGES/vlc.mo" || true ; \
        done
        find $(top_builddir)/vlc-bundle -type f -exec mimeset -f "{}" \;
 endif
@@ -540,9 +540,9 @@ VLC-release.app: vlc
          $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/`basename $${i}` ; \
        done
        $(INSTALL) -m 644 $(srcdir)/share/http/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/readme.txt
-       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/locale
+       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/locale
        cat $(top_srcdir)/po/LINGUAS | while read i; do \
-         mkdir -p $(top_builddir)/VLC-release.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
+         mkdir -p $(top_builddir)/VLC-release.app/Contents/MacOS/share/locale/$${i}/LC_MESSAGES ; \
          cp $(srcdir)/po/$${i}.gmo $(top_builddir)/VLC-release.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
          mkdir -p $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \
          ln -sf ../English.lproj/InfoPlist.strings \
@@ -639,10 +639,10 @@ VLC.app: vlc
                                   "$(top_builddir)/VLC.app/Contents/MacOS/modules" ; \
          fi ; done && \
        ln -sfn `pwd`/$(srcdir)/share $(top_builddir)/VLC.app/Contents/MacOS/
-       $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/locale
+       $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share/locale
        cat $(top_srcdir)/po/LINGUAS | while read i; do \
-         mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
-         ln -sfn `pwd`/$(srcdir)/po/$${i}.gmo $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
+         mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/share/locale/$${i}/LC_MESSAGES ; \
+         ln -sfn `pwd`/$(srcdir)/po/$${i}.gmo $(top_builddir)/VLC.app/Contents/MacOS/share/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
          mkdir -p $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \
          ln -sf ../English.lproj/InfoPlist.strings \
              $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \
@@ -687,11 +687,11 @@ package-win-common:
        cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-$(VERSION)/
 
 # Copy the locales
-       mkdir -p $(top_builddir)/vlc-$(VERSION)/locale
+       mkdir -p $(top_builddir)/vlc-$(VERSION)/share/locale
        cat $(top_srcdir)/po/LINGUAS | while read i; do \
-         mkdir -p "$(top_builddir)/vlc-$(VERSION)/locale/$${i}/LC_MESSAGES" ; \
+         mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/locale/$${i}/LC_MESSAGES" ; \
          cp "$(srcdir)/po/$${i}.gmo" \
-           "$(top_builddir)/vlc-$(VERSION)/locale/$${i}/LC_MESSAGES/vlc.mo" \
+           "$(top_builddir)/vlc-$(VERSION)/share/locale/$${i}/LC_MESSAGES/vlc.mo" \
             || true ; \
        done
 

diff --git a/src/libvlc.c b/src/libvlc.c
index 22d1183918bb2f47ffebb467dc10ce5a8ad03af2..17482f6973d3152dcfa79e200f5f5ef3f25eb284 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -1232,8 +1232,8 @@ static inline int LoadMessages (void)
     static const char psz_path[] = LOCALEDIR;
 #else
     char psz_path[1024];
-    if (snprintf (psz_path, sizeof (psz_path), "%s/%s",
-                  vlc_global()->psz_vlcpath, "locale")
+    if (snprintf (psz_path, sizeof (psz_path), "%s" DIR_SEP "%s",
+                  config_GetDataDir(), "locale")
                      >= (int)sizeof (psz_path))
         return -1;