Commit 3ed801aa authored by Marc Etcheverry's avatar Marc Etcheverry Committed by Felix Paul Kühne

Replace instances of NSLocalizedString(@"STRING", @"") with NSLocalizedString(@"STRING", nil)

Signed-off-by: Felix Paul Kühne's avatarFelix Paul Kühne <fkuehne@videolan.org>
parent ecf9eb37
......@@ -17,7 +17,7 @@
@implementation UIBarButtonItem (Theme)
+ (UIBarButtonItem *)themedDoneButtonWithTarget:(id)target andSelector:(SEL)selector
{
UIBarButtonItem *doneButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"BUTTON_DONE", @"")
UIBarButtonItem *doneButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"BUTTON_DONE", nil)
style:UIBarButtonItemStyleBordered
target:target
action:selector];
......@@ -38,7 +38,7 @@
+ (UIBarButtonItem *)themedBackButtonWithTarget:(id)target andSelector:(SEL)selector
{
UIBarButtonItem *backButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"BUTTON_BACK", @"")
UIBarButtonItem *backButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"BUTTON_BACK", nil)
style:UIBarButtonItemStyleBordered
target:target
action:selector];
......@@ -80,7 +80,7 @@
[menuButton setBackgroundImage:[UIImage imageNamed:@"button"] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault];
[menuButton setBackgroundImage:[UIImage imageNamed:@"buttonHighlight"] forState:UIControlStateHighlighted barMetrics:UIBarMetricsDefault];
}
menuButton.accessibilityLabel = NSLocalizedString(@"OPEN_VLC_MENU", @"");
menuButton.accessibilityLabel = NSLocalizedString(@"OPEN_VLC_MENU", nil);
menuButton.isAccessibilityElement = YES;
return menuButton;
......
......@@ -41,7 +41,7 @@
self.navigationItem.titleView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"title"]];
UIBarButtonItem *contributeButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"BUTTON_CONTRIBUTE",@"") style:UIBarButtonItemStyleBordered target:self action:@selector(openContributePage:)];
UIBarButtonItem *contributeButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"BUTTON_CONTRIBUTE", nil) style:UIBarButtonItemStyleBordered target:self action:@selector(openContributePage:)];
if (SYSTEM_RUNS_IOS7_OR_LATER)
contributeButton.tintColor = [UIColor whiteColor];
else {
......@@ -53,8 +53,8 @@
self.navigationItem.leftBarButtonItem = [UIBarButtonItem themedRevealMenuButtonWithTarget:self andSelector:@selector(goBack:)];
NSMutableString *htmlContent = [NSMutableString stringWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"About Contents" ofType:@"html"] encoding:NSUTF8StringEncoding error:nil];
[htmlContent replaceOccurrencesOfString:@"VLCFORIOSVERSION" withString:[[NSString stringWithFormat:NSLocalizedString(@"VERSION_FORMAT",@""), [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"]] stringByAppendingFormat:@"<br /><i>%@</i>", kVLCVersionCodename] options:NSLiteralSearch range:NSMakeRange(800, 1000)];
[htmlContent replaceOccurrencesOfString:@"MOBILEVLCKITVERSION" withString:[NSString stringWithFormat:NSLocalizedString(@"BASED_ON_FORMAT",@""),[[VLCLibrary sharedLibrary] version]] options:NSLiteralSearch range:NSMakeRange(800, 1100)];
[htmlContent replaceOccurrencesOfString:@"VLCFORIOSVERSION" withString:[[NSString stringWithFormat:NSLocalizedString(@"VERSION_FORMAT", nil), [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"]] stringByAppendingFormat:@"<br /><i>%@</i>", kVLCVersionCodename] options:NSLiteralSearch range:NSMakeRange(800, 1000)];
[htmlContent replaceOccurrencesOfString:@"MOBILEVLCKITVERSION" withString:[NSString stringWithFormat:NSLocalizedString(@"BASED_ON_FORMAT", nil),[[VLCLibrary sharedLibrary] version]] options:NSLiteralSearch range:NSMakeRange(800, 1100)];
[_webView loadHTMLString:[NSString stringWithString:htmlContent] baseURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] bundlePath]]];
htmlContent = nil;
}
......
......@@ -148,7 +148,7 @@
NSString *scheme = url.scheme;
if ([scheme isEqualToString:@"http"] || [scheme isEqualToString:@"https"] || [scheme isEqualToString:@"ftp"]) {
VLCAlertView *alert = [[VLCAlertView alloc] initWithTitle:NSLocalizedString(@"OPEN_STREAM_OR_DOWNLOAD", @"") message:url.absoluteString cancelButtonTitle:NSLocalizedString(@"BUTTON_DOWNLOAD", @"") otherButtonTitles:@[NSLocalizedString(@"BUTTON_PLAY", @"")]];
VLCAlertView *alert = [[VLCAlertView alloc] initWithTitle:NSLocalizedString(@"OPEN_STREAM_OR_DOWNLOAD", nil) message:url.absoluteString cancelButtonTitle:NSLocalizedString(@"BUTTON_DOWNLOAD", nil) otherButtonTitles:@[NSLocalizedString(@"BUTTON_PLAY", nil)]];
alert.completion = ^(BOOL cancelled, NSInteger buttonIndex) {
if (cancelled)
[[self downloadViewController] addURLToDownloadList:url fileNameOfMedia:nil];
......
......@@ -34,10 +34,10 @@
- (void)handleBugreportRequest
{
UIAlertView *alert = [[UIAlertView alloc]
initWithTitle:NSLocalizedString(@"BUG_REPORT_TITLE", @"")
message:NSLocalizedString(@"BUG_REPORT_MESSAGE", @"") delegate:self
cancelButtonTitle:NSLocalizedString(@"BUTTON_CANCEL", @"")
otherButtonTitles:NSLocalizedString(@"BUG_REPORT_BUTTON", @""), nil];;
initWithTitle:NSLocalizedString(@"BUG_REPORT_TITLE", nil)
message:NSLocalizedString(@"BUG_REPORT_MESSAGE", nil) delegate:self
cancelButtonTitle:NSLocalizedString(@"BUTTON_CANCEL", nil)
otherButtonTitles:NSLocalizedString(@"BUG_REPORT_BUTTON", nil), nil];;
[alert show];
}
......
......@@ -63,10 +63,10 @@
self.urlField.attributedPlaceholder = coloredAttributedPlaceholder;
}
[self.downloadButton setTitle:NSLocalizedString(@"BUTTON_DOWNLOAD",@"") forState:UIControlStateNormal];
[self.downloadButton setTitle:NSLocalizedString(@"BUTTON_DOWNLOAD", nil) forState:UIControlStateNormal];
self.navigationItem.leftBarButtonItem = [UIBarButtonItem themedRevealMenuButtonWithTarget:self andSelector:@selector(goBack:)];
self.title = NSLocalizedString(@"DOWNLOAD_FROM_HTTP", @"");
self.whatToDownloadHelpLabel.text = [NSString stringWithFormat:NSLocalizedString(@"DOWNLOAD_FROM_HTTP_HELP", @""), [[UIDevice currentDevice] model]];
self.title = NSLocalizedString(@"DOWNLOAD_FROM_HTTP", nil);
self.whatToDownloadHelpLabel.text = [NSString stringWithFormat:NSLocalizedString(@"DOWNLOAD_FROM_HTTP_HELP", nil), [[UIDevice currentDevice] model]];
self.urlField.delegate = self;
self.urlField.keyboardType = UIKeyboardTypeURL;
self.progressContainer.hidden = YES;
......@@ -120,11 +120,11 @@
[self.downloadsTable reloadData];
[self _triggerNextDownload];
} else {
UIAlertView * alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"FILE_NOT_SUPPORTED", @"") message:[NSString stringWithFormat:NSLocalizedString(@"FILE_NOT_SUPPORTED_LONG", @""), URLtoSave.lastPathComponent] delegate:self cancelButtonTitle:NSLocalizedString(@"BUTTON_CANCEL", @"") otherButtonTitles:nil];
UIAlertView * alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"FILE_NOT_SUPPORTED", nil) message:[NSString stringWithFormat:NSLocalizedString(@"FILE_NOT_SUPPORTED_LONG", nil), URLtoSave.lastPathComponent] delegate:self cancelButtonTitle:NSLocalizedString(@"BUTTON_CANCEL", nil) otherButtonTitles:nil];
[alert show];
}
} else {
UIAlertView * alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"SCHEME_NOT_SUPPORTED", @"") message:[NSString stringWithFormat:NSLocalizedString(@"SCHEME_NOT_SUPPORTED_LONG", @""), URLtoSave.scheme] delegate:self cancelButtonTitle:NSLocalizedString(@"BUTTON_CANCEL", @"") otherButtonTitles:nil];
UIAlertView * alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"SCHEME_NOT_SUPPORTED", nil) message:[NSString stringWithFormat:NSLocalizedString(@"SCHEME_NOT_SUPPORTED_LONG", nil), URLtoSave.scheme] delegate:self cancelButtonTitle:NSLocalizedString(@"BUTTON_CANCEL", nil) otherButtonTitles:nil];
[alert show];
}
}
......@@ -258,7 +258,7 @@
- (void)downloadFailedWithErrorDescription:(NSString *)description
{
UIAlertView * alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"DOWNLOAD_FAILED", @"") message:description delegate:self cancelButtonTitle:NSLocalizedString(@"BUTTON_CANCEL", @"") otherButtonTitles:nil];
UIAlertView * alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"DOWNLOAD_FAILED", nil) message:description delegate:self cancelButtonTitle:NSLocalizedString(@"BUTTON_CANCEL", nil) otherButtonTitles:nil];
[alert show];
}
......@@ -333,7 +333,7 @@
_FTPDownloadRequest = nil;
[self downloadEnded];
UIAlertView * alert = [[UIAlertView alloc] initWithTitle:[NSString stringWithFormat:NSLocalizedString(@"ERROR_NUMBER", @""), request.error.errorCode] message:request.error.message delegate:self cancelButtonTitle:NSLocalizedString(@"BUTTON_CANCEL", @"") otherButtonTitles:nil];
UIAlertView * alert = [[UIAlertView alloc] initWithTitle:[NSString stringWithFormat:NSLocalizedString(@"ERROR_NUMBER", nil), request.error.errorCode] message:request.error.message delegate:self cancelButtonTitle:NSLocalizedString(@"BUTTON_CANCEL", nil) otherButtonTitles:nil];
[alert show];
}
......
......@@ -254,7 +254,7 @@
#pragma mark - user feedback
- (void)_handleError:(NSError *)error
{
UIAlertView * alert = [[UIAlertView alloc] initWithTitle:[NSString stringWithFormat:NSLocalizedString(@"ERROR_NUMBER", @""), error.code] message:error.localizedDescription delegate:self cancelButtonTitle:NSLocalizedString(@"BUTTON_CANCEL", @"") otherButtonTitles:nil];
UIAlertView * alert = [[UIAlertView alloc] initWithTitle:[NSString stringWithFormat:NSLocalizedString(@"ERROR_NUMBER", nil), error.code] message:error.localizedDescription delegate:self cancelButtonTitle:NSLocalizedString(@"BUTTON_CANCEL", nil) otherButtonTitles:nil];
[alert show];
}
......
......@@ -68,7 +68,7 @@
self.tableView.separatorColor = [UIColor VLCDarkBackgroundColor];
self.view.backgroundColor = [UIColor VLCDarkBackgroundColor];
_numberOfFilesBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:[NSString stringWithFormat:NSLocalizedString(@"NUM_OF_FILES", @""), 0] style:UIBarButtonItemStylePlain target:nil action:nil];
_numberOfFilesBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:[NSString stringWithFormat:NSLocalizedString(@"NUM_OF_FILES", nil), 0] style:UIBarButtonItemStylePlain target:nil action:nil];
[_numberOfFilesBarButtonItem setTitleTextAttributes:@{ UITextAttributeFont : [UIFont systemFontOfSize:11.] } forState:UIControlStateNormal];
_progressBar = [[UIProgressView alloc] initWithProgressViewStyle:UIProgressViewStyleBar];
_progressLabel = [[UILabel alloc] init];
......@@ -92,10 +92,10 @@
[self.cloudStorageLogo setImage:[UIImage imageNamed:@"dropbox-white.png"]];
if (!SYSTEM_RUNS_IOS7_OR_LATER) {
self.flatLoginButton.hidden = YES;
[self.loginButton setTitle:NSLocalizedString(@"DROPBOX_LOGIN", @"") forState:UIControlStateNormal];
[self.loginButton setTitle:NSLocalizedString(@"DROPBOX_LOGIN", nil) forState:UIControlStateNormal];
} else {
self.loginButton.hidden = YES;
[self.flatLoginButton setTitle:NSLocalizedString(@"DROPBOX_LOGIN", @"") forState:UIControlStateNormal];
[self.flatLoginButton setTitle:NSLocalizedString(@"DROPBOX_LOGIN", nil) forState:UIControlStateNormal];
}
[self.navigationController.toolbar setBackgroundImage:[UIImage imageNamed:@"sudHeaderBg"] forToolbarPosition:UIToolbarPositionAny barMetrics:UIBarMetricsDefault];
......@@ -235,11 +235,11 @@
NSUInteger count = _dropboxController.currentListFiles.count;
if (count == 0)
_numberOfFilesBarButtonItem.title = NSLocalizedString(@"NO_FILES", @"");
_numberOfFilesBarButtonItem.title = NSLocalizedString(@"NO_FILES", nil);
else if (count != 1)
_numberOfFilesBarButtonItem.title = [NSString stringWithFormat:NSLocalizedString(@"NUM_OF_FILES", @""), count];
_numberOfFilesBarButtonItem.title = [NSString stringWithFormat:NSLocalizedString(@"NUM_OF_FILES", nil), count];
else
_numberOfFilesBarButtonItem.title = NSLocalizedString(@"ONE_FILE", @"");
_numberOfFilesBarButtonItem.title = NSLocalizedString(@"ONE_FILE", nil);
}
- (void)operationWithProgressInformationStarted
......@@ -302,7 +302,7 @@
_selectedFile = _dropboxController.currentListFiles[[self.tableView indexPathForCell:cell].row];
/* selected item is a proper file, ask the user if s/he wants to download it */
UIAlertView * alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"DROPBOX_DOWNLOAD", @"") message:[NSString stringWithFormat:NSLocalizedString(@"DROPBOX_DL_LONG", @""), _selectedFile.filename, [[UIDevice currentDevice] model]] delegate:self cancelButtonTitle:NSLocalizedString(@"BUTTON_CANCEL", @"") otherButtonTitles:NSLocalizedString(@"BUTTON_DOWNLOAD", @""), nil];
UIAlertView * alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"DROPBOX_DOWNLOAD", nil) message:[NSString stringWithFormat:NSLocalizedString(@"DROPBOX_DL_LONG", nil), _selectedFile.filename, [[UIDevice currentDevice] model]] delegate:self cancelButtonTitle:NSLocalizedString(@"BUTTON_CANCEL", nil) otherButtonTitles:NSLocalizedString(@"BUTTON_DOWNLOAD", nil), nil];
[alert show];
}
......
......@@ -21,15 +21,15 @@
- (void)viewDidLoad
{
[super viewDidLoad];
self.timeLabel.text = NSLocalizedString(@"FIRST_STEPS_TIME", @"");
self.aspectLabel.text = NSLocalizedString(@"FIRST_STEPS_ASPECT", @"");
self.speedLabel.text = NSLocalizedString(@"FIRST_STEPS_SPEED", @"");
self.repeatLabel.text = NSLocalizedString(@"FIRST_STEPS_REPEAT", @"");
self.subtitlesLabel.text = NSLocalizedString(@"FIRST_STEPS_SUBTITLES", @"");
self.audioLabel.text = NSLocalizedString(@"FIRST_STEPS_AUDIO", @"");
self.volumeLabel.text = NSLocalizedString(@"FIRST_STEPS_VOLUME", @"");
self.positionLabel.text = NSLocalizedString(@"FIRST_STEPS_POSITION", @"");
self.effectsLabel.text = NSLocalizedString(@"VIDEO_FILTER", @"");
self.timeLabel.text = NSLocalizedString(@"FIRST_STEPS_TIME", nil);
self.aspectLabel.text = NSLocalizedString(@"FIRST_STEPS_ASPECT", nil);
self.speedLabel.text = NSLocalizedString(@"FIRST_STEPS_SPEED", nil);
self.repeatLabel.text = NSLocalizedString(@"FIRST_STEPS_REPEAT", nil);
self.subtitlesLabel.text = NSLocalizedString(@"FIRST_STEPS_SUBTITLES", nil);
self.audioLabel.text = NSLocalizedString(@"FIRST_STEPS_AUDIO", nil);
self.volumeLabel.text = NSLocalizedString(@"FIRST_STEPS_VOLUME", nil);
self.positionLabel.text = NSLocalizedString(@"FIRST_STEPS_POSITION", nil);
self.effectsLabel.text = NSLocalizedString(@"VIDEO_FILTER", nil);
}
- (void)viewWillAppear:(BOOL)animated
......@@ -41,7 +41,7 @@
- (NSString *)pageTitle
{
return NSLocalizedString(@"FIRST_STEPS_PLAYBACK", @"");
return NSLocalizedString(@"FIRST_STEPS_PLAYBACK", nil);
}
- (NSUInteger)page
......
......@@ -22,8 +22,8 @@
{
[super viewDidLoad];
self.titleLabel.text = NSLocalizedString(@"FIRST_STEPS_WELCOME", @"");
self.subtitleLabel.text = NSLocalizedString(@"FIRST_STEPS_WELCOME_DETAIL", @"");
self.titleLabel.text = NSLocalizedString(@"FIRST_STEPS_WELCOME", nil);
self.subtitleLabel.text = NSLocalizedString(@"FIRST_STEPS_WELCOME_DETAIL", nil);
}
- (void)viewWillAppear:(BOOL)animated
......@@ -40,7 +40,7 @@
- (NSString *)pageTitle
{
return NSLocalizedString(@"FIRST_STEPS_WELCOME", @"");;
return NSLocalizedString(@"FIRST_STEPS_WELCOME", nil);;
}
- (NSUInteger)page
......
......@@ -22,13 +22,13 @@
{
[super viewDidLoad];
self.uploadDescriptionLabel.text = NSLocalizedString(@"FIRST_STEPS_CLOUD_UPLOAD_DETAILS", @"");
self.accessDescriptionLabel.text = NSLocalizedString(@"FIRST_STEPS_CLOUD_ACCESS_DETAILS", @"");
self.uploadDescriptionLabel.text = NSLocalizedString(@"FIRST_STEPS_CLOUD_UPLOAD_DETAILS", nil);
self.accessDescriptionLabel.text = NSLocalizedString(@"FIRST_STEPS_CLOUD_ACCESS_DETAILS", nil);
}
- (NSString *)pageTitle
{
return NSLocalizedString(@"FIRST_STEPS_CLOUDS", @"");
return NSLocalizedString(@"FIRST_STEPS_CLOUDS", nil);
}
- (NSUInteger)page
......
......@@ -25,9 +25,9 @@
NSString *model = [[UIDevice currentDevice] model];
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone)
self.descriptionLabel.text = [NSString stringWithFormat:NSLocalizedString(@"FIRST_STEPS_ITUNES_DETAILS", @""), model, model];
self.descriptionLabel.text = [NSString stringWithFormat:NSLocalizedString(@"FIRST_STEPS_ITUNES_DETAILS", nil), model, model];
else
self.descriptionLabel.text = [[NSString stringWithFormat:NSLocalizedString(@"FIRST_STEPS_ITUNES_DETAILS", @""), model, model] stringByReplacingOccurrencesOfString:@"\n" withString:@"\n\n"];
self.descriptionLabel.text = [[NSString stringWithFormat:NSLocalizedString(@"FIRST_STEPS_ITUNES_DETAILS", nil), model, model] stringByReplacingOccurrencesOfString:@"\n" withString:@"\n\n"];
}
- (void)viewWillAppear:(BOOL)animated
......@@ -44,7 +44,7 @@
- (NSString *)pageTitle
{
return NSLocalizedString(@"FIRST_STEPS_ITUNES", @"");
return NSLocalizedString(@"FIRST_STEPS_ITUNES", nil);
}
- (NSUInteger)page
......
......@@ -23,11 +23,11 @@
[super viewDidLoad];
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone)
self.flossDescriptionLabel.text = NSLocalizedString(@"FIRST_STEPS_FLOSS", @"");
self.flossDescriptionLabel.text = NSLocalizedString(@"FIRST_STEPS_FLOSS", nil);
else
self.flossDescriptionLabel.text = [NSLocalizedString(@"FIRST_STEPS_FLOSS", @"") stringByReplacingOccurrencesOfString:@"\n" withString:@"\n\n"];
self.flossDescriptionLabel.text = [NSLocalizedString(@"FIRST_STEPS_FLOSS", nil) stringByReplacingOccurrencesOfString:@"\n" withString:@"\n\n"];
[self.learnMoreButton setTitle:NSLocalizedString(@"BUTTON_LEARN_MORE", @"") forState:UIControlStateNormal];
[self.learnMoreButton setTitle:NSLocalizedString(@"BUTTON_LEARN_MORE", nil) forState:UIControlStateNormal];
}
- (NSString *)pageTitle
......
......@@ -24,8 +24,8 @@
{
[super viewDidLoad];
self.connectDescriptionLabel.text = [NSString stringWithFormat:NSLocalizedString(@"FIRST_STEPS_WIFI_CONNECT_DETAILS",@""), [[UIDevice currentDevice] model]];
self.uploadDescriptionLabel.text = NSLocalizedString(@"FIRST_STEPS_WIFI_UPLOAD_DETAILS", @"");
self.connectDescriptionLabel.text = [NSString stringWithFormat:NSLocalizedString(@"FIRST_STEPS_WIFI_CONNECT_DETAILS", nil), [[UIDevice currentDevice] model]];
self.uploadDescriptionLabel.text = NSLocalizedString(@"FIRST_STEPS_WIFI_UPLOAD_DETAILS", nil);
NSString *address = @"192.168.1.2"; // something generic
struct ifaddrs *interfaces = NULL;
......@@ -55,7 +55,7 @@
- (NSString *)pageTitle
{
return NSLocalizedString(@"WEBINTF_TITLE", @"");
return NSLocalizedString(@"WEBINTF_TITLE", nil);
}
- (NSUInteger)page
......
......@@ -42,7 +42,7 @@
UIBarButtonItem *dismissButton = [UIBarButtonItem themedDoneButtonWithTarget:self andSelector:@selector(dismissFirstSteps)];
self.navigationItem.rightBarButtonItem = dismissButton;
self.title = NSLocalizedString(@"FIRST_STEPS_WELCOME", @"");
self.title = NSLocalizedString(@"FIRST_STEPS_WELCOME", nil);
self.view.backgroundColor = [UIColor blackColor];
[self addChildViewController:pageVC];
......
......@@ -64,7 +64,7 @@
self.tableView.separatorColor = [UIColor VLCDarkBackgroundColor];
self.view.backgroundColor = [UIColor VLCDarkBackgroundColor];
_numberOfFilesBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:[NSString stringWithFormat:NSLocalizedString(@"NUM_OF_FILES", @""), 0] style:UIBarButtonItemStylePlain target:nil action:nil];
_numberOfFilesBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:[NSString stringWithFormat:NSLocalizedString(@"NUM_OF_FILES", nil), 0] style:UIBarButtonItemStylePlain target:nil action:nil];
[_numberOfFilesBarButtonItem setTitleTextAttributes:@{ UITextAttributeFont : [UIFont systemFontOfSize:11.] } forState:UIControlStateNormal];
_progressBar = [[UIProgressView alloc] initWithProgressViewStyle:UIProgressViewStyleBar];
......@@ -91,10 +91,10 @@
if (!SYSTEM_RUNS_IOS7_OR_LATER) {
self.flatLoginButton.hidden = YES;
[self.loginButton setTitle:NSLocalizedString(@"DROPBOX_LOGIN", @"") forState:UIControlStateNormal];
[self.loginButton setTitle:NSLocalizedString(@"DROPBOX_LOGIN", nil) forState:UIControlStateNormal];
} else {
self.loginButton.hidden = YES;
[self.flatLoginButton setTitle:NSLocalizedString(@"DROPBOX_LOGIN", @"") forState:UIControlStateNormal];
[self.flatLoginButton setTitle:NSLocalizedString(@"DROPBOX_LOGIN", nil) forState:UIControlStateNormal];
}
[self.navigationController.toolbar setBackgroundImage:[UIImage imageNamed:@"sudHeaderBg"] forToolbarPosition:UIToolbarPositionAny barMetrics:UIBarMetricsDefault];
......@@ -237,7 +237,7 @@
_selectedFile = _googleDriveController.currentListFiles[[self.tableView indexPathForCell:cell].row];
/* selected item is a proper file, ask the user if s/he wants to download it */
UIAlertView * alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"DROPBOX_DOWNLOAD", @"") message:[NSString stringWithFormat:NSLocalizedString(@"DROPBOX_DL_LONG", @""), _selectedFile.title, [[UIDevice currentDevice] model]] delegate:self cancelButtonTitle:NSLocalizedString(@"BUTTON_CANCEL", @"") otherButtonTitles:NSLocalizedString(@"BUTTON_DOWNLOAD", @""), nil];
UIAlertView * alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"DROPBOX_DOWNLOAD", nil) message:[NSString stringWithFormat:NSLocalizedString(@"DROPBOX_DL_LONG", nil), _selectedFile.title, [[UIDevice currentDevice] model]] delegate:self cancelButtonTitle:NSLocalizedString(@"BUTTON_CANCEL", nil) otherButtonTitles:NSLocalizedString(@"BUTTON_DOWNLOAD", nil), nil];
[alert show];
}
......@@ -270,11 +270,11 @@
NSUInteger count = _googleDriveController.currentListFiles.count;
if (count == 0)
_numberOfFilesBarButtonItem.title = NSLocalizedString(@"NO_FILES", @"");
_numberOfFilesBarButtonItem.title = NSLocalizedString(@"NO_FILES", nil);
else if (count != 1)
_numberOfFilesBarButtonItem.title = [NSString stringWithFormat:NSLocalizedString(@"NUM_OF_FILES", @""), count];
_numberOfFilesBarButtonItem.title = [NSString stringWithFormat:NSLocalizedString(@"NUM_OF_FILES", nil), count];
else
_numberOfFilesBarButtonItem.title = NSLocalizedString(@"ONE_FILE", @"");
_numberOfFilesBarButtonItem.title = NSLocalizedString(@"ONE_FILE", nil);
}
- (void)operationWithProgressInformationStarted
......
......@@ -112,7 +112,7 @@
_statusCode = [response statusCode];
if (_statusCode == 200) {
if (![[response suggestedFilename] isSupportedFormat]) {
UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"FILE_NOT_SUPPORTED", @"") message:[NSString stringWithFormat:NSLocalizedString(@"FILE_NOT_SUPPORTED_LONG", @""), [response suggestedFilename]] delegate:self cancelButtonTitle:NSLocalizedString(@"BUTTON_CANCEL", @"") otherButtonTitles:nil];
UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"FILE_NOT_SUPPORTED", nil) message:[NSString stringWithFormat:NSLocalizedString(@"FILE_NOT_SUPPORTED_LONG", nil), [response suggestedFilename]] delegate:self cancelButtonTitle:NSLocalizedString(@"BUTTON_CANCEL", nil) otherButtonTitles:nil];
[alert show];
[_urlConnection cancel];
......
......@@ -251,7 +251,7 @@
NSURL *itemURL = [NSURL URLWithString:[[mutableMediaObject objectAtIndex:0] objectForKey:@"keyMedia"]];
if (![[itemURL absoluteString] isSupportedFormat]) {
UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"FILE_NOT_SUPPORTED", @"") message:[NSString stringWithFormat:NSLocalizedString(@"FILE_NOT_SUPPORTED_LONG", @""), [itemURL absoluteString]] delegate:self cancelButtonTitle:NSLocalizedString(@"BUTTON_CANCEL", @"") otherButtonTitles:nil];
UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"FILE_NOT_SUPPORTED", nil) message:[NSString stringWithFormat:NSLocalizedString(@"FILE_NOT_SUPPORTED_LONG", nil), [itemURL absoluteString]] delegate:self cancelButtonTitle:NSLocalizedString(@"BUTTON_CANCEL", nil) otherButtonTitles:nil];
[alert show];
} else if (itemURL) {
NSString *fileName = [[mutableMediaObject objectAtIndex:0] objectForKey:@"namefile"];
......@@ -302,13 +302,13 @@
if (status == 200) {
if ([tag isEqualToString:@"watched"]) {
tag = @"unwatched";
cellStatusLbl = NSLocalizedString(@"PLEX_UNWATCHED", @"");
cellStatusLbl = NSLocalizedString(@"PLEX_UNWATCHED", nil);
} else if ([tag isEqualToString:@"unwatched"]) {
tag = @"watched";
cellStatusLbl = NSLocalizedString(@"PLEX_WATCHED", @"");
cellStatusLbl = NSLocalizedString(@"PLEX_WATCHED", nil);
}
} else
cellStatusLbl = NSLocalizedString(@"PLEX_ERROR_MARK", @"");
cellStatusLbl = NSLocalizedString(@"PLEX_ERROR_MARK", nil);
[cell.statusLabel showStatusMessage:cellStatusLbl];
......@@ -342,7 +342,7 @@
[self _getFileSubtitleFromPlexServer:ObjList modeStream:NO];
[self _downloadFileFromMediaItem:ObjList];
[cell.statusLabel showStatusMessage:NSLocalizedString(@"DOWNLOADING", @"")];
[cell.statusLabel showStatusMessage:NSLocalizedString(@"DOWNLOADING", nil)];
}
#pragma mark - Search Display Controller Delegate
......
......@@ -336,7 +336,7 @@
NSData *flippedData = [rawObjectName dataUsingEncoding:[[[NSUserDefaults standardUserDefaults] objectForKey:kVLCSettingFTPTextEncoding] intValue] allowLossyConversion:YES];
NSString *properObjectName = [[NSString alloc] initWithData:flippedData encoding:NSUTF8StringEncoding];
if (![properObjectName isSupportedFormat]) {
UIAlertView * alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"FILE_NOT_SUPPORTED", @"") message:[NSString stringWithFormat:NSLocalizedString(@"FILE_NOT_SUPPORTED_LONG", @""), properObjectName] delegate:self cancelButtonTitle:NSLocalizedString(@"BUTTON_CANCEL", @"") otherButtonTitles:nil];
UIAlertView * alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"FILE_NOT_SUPPORTED", nil) message:[NSString stringWithFormat:NSLocalizedString(@"FILE_NOT_SUPPORTED_LONG", nil), properObjectName] delegate:self cancelButtonTitle:NSLocalizedString(@"BUTTON_CANCEL", nil) otherButtonTitles:nil];
[alert show];
} else
[self _streamFTPFile:properObjectName];
......@@ -403,7 +403,7 @@
itemURL = [NSURL URLWithString:uriCollectionObjects[correctIndex]];
if (![itemURL.absoluteString isSupportedFormat]) {
UIAlertView * alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"FILE_NOT_SUPPORTED", @"") message:[NSString stringWithFormat:NSLocalizedString(@"FILE_NOT_SUPPORTED_LONG", @""), [mediaItem uri]] delegate:self cancelButtonTitle:NSLocalizedString(@"BUTTON_CANCEL", @"") otherButtonTitles:nil];
UIAlertView * alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"FILE_NOT_SUPPORTED", nil) message:[NSString stringWithFormat:NSLocalizedString(@"FILE_NOT_SUPPORTED_LONG", nil), [mediaItem uri]] delegate:self cancelButtonTitle:NSLocalizedString(@"BUTTON_CANCEL", nil) otherButtonTitles:nil];
[alert show];
} else if (itemURL) {
NSString *fileName = [[mediaItem.title stringByAppendingString:@"."] stringByAppendingString:[[itemURL absoluteString] pathExtension]];
......@@ -431,7 +431,7 @@
- (void)requestFailed:(WRRequest *)request
{
UIAlertView * alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"LOCAL_SERVER_CONNECTION_FAILED_TITLE", nil) message:NSLocalizedString(@"LOCAL_SERVER_CONNECTION_FAILED_MESSAGE", nil) delegate:self cancelButtonTitle:NSLocalizedString(@"BUTTON_CANCEL", @"") otherButtonTitles:nil];
UIAlertView * alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"LOCAL_SERVER_CONNECTION_FAILED_TITLE", nil) message:NSLocalizedString(@"LOCAL_SERVER_CONNECTION_FAILED_MESSAGE", nil) delegate:self cancelButtonTitle:NSLocalizedString(@"BUTTON_CANCEL", nil) otherButtonTitles:nil];
[alert show];
APLog(@"request %@ failed with error %i", request, request.error.errorCode);
......@@ -448,7 +448,7 @@
item = _mutableObjectList[[self.tableView indexPathForCell:cell].row];
[self _downloadUPNPFileFromMediaItem:item];
[cell.statusLabel showStatusMessage:NSLocalizedString(@"DOWNLOADING", @"")];
[cell.statusLabel showStatusMessage:NSLocalizedString(@"DOWNLOADING", nil)];
}else if (_serverType == kVLCServerTypeFTP) {
NSString *rawObjectName;
NSMutableArray *ObjList = [[NSMutableArray alloc] init];
......@@ -465,11 +465,11 @@
NSData *flippedData = [rawObjectName dataUsingEncoding:[[[NSUserDefaults standardUserDefaults] objectForKey:kVLCSettingFTPTextEncoding] intValue] allowLossyConversion:YES];
NSString *properObjectName = [[NSString alloc] initWithData:flippedData encoding:NSUTF8StringEncoding];
if (![properObjectName isSupportedFormat]) {
UIAlertView * alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"FILE_NOT_SUPPORTED", @"") message:[NSString stringWithFormat:NSLocalizedString(@"FILE_NOT_SUPPORTED_LONG", @""), properObjectName] delegate:self cancelButtonTitle:NSLocalizedString(@"BUTTON_CANCEL", @"") otherButtonTitles:nil];
UIAlertView * alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"FILE_NOT_SUPPORTED", nil) message:[NSString stringWithFormat:NSLocalizedString(@"FILE_NOT_SUPPORTED_LONG", nil), properObjectName] delegate:self cancelButtonTitle:NSLocalizedString(@"BUTTON_CANCEL", nil) otherButtonTitles:nil];
[alert show];
} else {
[self _downloadFTPFile:properObjectName];
[cell.statusLabel showStatusMessage:NSLocalizedString(@"DOWNLOADING", @"")];
[cell.statusLabel showStatusMessage:NSLocalizedString(@"DOWNLOADING", nil)];
}
}
}
......
......@@ -96,7 +96,7 @@
self.tableView.separatorColor = [UIColor VLCDarkBackgroundColor];
self.view.backgroundColor = [UIColor VLCDarkBackgroundColor];
self.title = NSLocalizedString(@"LOCAL_NETWORK", @"");
self.title = NSLocalizedString(@"LOCAL_NETWORK", nil);
_ftpServices = [[NSMutableArray alloc] init];
[_ftpServices addObject:NSLocalizedString(@"CONNECT_TO_SERVER", nil)];
......@@ -388,7 +388,7 @@
- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section
{
NSObject *headerText = NSLocalizedString(_sectionHeaderTexts[section], @"");
NSObject *headerText = NSLocalizedString(_sectionHeaderTexts[section], nil);
UIView *headerView = nil;
if (headerText != [NSNull null]) {
headerView = [[UIView alloc] initWithFrame:CGRectMake(0.0f, 0.0f, [UIScreen mainScreen].bounds.size.height, 21.0f)];
......
......@@ -136,7 +136,7 @@
[_uploadButton setImage:[UIImage imageNamed:@"WifiUp"] forState:UIControlStateNormal];
_uploadButton.enabled = NO;
[_uploadButton setImage:[UIImage imageNamed:@"WiFiUp"] forState:UIControlStateDisabled];
_uploadLocationLabel.text = NSLocalizedString(@"HTTP_UPLOAD_NO_CONNECTIVITY", @"");
_uploadLocationLabel.text = NSLocalizedString(@"HTTP_UPLOAD_NO_CONNECTIVITY", nil);
[self.uploadController changeHTTPServerState:NO];
}
}
......@@ -223,7 +223,7 @@
}
if (!([rawTitle isEqualToString:@"Dropbox"] || [rawTitle isEqualToString:@"WEBINTF_TITLE"]))
cell.textLabel.text = NSLocalizedString(rawTitle, @"");
cell.textLabel.text = NSLocalizedString(rawTitle, nil);
return cell;
}
......@@ -238,7 +238,7 @@
- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section
{
NSObject *headerText = NSLocalizedString(_sectionHeaderTexts[section], @"");
NSObject *headerText = NSLocalizedString(_sectionHeaderTexts[section], nil);
UIView *headerView = nil;
if (headerText != [NSNull null]) {
headerView = [[UIView alloc] initWithFrame:CGRectMake(0.0f, 0.0f, [UIScreen mainScreen].bounds.size.height, 21.0f)];
......@@ -285,7 +285,7 @@
_uploadLocationLabel.text = [NSString stringWithFormat:@"http://%@", [self.uploadController currentIPAddress]];
[_uploadButton setImage:[UIImage imageNamed:@"WifiUpOn"] forState:UIControlStateNormal];
} else {
_uploadLocationLabel.text = NSLocalizedString(@"HTTP_UPLOAD_SERVER_OFF", @"");
_uploadLocationLabel.text = NSLocalizedString(@"HTTP_UPLOAD_SERVER_OFF", nil);
[_uploadButton setImage:[UIImage imageNamed:@"WifiUp"] forState:UIControlStateNormal];
}
}
......
......@@ -144,65 +144,65 @@
self.videoFilterView.hidden = YES;
_videoFiltersHidden = YES;
_hueLabel.text = NSLocalizedString(@"VFILTER_HUE", @"");
_hueLabel.text = NSLocalizedString(@"VFILTER_HUE", nil);
_hueSlider.accessibilityLabel = _hueLabel.text;
_hueSlider.isAccessibilityElement = YES;
_contrastLabel.text = NSLocalizedString(@"VFILTER_CONTRAST", @"");
_contrastLabel.text = NSLocalizedString(@"VFILTER_CONTRAST", nil);
_contrastSlider.accessibilityLabel = _contrastLabel.text;
_contrastSlider.isAccessibilityElement = YES;
_brightnessLabel.text = NSLocalizedString(@"VFILTER_BRIGHTNESS", @"");
_brightnessLabel.text = NSLocalizedString(@"VFILTER_BRIGHTNESS", nil);
_brightnessSlider.accessibilityLabel = _brightnessLabel.text;
_brightnessSlider.isAccessibilityElement = YES;
_saturationLabel.text = NSLocalizedString(@"VFILTER_SATURATION", @"");
_saturationLabel.text = NSLocalizedString(@"VFILTER_SATURATION", nil);
_saturationSlider.accessibilityLabel = _saturationLabel.text;
_saturationSlider.isAccessibilityElement = YES;
_gammaLabel.text = NSLocalizedString(@"VFILTER_GAMMA", @"");
_gammaLabel.text = NSLocalizedString(@"VFILTER_GAMMA", nil);
_gammaSlider.accessibilityLabel = _gammaLabel.text;
_gammaSlider.isAccessibilityElement = YES;
_playbackSpeedLabel.text = NSLocalizedString(@"PLAYBACK_SPEED", @"");
_playbackSpeedLabel.text = NSLocalizedString(@"PLAYBACK_SPEED", nil);
_playbackSpeedSlider.accessibilityLabel = _playbackSpeedLabel.text;
_playbackSpeedSlider.isAccessibilityElement = YES;
_positionSlider.accessibilityLabel = NSLocalizedString(@"PLAYBACK_POSITION", @"");
_positionSlider.accessibilityLabel = NSLocalizedString(@"PLAYBACK_POSITION", nil);
_positionSlider.isAccessibilityElement = YES;
_timeDisplay.isAccessibilityElement = YES;
_audioSwitcherButton.accessibilityLabel = NSLocalizedString(@"CHOOSE_AUDIO_TRACK", @"");
_audioSwitcherButton.accessibilityLabel = NSLocalizedString(@"CHOOSE_AUDIO_TRACK", nil);
_audioSwitcherButton.isAccessibilityElement = YES;
_audioSwitcherButtonLandscape.accessibilityLabel = NSLocalizedString(@"CHOOSE_AUDIO_TRACK", @"");
_audioSwitcherButtonLandscape.accessibilityLabel = NSLocalizedString(@"CHOOSE_AUDIO_TRACK", nil);
_audioSwitcherButtonLandscape.isAccessibilityElement = YES;
_subtitleSwitcherButton.accessibilityLabel = NSLocalizedString(@"CHOOSE_SUBTITLE_TRACK", @"");
_subtitleSwitcherButton.accessibilityLabel = NSLocalizedString(@"CHOOSE_SUBTITLE_TRACK", nil);
_subtitleSwitcherButton.isAccessibilityElement = YES;
_subtitleSwitcherButtonLandscape.accessibilityLabel = NSLocalizedString(@"CHOOSE_SUBTITLE_TRACK", @"");
_subtitleSwitcherButtonLandscape.accessibilityLabel = NSLocalizedString(@"CHOOSE_SUBTITLE_TRACK", nil);
_subtitleSwitcherButtonLandscape.isAccessibilityElement = YES;
_playbackSpeedButton.accessibilityLabel = _playbackSpeedLabel.text;
_playbackSpeedButton.isAccessibilityElement = YES;
_playbackSpeedButtonLandscape.accessibilityLabel = _playbackSpeedLabel.text;
_playbackSpeedButtonLandscape.isAccessibilityElement = YES;
_videoFilterButton.accessibilityLabel = NSLocalizedString(@"VIDEO_FILTER", @"");
_videoFilterButton.accessibilityLabel = NSLocalizedString(@"VIDEO_FILTER", nil);
_videoFilterButton.isAccessibilityElement = YES;
_videoFilterButtonLandscape.accessibilityLabel = NSLocalizedString(@"VIDEO_FILTER", @"");
_videoFilterButtonLandscape.accessibilityLabel = NSLocalizedString(@"VIDEO_FILTER", nil);
_videoFilterButtonLandscape.isAccessibilityElement = YES;
_resetVideoFilterButton.accessibilityLabel = NSLocalizedString(@"VIDEO_FILTER_RESET_BUTTON", @"");
_resetVideoFilterButton.accessibilityLabel = NSLocalizedString(@"VIDEO_FILTER_RESET_BUTTON", nil);
_resetVideoFilterButton.isAccessibilityElement = YES;
_aspectRatioButton.accessibilityLabel = NSLocalizedString(@"VIDEO_ASPECT_RATIO_BUTTON", @"");
_aspectRatioButton.accessibilityLabel = NSLocalizedString(@"VIDEO_ASPECT_RATIO_BUTTON", nil);
_aspectRatioButton.isAccessibilityElement = YES;
_playPauseButton.accessibilityLabel = NSLocalizedString(@"PLAY_PAUSE_BUTTON", @"");
_playPauseButton.accessibilityLabel = NSLocalizedString(@"PLAY_PAUSE_BUTTON", nil);
_playPauseButton.isAccessibilityElement = YES;
_playPauseButtonLandscape.accessibilityLabel = NSLocalizedString(@"PLAY_PAUSE_BUTTON", @"");
_playPauseButtonLandscape.accessibilityLabel = NSLocalizedString(@"PLAY_PAUSE_BUTTON", nil);
_playPauseButtonLandscape.isAccessibilityElement = YES;
_bwdButton.accessibilityLabel = NSLocalizedString(@"BWD_BUTTON", @"");
_bwdButton.accessibilityLabel = NSLocalizedString(@"BWD_BUTTON", nil);
_bwdButton.isAccessibilityElement = YES;
_bwdButtonLandscape.accessibilityLabel = NSLocalizedString(@"BWD_BUTTON", @"");
_bwdButtonLandscape.accessibilityLabel = NSLocalizedString(@"BWD_BUTTON", nil);
_bwdButtonLandscape.isAccessibilityElement = YES;
_fwdButton.accessibilityLabel = NSLocalizedString(@"FWD_BUTTON", @"");
_fwdButton.accessibilityLabel = NSLocalizedString(@"FWD_BUTTON", nil);
_fwdButton.isAccessibilityElement = YES;
_fwdButtonLandscape.accessibilityLabel = NSLocalizedString(@"FWD_BUTTON", @"");
_fwdButtonLandscape.accessibilityLabel = NSLocalizedString(@"FWD_BUTTON", nil);
_fwdButtonLandscape.isAccessibilityElement = YES;
_repeatButton.accessibilityLabel = NSLocalizedString(@"BUTTON_REPEAT", @"");
_repeatButton.accessibilityLabel = NSLocalizedString(@"BUTTON_REPEAT", nil);
_repeatButton.isAccessibilityElement = YES;
_scrubHelpLabel.text = NSLocalizedString(@"PLAYBACK_SCRUB_HELP", @"");
_scrubHelpLabel.text = NSLocalizedString(@"PLAYBACK_SCRUB_HELP", nil);
self.playbackSpeedView.hidden = YES;
_playbackSpeedViewHidden = YES;
......@@ -221,8 +221,8 @@
[center addObserver:self selector:@selector(audioSessionRouteChange:)
name:AVAudioSessionRouteChangeNotification object:nil];
_playingExternallyTitle.text = NSLocalizedString(@"PLAYING_EXTERNALLY_TITLE", @"");
_playingExternallyDescription.text = NSLocalizedString(@"PLAYING_EXTERNALLY_DESC", @"");
_playingExternallyTitle.text = NSLocalizedString(@"PLAYING_EXTERNALLY_TITLE", nil);
_playingExternallyDescription.text = NSLocalizedString(@"PLAYING_EXTERNALLY_DESC", nil);
if ([self hasExternalDisplay])
[self showOnExternalDisplay];
......@@ -331,8 +331,8 @@
_playerIsSetup = NO;
[self.movieView setAccessibilityLabel:NSLocalizedString(@"VO_VIDEOPLAYER_TITLE", @"")];
[self.movieView setAccessibilityHint:NSLocalizedString(@"VO_VIDEOPLAYER_DOUBLETAP", @"")];
[self.movieView setAccessibilityLabel:NSLocalizedString(@"VO_VIDEOPLAYER_TITLE", nil)];
[self.movieView setAccessibilityHint:NSLocalizedString(@"VO_VIDEOPLAYER_DOUBLETAP", nil)];
}
- (BOOL)_blobCheck
......@@ -500,7 +500,7 @@
[self.repeatButtonLandscape setImage:[UIImage imageNamed:@"repeat"] forState:UIControlStateNormal];
if (![self _isMediaSuitableForDevice]) {
UIAlertView * alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"DEVICE_TOOSLOW_TITLE", @"") message:[NSString stringWithFormat:NSLocalizedString(@"DEVICE_TOOSLOW", @""), [[UIDevice currentDevice] model], self.fileFromMediaLibrary.title] delegate:self cancelButtonTitle:NSLocalizedString(@"BUTTON_CANCEL", @"") otherButtonTitles:NSLocalizedString(@"BUTTON_OPEN", @""), nil];
UIAlertView * alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"DEVICE_TOOSLOW_TITLE", nil) message:[NSString stringWithFormat:NSLocalizedString(@"DEVICE_TOOSLOW", nil), [[UIDevice currentDevice] model], self.fileFromMediaLibrary.title] delegate:self cancelButtonTitle:NSLocalizedString(@"BUTTON_CANCEL", nil) otherButtonTitles:NSLocalizedString(@"BUTTON_OPEN", nil), nil];
[alert show];
} else
[self _playNewMedia];
......@@ -901,7 +901,7 @@
[self performSelector:@selector(_setPositionForReal) withObject:nil afterDelay:0.3];
VLCTime *newPosition = [VLCTime timeWithInt:(int)(_positionSlider.value * self.fileFromMediaLibrary.duration.intValue)];
[self.timeDisplay setTitle:newPosition.stringValue forState:UIControlStateNormal];
self.timeDisplay.accessibilityLabel = [NSString stringWithFormat:@"%@: %@", NSLocalizedString(@"PLAYBACK_POSITION", @""), newPosition.stringValue];
self.timeDisplay.accessibilityLabel = [NSString stringWithFormat:@"%@: %@", NSLocalizedString(@"PLAY