* Fixed the translation option with Mac OS X.

diff --git a/NEWS b/NEWS
index 42b498e4b88efeaac1b1c720cb77091bb60ec5d9..5da7539ffbb7491cb853b00589b963c75bb27b24 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-$Id: NEWS,v 1.36 2003/04/06 23:00:24 hartman Exp $
+$Id: NEWS,v 1.37 2003/04/08 08:35:59 massiot Exp $
 
 Changes between 0.5.2 and 0.5.3:
 ---------------------------------
@@ -10,6 +10,7 @@ Core Support:
  * video outputs are now destroyed when the associated input ends
  * the video output takes into account the caching delay introduced at the
    input level before dropping out of date frames.
+ * configuration option to disable the translation of the interface
 
 Input access:
  * fixed HTTP redirects
@@ -30,7 +31,7 @@ Codecs:
  * support for SAMI subtitles (untested and incomplete)
  * better SSA4 subtitles recognition
  * new codec for raw I420 video
- * improvements to the libmpeg2 based MPEG video decoder
+ * improvements to the libmpeg2-based MPEG video decoder
 
 Interfaces:
  * improvements to wxWindows based interface

diff --git a/src/libvlc.c b/src/libvlc.c
index a6a76fb70b63e753c354376184fcdd33fb22c2e6..fe956353acbe5fb7bab2149247fdf0b219e911f6 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -2,7 +2,7 @@
  * libvlc.c: main libvlc source
  *****************************************************************************
  * Copyright (C) 1998-2002 VideoLAN
- * $Id: libvlc.c,v 1.76 2003/04/07 21:51:27 massiot Exp $
+ * $Id: libvlc.c,v 1.77 2003/04/08 08:35:59 massiot Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -331,7 +331,6 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] )
     config_LoadConfigFile( p_vlc, "main" );
     config_LoadCmdLine( p_vlc, &i_argc, ppsz_argv, VLC_TRUE );
 
-#   ifndef SYS_DARWIN
     if( !config_GetInt( p_vlc, "translation" ) )
     {
         /* Reset the default domain */
@@ -343,7 +342,6 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] )
         module_InitBank( &libvlc );
         module_LoadMain( &libvlc );
     }
-#   endif
 #endif
 
     /*
@@ -1037,6 +1035,11 @@ static void SetLanguage ( char const *psz_lang )
     else
     {
         setlocale( LC_ALL, psz_lang );
+#ifdef SYS_DARWIN
+        /* I need that under Darwin, please check it doesn't disturb
+         * other platforms. --Meuuh */
+        setenv( "LANG", psz_lang, 1 );
+#endif
     }
 
     /* Specify where to find the locales for current domain */

diff --git a/src/libvlc.h b/src/libvlc.h
index 9da6534a6962e6ec81b4794138f812c056594053..0bf323879cb09f70c901a1270db502115c49a2ab 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -2,7 +2,7 @@
  * libvlc.h: main libvlc header
  *****************************************************************************
  * Copyright (C) 1998-2002 VideoLAN
- * $Id: libvlc.h,v 1.55 2003/04/06 23:44:53 massiot Exp $
+ * $Id: libvlc.h,v 1.56 2003/04/08 08:35:59 massiot Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -448,9 +448,7 @@ vlc_module_begin();
     add_integer_with_short( "verbose", 'v', -1, NULL,
                             VERBOSE_TEXT, VERBOSE_LONGTEXT, VLC_FALSE );
     add_bool_with_short( "quiet", 'q', 0, NULL, QUIET_TEXT, QUIET_LONGTEXT, VLC_TRUE );
-#ifndef SYS_DARWIN
     add_bool( "translation", 1, NULL, TRANSLATION_TEXT, TRANSLATION_LONGTEXT, VLC_FALSE );
-#endif
     add_bool( "color", 0, NULL, COLOR_TEXT, COLOR_LONGTEXT, VLC_TRUE );
     add_bool( "advanced", 0, NULL, ADVANCED_TEXT, ADVANCED_LONGTEXT, VLC_FALSE );
     add_string( "search-path", NULL, NULL, INTF_PATH_TEXT, INTF_PATH_LONGTEXT, VLC_TRUE );

diff --git a/src/misc/darwin_specific.m b/src/misc/darwin_specific.m
index 00fd0b71bf70dc33cd0146632511261d2132442a..ced3d23ff09a398ca45e985b5bb6dff42842488c 100644 (file)
--- a/src/misc/darwin_specific.m
+++ b/src/misc/darwin_specific.m
@@ -2,7 +2,7 @@
  * darwin_specific.m: Darwin specific features 
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: darwin_specific.m,v 1.12 2003/02/17 23:47:29 hartman Exp $
+ * $Id: darwin_specific.m,v 1.13 2003/04/08 08:36:00 massiot Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -28,6 +28,10 @@
 
 #include <Cocoa/Cocoa.h>
 
+#ifdef HAVE_LOCALE_H
+#   include <locale.h>
+#endif
+
 /*****************************************************************************
  * system_Init: fill in program path & retrieve language
  *****************************************************************************/
@@ -41,6 +45,7 @@ static int FindLanguage( const char * psz_lang )
         "English", "en",
         "French", "fr",
         "Italian", "it",
+
         "Japanese", "ja",
         "Dutch", "nl",
         "Norwegian", "no",