Changeset 71fc0c72c7b716de080e109d8aa5d83bb46bc1c0

Timestamp:

04/15/06 16:18:13 (2 years ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1145110693 +0000

git-parent:

[e67aa8aaf61864b4266dd63ea8e4e83b03c88dbb]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1145110693 +0000

Message:

Do not provide a broken language option on Linux and similar OSes
where the user normally use LANG, LANGUAGE, etc to define his/her
language(s). It didn't work anyway (refs #638).

Files:

• src/libvlc.c (modified) (3 diffs)
• src/libvlc.h (modified) (1 diff)

src/libvlc.c

@@ -459 +459 @@
-#if defined( ENABLE_NLS ) \
-     && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
-
+
-    /* This ain't really nice to have to reload the config here but it seems
-     * the only way to do it. */
@@ -473 +473 @@
-        /* Reset the default domain */
-        SetLanguage( psz_language );
-
-        /* Should not be needed (otherwise, fixes should rather be
-         * attempted on vlc_current_charset().
-         * Also, if the locale charset is overriden, anything that has been
-         * translated until now would have to be retranslated. */
-        /*LocaleDeinit();
-        LocaleInit( (vlc_object_t *)p_vlc );*/
-
-        /* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */
@@ -491 +484 @@
-    }
-    if( psz_language ) free( psz_language );
+# endif
-#endif
-

src/libvlc.h

@@ -1533 +1533 @@
-#endif
-
+#if defined (WIN32) || defined (__APPLE__)
-    add_string( "language", "auto", NULL, LANGUAGE_TEXT, LANGUAGE_LONGTEXT,
-                VLC_FALSE );
-        change_string_list( ppsz_language, ppsz_language_text, 0 );
+#endif
+
-    add_bool( "color", 0, NULL, COLOR_TEXT, COLOR_LONGTEXT, VLC_TRUE );
-    add_bool( "advanced", 0, NULL, ADVANCED_TEXT, ADVANCED_LONGTEXT,