X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.c;h=411ce92e9bf3ae8f68582aca880d705e50806c7d;hb=d632ffe1a6f5e6cea5dd796105e1708cdb0b3631;hp=22d1183918bb2f47ffebb467dc10ce5a8ad03af2;hpb=494ace96d068ee8e4b6b689da0ae469c0c0e4fe3;p=vlc

diff --git a/src/libvlc.c b/src/libvlc.c
index 22d1183918..411ce92e9b 100644
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -1212,10 +1212,7 @@ static void SetLanguage ( const char *psz_lang )
      * the language at runtime under eg. Windows. Beware that this
      * makes the environment unconsistent when libvlc is unloaded and
      * should probably be moved to a safer place like vlc.c. */
-    static char psz_lcall[20];
-    snprintf( psz_lcall, 19, "LC_ALL=%s", psz_lang );
-    psz_lcall[19] = '\0';
-    putenv( psz_lcall );
+    setenv( "LC_ALL", psz_lang, 1 );
 #endif
 
     setlocale( LC_ALL, psz_lang );
@@ -1232,8 +1229,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;