Skip to content

V
vlc
Commit 9365c388 authored by Pavlov Konstantin's avatar Pavlov Konstantin
Browse files
Options

backported [16465], [16494] from trunk: 

recode output in rc interface to current locale,
write comments in config file in user locale
parent 599cb183
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 6 deletions
modules/control/rc.c
View file @ 9365c388
......@@ -54,6 +54,8 @@
#include "network.h"
#include "vlc_url.h"
#include "charset.h"
#if defined(AF_UNIX) && !defined(AF_LOCAL)
# define AF_LOCAL AF_UNIX
#endif
......@@ -137,7 +139,7 @@ void __msg_rc( intf_thread_t *p_intf, const char *psz_fmt, ... )
if( p_intf->p_sys->i_socket == -1 )
{
vprintf( psz_fmt, args );
utf8_vfprintf( stdout, psz_fmt, args );
printf( "\r\n" );
}
else
......
src/misc/configuration.c
View file @ 9365c388
......@@ -1171,7 +1171,7 @@ static int SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name,
fprintf( file, "[%s]", p_parser->psz_object_name );
if( p_parser->psz_longname )
fprintf( file, " # %s\n\n", p_parser->psz_longname );
utf8_fprintf( file, " # %s\n\n", p_parser->psz_longname );
else
fprintf( file, "\n\n" );
......@@ -1207,7 +1207,7 @@ static int SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name,
case CONFIG_ITEM_BOOL:
case CONFIG_ITEM_INTEGER:
if( p_item->psz_text )
fprintf( file, "# %s (%s)\n", p_item->psz_text,
utf8_fprintf( file, "# %s (%s)\n", p_item->psz_text,
(p_item->i_type == CONFIG_ITEM_BOOL) ?
_("boolean") : _("integer") );
if( i_value == p_item->i_value_orig )
......@@ -1219,7 +1219,7 @@ static int SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name,
case CONFIG_ITEM_KEY:
if( p_item->psz_text )
fprintf( file, "# %s (%s)\n", p_item->psz_text,
utf8_fprintf( file, "# %s (%s)\n", p_item->psz_text,
_("key") );
if( i_value == p_item->i_value_orig )
fprintf( file, "#" );
......@@ -1233,7 +1233,7 @@ static int SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name,
case CONFIG_ITEM_FLOAT:
if( p_item->psz_text )
fprintf( file, "# %s (%s)\n", p_item->psz_text,
utf8_fprintf( file, "# %s (%s)\n", p_item->psz_text,
_("float") );
if( f_value == p_item->f_value_orig )
fprintf( file, "#" );
......@@ -1244,7 +1244,7 @@ static int SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name,
default:
if( p_item->psz_text )
fprintf( file, "# %s (%s)\n", p_item->psz_text,
utf8_fprintf( file, "# %s (%s)\n", p_item->psz_text,
_("string") );
if( (!psz_value && !p_item->psz_value_orig) ||
(psz_value && p_item->psz_value_orig &&
......
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