Commit 089c011a authored by Felix Paul Kühne's avatar Felix Paul Kühne

intf.m: * we can't localise empty strings, so don't put an error when trying...

intf.m: * we can't localise empty strings, so don't put an error when trying to do so, but just a warning
    * be a bit nicer and return @"" instead of NULL strings
    - this fixes the display of certain modules in the preferences such as the parametric equaliser

prefs.m: * removed 2 unused variables
parent b0639d94
...@@ -654,10 +654,17 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -654,10 +654,17 @@ static VLCMain *_o_sharedMainInstance = nil;
if( psz != NULL ) if( psz != NULL )
{ {
o_str = [[[NSString alloc] initWithUTF8String: psz] autorelease]; o_str = [[[NSString alloc] initWithUTF8String: psz] autorelease];
}
if ( o_str == NULL ) if ( o_str == NULL )
{ {
msg_Err( VLCIntf, "could not translate: %s", psz ); msg_Err( VLCIntf, "could not translate: %s", psz );
return( @"" );
}
}
else
{
msg_Warn( VLCIntf, "can't translate empty strings" );
return( @"" );
} }
return( o_str ); return( o_str );
......
...@@ -315,10 +315,10 @@ static VLCTreeItem *o_root_item = nil; ...@@ -315,10 +315,10 @@ static VLCTreeItem *o_root_item = nil;
if( p_item->i_value == -1 ) break; if( p_item->i_value == -1 ) break;
o_child_name = [[VLCMain sharedInstance] o_child_name = [[VLCMain sharedInstance]
localizedString: config_CategoryNameGet( p_item->i_value ) ]; localizedString: config_CategoryNameGet( p_item->i_value )];
o_child_title = o_child_name; o_child_title = o_child_name;
o_child_help = [[VLCMain sharedInstance] o_child_help = [[VLCMain sharedInstance]
localizedString: config_CategoryHelpGet( p_item->i_value ) ]; localizedString: config_CategoryHelpGet( p_item->i_value )];
p_last_category = [VLCTreeItem alloc]; p_last_category = [VLCTreeItem alloc];
[o_children addObject:[p_last_category [o_children addObject:[p_last_category
initWithName: o_child_name initWithName: o_child_name
...@@ -546,7 +546,6 @@ static VLCTreeItem *o_root_item = nil; ...@@ -546,7 +546,6 @@ static VLCTreeItem *o_root_item = nil;
return nil; return nil;
} }
p_item = p_parser->p_config; p_item = p_parser->p_config;
int i = 0;
p_item = p_parser->p_config + 1; p_item = p_parser->p_config + 1;
...@@ -589,7 +588,6 @@ static VLCTreeItem *o_root_item = nil; ...@@ -589,7 +588,6 @@ static VLCTreeItem *o_root_item = nil;
} }
else else
{ {
int i = 0;
int i_index; int i_index;
p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE ); p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
if( !p_list ) return o_view; if( !p_list ) return o_view;
......
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