Commit a3eb8858 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Use Latin-9 rather than US-ASCII when there is no local charset

parent 18254c34
...@@ -1842,6 +1842,16 @@ static void LocaleInit( void ) ...@@ -1842,6 +1842,16 @@ static void LocaleInit( void )
if( !vlc_current_charset( &psz_charset ) ) if( !vlc_current_charset( &psz_charset ) )
{ {
char *psz_conv = psz_charset;
/*
* Still allow non-ASCII characters when the locale is not set.
* Western Europeans are being favored for historical reasons.
*/
psz_conv = strcmp( psz_charset, "ASCII" )
? psz_charset
: "ISO-8859-15";
vlc_mutex_init( p_libvlc, &libvlc.from_locale_lock ); vlc_mutex_init( p_libvlc, &libvlc.from_locale_lock );
vlc_mutex_init( p_libvlc, &libvlc.to_locale_lock ); vlc_mutex_init( p_libvlc, &libvlc.to_locale_lock );
libvlc.from_locale = vlc_iconv_open( "UTF-8", psz_charset ); libvlc.from_locale = vlc_iconv_open( "UTF-8", psz_charset );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment