Skip to content

V
vlc
Commit 6ef0cf37 authored by Felix Paul Kühne's avatar Felix Paul Kühne Committed by Jean-Baptiste Kempf
Browse files
Options

macosx: displayed ocalizable sstrings correctly 

(cherry picked from commit b3807154)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent dd39bba0
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 9 deletions
modules/gui/macosx/MainWindow.m
View file @ 6ef0cf37
......@@ -332,7 +332,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
switch (*p_category) {
case SD_CAT_INTERNET:
{
[internetItems addObject: [SideBarItem itemWithTitle: [NSString stringWithCString: *ppsz_longname encoding: NSUTF8StringEncoding] identifier: o_identifier]];
[internetItems addObject: [SideBarItem itemWithTitle: _NS(*ppsz_longname) identifier: o_identifier]];
if (!strncmp( *ppsz_name, "podcast", 7 ))
[[internetItems lastObject] setIcon: [NSImage imageNamed:@"sidebar-podcast"]];
else
......@@ -342,21 +342,21 @@ static VLCMainWindow *_o_sharedInstance = nil;
break;
case SD_CAT_DEVICES:
{
[devicesItems addObject: [SideBarItem itemWithTitle: [NSString stringWithCString: *ppsz_longname encoding: NSUTF8StringEncoding] identifier: o_identifier]];
[devicesItems addObject: [SideBarItem itemWithTitle: _NS(*ppsz_longname) identifier: o_identifier]];
[[devicesItems lastObject] setIcon: [NSImage imageNamed:@"NSApplicationIcon"]];
[[devicesItems lastObject] setSdtype: SD_CAT_DEVICES];
}
break;
case SD_CAT_LAN:
{
[lanItems addObject: [SideBarItem itemWithTitle: [NSString stringWithCString: *ppsz_longname encoding: NSUTF8StringEncoding] identifier: o_identifier]];
[lanItems addObject: [SideBarItem itemWithTitle: _NS(*ppsz_longname) identifier: o_identifier]];
[[lanItems lastObject] setIcon: [NSImage imageNamed:@"sidebar-local"]];
[[lanItems lastObject] setSdtype: SD_CAT_LAN];
}
break;
case SD_CAT_MYCOMPUTER:
{
[mycompItems addObject: [SideBarItem itemWithTitle: [NSString stringWithCString: *ppsz_longname encoding: NSUTF8StringEncoding] identifier: o_identifier]];
[mycompItems addObject: [SideBarItem itemWithTitle: _NS(*ppsz_longname) identifier: o_identifier]];
if (!strncmp( *ppsz_name, "video_dir", 9 ))
[[mycompItems lastObject] setIcon: [NSImage imageNamed:@"sidebar-movie"]];
else if (!strncmp( *ppsz_name, "audio_dir", 9 ))
......
modules/gui/macosx/open.m
View file @ 6ef0cf37
......@@ -346,8 +346,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
for ( i_index = 0; i_index < p_item->i_list; i_index++ )
{
[o_file_sub_align_pop addItemWithTitle:
[NSString stringWithUTF8String:
p_item->ppsz_list_text[i_index]]];
_NS(p_item->ppsz_list_text[i_index])];
}
[o_file_sub_align_pop selectItemAtIndex: p_item->value.i];
}
......@@ -358,9 +357,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
{
for ( i_index = 0; i_index < p_item->i_list; i_index++ )
{
[o_file_sub_size_pop addItemWithTitle:
[NSString stringWithUTF8String:
p_item->ppsz_list_text[i_index]]];
[o_file_sub_size_pop addItemWithTitle: _NS(p_item->ppsz_list_text[i_index])];
if ( p_item->value.i == p_item->pi_list[i_index] )
{
[o_file_sub_size_pop selectItemAtIndex: i_index];
......
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