Skip to content
This repository was archived by the owner on Jan 16, 2021. It is now read-only.

Commit d17d821

Browse files
nlutsenkonlutsenko
committed
Merge pull request #193 from huguesbr/PFLocalizedString
Define PFLocalizedString, avoiding re-mapping NSLocalizedString macro.
2 parents 4559bd7 + 2ebebe0 commit d17d821

File tree

11 files changed

+55
-56
lines changed

11 files changed

+55
-56
lines changed

‎ParseUI/Classes/Cells/PFPurchaseTableViewCell.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ - (void)setState:(PFPurchaseTableViewCellState)state {
125125
{
126126
self.detailTextLabel.numberOfLines = 1;
127127
self.priceLabel.backgroundColor = [UIColor colorWithRed:132.0f/255.0f green:175.0f/255.0f blue:230.0f/255.0f alpha:1.0f];
128-
NSString *downloadingText = NSLocalizedString(@"DOWNLOADING", @"DOWNLOADING");
128+
NSString *downloadingText = PFLocalizedString(@"DOWNLOADING", @"DOWNLOADING");
129129
self.priceLabel.text = [NSString stringWithFormat:@" %@ ", downloadingText];
130130
self.priceLabel.textColor = [UIColor whiteColor];
131131
self.priceLabel.shadowColor = [UIColor blackColor];
@@ -136,7 +136,7 @@ - (void)setState:(PFPurchaseTableViewCellState)state {
136136
case PFPurchaseTableViewCellStateDownloaded:
137137
{
138138
self.detailTextLabel.numberOfLines = 2;
139-
NSString *installedText = NSLocalizedString(@"INSTALLED", @"INSTALLED");
139+
NSString *installedText = PFLocalizedString(@"INSTALLED", @"INSTALLED");
140140
self.priceLabel.text = [NSString stringWithFormat:@" %@ ", installedText];
141141
self.priceLabel.textColor = [UIColor whiteColor];
142142
self.priceLabel.shadowColor = [UIColor blackColor];

‎ParseUI/Classes/Internal/Extensions/PFUIAlertView.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ + (void)showAlertViewWithTitle:(NSString *)title error:(NSError *)error {
3939
+ (void)showAlertViewWithTitle:(NSString *)title message:(NSString *)message {
4040
[self showAlertViewWithTitle:title
4141
message:message
42-
cancelButtonTitle:NSLocalizedString(@"OK", @"OK")];
42+
cancelButtonTitle:PFLocalizedString(@"OK", @"OK")];
4343
}
4444

4545
+ (void)showAlertViewWithTitle:(NSString *)title

‎ParseUI/Classes/Internal/PFLocalization.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
#ifndef ParseUI_PFLocalization_h
2323
#define ParseUI_PFLocalization_h
2424

25-
#undef NSLocalizedString
26-
#define NSLocalizedString(key, comment) \
25+
#define PFLocalizedString(key, comment) \
2726
[[NSBundle bundleForClass:[self class]] localizedStringForKey:key value:nil table:@"ParseUI"]
2827

2928
#endif

‎ParseUI/Classes/Internal/Views/PFLoadingView.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ - (instancetype)initWithFrame:(CGRect)frame {
4343
[self addSubview:_activityIndicator];
4444

4545
_loadingLabel = [[UILabel alloc] initWithFrame:CGRectZero];
46-
_loadingLabel.text = NSLocalizedString(@"Loading...", @"Loading message of PFQueryTableViewController");
46+
_loadingLabel.text = PFLocalizedString(@"Loading...", @"Loading message of PFQueryTableViewController");
4747
_loadingLabel.backgroundColor = [UIColor clearColor];
4848
_loadingLabel.shadowOffset = CGSizeMake(0.0f, 1.0f);
4949
_loadingLabel.shadowColor = [UIColor whiteColor];

‎ParseUI/Classes/LogInViewController/PFLogInView.m‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ @implementation PFLogInView
4444
+ (PFActionButtonConfiguration *)_defaultSignUpButtonConfiguration {
4545
PFActionButtonConfiguration *configuration = [[PFActionButtonConfiguration alloc] initWithBackgroundImageColor:[PFColor signupButtonBackgroundColor]
4646
image:nil];
47-
NSString *title = NSLocalizedString(@"Sign Up", @"Sign Up");
47+
NSString *title = PFLocalizedString(@"Sign Up", @"Sign Up");
4848
[configuration setTitle:title forButtonStyle:PFActionButtonStyleNormal];
4949
[configuration setTitle:title forButtonStyle:PFActionButtonStyleWide];
5050

@@ -55,9 +55,9 @@ + (PFActionButtonConfiguration *)_defaultFacebookButtonConfiguration {
5555
PFActionButtonConfiguration *configuration = [[PFActionButtonConfiguration alloc] initWithBackgroundImageColor:[PFColor facebookButtonBackgroundColor]
5656
image:[PFImage imageNamed:PFLogInViewDefaultFacebookButtonImageName]];
5757

58-
[configuration setTitle:NSLocalizedString(@"Facebook", @"Facebook")
58+
[configuration setTitle:PFLocalizedString(@"Facebook", @"Facebook")
5959
forButtonStyle:PFActionButtonStyleNormal];
60-
[configuration setTitle:NSLocalizedString(@"Log In with Facebook", @"Log In with Facebook")
60+
[configuration setTitle:PFLocalizedString(@"Log In with Facebook", @"Log In with Facebook")
6161

6262
forButtonStyle:PFActionButtonStyleWide];
6363

@@ -68,9 +68,9 @@ + (PFActionButtonConfiguration *)_defaultTwitterButtonConfiguration {
6868
PFActionButtonConfiguration *configuration = [[PFActionButtonConfiguration alloc] initWithBackgroundImageColor:[PFColor twitterButtonBackgroundColor]
6969
image:[PFImage imageNamed:PFLogInViewDefaultTwitterButtonImageName]];
7070

71-
[configuration setTitle:NSLocalizedString(@"Twitter", @"Twitter")
71+
[configuration setTitle:PFLocalizedString(@"Twitter", @"Twitter")
7272
forButtonStyle:PFActionButtonStyleNormal];
73-
[configuration setTitle:NSLocalizedString(@"Log In with Twitter", @"Log In with Twitter")
73+
[configuration setTitle:PFLocalizedString(@"Log In with Twitter", @"Log In with Twitter")
7474

7575
forButtonStyle:PFActionButtonStyleWide];
7676

@@ -131,7 +131,7 @@ - (void)_updateAllFields {
131131
if (!_passwordField) {
132132
_passwordField = [[PFTextField alloc] initWithFrame:CGRectZero
133133
separatorStyle:PFTextFieldSeparatorStyleBottom];
134-
_passwordField.placeholder = NSLocalizedString(@"Password", @"Password");
134+
_passwordField.placeholder = PFLocalizedString(@"Password", @"Password");
135135
_passwordField.secureTextEntry = YES;
136136
_passwordField.autocorrectionType = UITextAutocorrectionTypeNo;
137137
_passwordField.autocapitalizationType = UITextAutocapitalizationTypeNone;
@@ -160,7 +160,7 @@ - (void)_updateAllFields {
160160
if (_fields & PFLogInFieldsPasswordForgotten) {
161161
if (!_passwordForgottenButton) {
162162
_passwordForgottenButton = [[PFTextButton alloc] initWithFrame:CGRectZero];
163-
[_passwordForgottenButton setTitle:NSLocalizedString(@"Forgot Password?", "Forgot Password?")
163+
[_passwordForgottenButton setTitle:PFLocalizedString(@"Forgot Password?", "Forgot Password?")
164164
forState:UIControlStateNormal];
165165
[self addSubview:_passwordForgottenButton];
166166
}
@@ -172,7 +172,7 @@ - (void)_updateAllFields {
172172
if (_fields & PFLogInFieldsLogInButton) {
173173
if (!_logInButton) {
174174
_logInButton = [[PFPrimaryButton alloc] initWithBackgroundImageColor:[PFColor loginButtonBackgroundColor]];
175-
[_logInButton setTitle:NSLocalizedString(@"Log In", @"Log In") forState:UIControlStateNormal];
175+
[_logInButton setTitle:PFLocalizedString(@"Log In", @"Log In") forState:UIControlStateNormal];
176176
[self addSubview:_logInButton];
177177
}
178178
} else {
@@ -475,10 +475,10 @@ - (void)_updateUsernameFieldStyle {
475475
NSString *usernamePlaceholder = nil;
476476
if (!_emailAsUsername) {
477477
keyboardType = UIKeyboardTypeDefault;
478-
usernamePlaceholder = NSLocalizedString(@"Username", @"Username");
478+
usernamePlaceholder = PFLocalizedString(@"Username", @"Username");
479479
} else {
480480
keyboardType = UIKeyboardTypeEmailAddress;
481-
usernamePlaceholder = NSLocalizedString(@"Email", @"Email");
481+
usernamePlaceholder = PFLocalizedString(@"Email", @"Email");
482482
}
483483

484484
_usernameField.placeholder = usernamePlaceholder;

‎ParseUI/Classes/LogInViewController/PFLogInViewController.m‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -289,18 +289,18 @@ - (void)_dismissAction {
289289
}
290290

291291
- (void)_forgotPasswordAction PF_EXTENSION_UNAVAILABLE("") {
292-
NSString *title = NSLocalizedString(@"Reset Password", @"Forgot password request title in PFLogInViewController");
293-
NSString *message = NSLocalizedString(@"Please enter the email address for your account.",
292+
NSString *title = PFLocalizedString(@"Reset Password", @"Forgot password request title in PFLogInViewController");
293+
NSString *message = PFLocalizedString(@"Please enter the email address for your account.",
294294
@"Email request message in PFLogInViewController");
295295
UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:title
296296
message:message
297297
delegate:self
298-
cancelButtonTitle:NSLocalizedString(@"Cancel", @"Cancel")
299-
otherButtonTitles:NSLocalizedString(@"OK", @"OK"), nil];
298+
cancelButtonTitle:PFLocalizedString(@"Cancel", @"Cancel")
299+
otherButtonTitles:PFLocalizedString(@"OK", @"OK"), nil];
300300
alertView.alertViewStyle = UIAlertViewStylePlainTextInput;
301301

302302
UITextField *textField = [alertView textFieldAtIndex:0];
303-
textField.placeholder = NSLocalizedString(@"Email", @"Email");
303+
textField.placeholder = PFLocalizedString(@"Email", @"Email");
304304
textField.keyboardType = UIKeyboardTypeEmailAddress;
305305
textField.returnKeyType = UIReturnKeyDone;
306306

@@ -310,15 +310,15 @@ - (void)_forgotPasswordAction PF_EXTENSION_UNAVAILABLE("") {
310310
- (void)_requestPasswordResetWithEmail:(NSString *)email {
311311
[PFUser requestPasswordResetForEmailInBackground:email block:^(BOOL success, NSError *error) {
312312
if (success) {
313-
NSString *title = NSLocalizedString(@"Password Reset",
313+
NSString *title = PFLocalizedString(@"Password Reset",
314314
@"Password reset success alert title in PFLogInViewController.");
315-
NSString *message = [NSString stringWithFormat:NSLocalizedString(@"An email with reset instructions has been sent to '%@'.",
315+
NSString *message = [NSString stringWithFormat:PFLocalizedString(@"An email with reset instructions has been sent to '%@'.",
316316
@"Password reset message in PFLogInViewController"), email];
317317
[PFUIAlertView showAlertViewWithTitle:title
318318
message:message
319-
cancelButtonTitle:NSLocalizedString(@"OK", @"OK")];
319+
cancelButtonTitle:PFLocalizedString(@"OK", @"OK")];
320320
} else {
321-
NSString *title = NSLocalizedString(@"Password Reset Failed",
321+
NSString *title = PFLocalizedString(@"Password Reset Failed",
322322
@"Password reset error alert title in PFLogInViewController.");
323323
[PFUIAlertView showAlertViewWithTitle:title error:error];
324324
}
@@ -471,12 +471,12 @@ - (void)_loginDidFailWithError:(NSError *)error {
471471
if (_delegateExistingMethods.didFailToLogIn) {
472472
[_delegate logInViewController:self didFailToLogInWithError:error];
473473
} else {
474-
NSString *title = NSLocalizedString(@"Login Failed", @"Login failed alert title in PFLogInViewController");
474+
NSString *title = PFLocalizedString(@"Login Failed", @"Login failed alert title in PFLogInViewController");
475475
NSString *message = nil;
476476
if (error.code == kPFErrorObjectNotFound) {
477-
message = NSLocalizedString(@"The username and password you entered don't match", @"Invalid login credentials alert message in PFLogInViewController");
477+
message = PFLocalizedString(@"The username and password you entered don't match", @"Invalid login credentials alert message in PFLogInViewController");
478478
} else {
479-
message = NSLocalizedString(@"Please try again", @"Generic login failed alert message in PFLogInViewController");
479+
message = PFLocalizedString(@"Please try again", @"Generic login failed alert message in PFLogInViewController");
480480
}
481481
[PFUIAlertView showAlertViewWithTitle:title message:message];
482482
}

‎ParseUI/Classes/ProductTableViewController/PFProductTableViewController.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ - (void)objectsDidLoad:(NSError *)error {
9494
} else {
9595
cell.state = PFPurchaseTableViewCellStateNormal;
9696

97-
NSString *title = NSLocalizedString(@"Download Error",
97+
NSString *title = PFLocalizedString(@"Download Error",
9898
@"Download Error");
9999
[PFUIAlertView showAlertViewWithTitle:title error:downloadError];
100100
}
@@ -174,7 +174,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
174174
PFProduct *product = self.objects[indexPath.row];
175175
[PFPurchase buyProduct:product.productIdentifier block:^(NSError *error) {
176176
if (error) {
177-
NSString *title = NSLocalizedString(@"Purchase Error", @"Purchase Error");
177+
NSString *title = PFLocalizedString(@"Purchase Error", @"Purchase Error");
178178
[PFUIAlertView showAlertViewWithTitle:title error:error];
179179
}
180180
}];

‎ParseUI/Classes/QueryCollectionViewController/PFQueryCollectionViewController.m‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ - (UICollectionReusableView *)collectionViewReusableViewForNextPageAction:(UICol
330330
_currentNextPageView = [collectionView dequeueReusableSupplementaryViewOfKind:UICollectionElementKindSectionFooter
331331
withReuseIdentifier:PFQueryCollectionViewNextPageReusableViewIdentifier
332332
forIndexPath:[self _indexPathForPaginationReusableView]];
333-
_currentNextPageView.textLabel.text = NSLocalizedString(@"Load more...", @"Load more...");
333+
_currentNextPageView.textLabel.text = PFLocalizedString(@"Load more...", @"Load more...");
334334
[_currentNextPageView addTarget:self action:@selector(loadNextPage) forControlEvents:UIControlEventTouchUpInside];
335335
_currentNextPageView.animating = self.loading;
336336
return _currentNextPageView;
@@ -389,26 +389,26 @@ - (void)_handleDeletionError:(NSError *)error {
389389
[self loadObjects];
390390

391391
NSString *errorMessage = [NSString stringWithFormat:@"%@: \"%@\"",
392-
NSLocalizedString(@"Error occurred during deletion", @"Error occurred during deletion"),
392+
PFLocalizedString(@"Error occurred during deletion", @"Error occurred during deletion"),
393393
error.localizedDescription];
394394

395395
if ([UIAlertController class]) {
396-
UIAlertController *errorController = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Error", @"Error")
396+
UIAlertController *errorController = [UIAlertController alertControllerWithTitle:PFLocalizedString(@"Error", @"Error")
397397
message:errorMessage
398398
preferredStyle:UIAlertControllerStyleAlert];
399399

400-
[errorController addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"OK", @"OK")
400+
[errorController addAction:[UIAlertAction actionWithTitle:PFLocalizedString(@"OK", @"OK")
401401
style:UIAlertActionStyleCancel
402402
handler:nil]];
403403

404404
[self presentViewController:errorController animated:YES completion:nil];
405405
} else {
406406
// Cast to `id` is required for building succesfully for app extensions,
407407
// this code actually never runs in App Extensions, since they are iOS 8.0+, so we are good with just a hack
408-
UIAlertView *alertView = [(id)[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Error", @"Error")
408+
UIAlertView *alertView = [(id)[UIAlertView alloc] initWithTitle:PFLocalizedString(@"Error", @"Error")
409409
message:errorMessage
410410
delegate:nil
411-
cancelButtonTitle:NSLocalizedString(@"OK", @"OK")
411+
cancelButtonTitle:PFLocalizedString(@"OK", @"OK")
412412
otherButtonTitles:nil];
413413

414414
[alertView show];

‎ParseUI/Classes/QueryTableViewController/PFQueryTableViewController.m‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ - (PFTableViewCell *)tableView:(UITableView *)otherTableView cellForNextPageAtIn
408408
if (cell == nil) {
409409
cell = [[PFActivityIndicatorTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault
410410
reuseIdentifier:cellIdentifier];
411-
cell.textLabel.text = NSLocalizedString(@"Load more...", @"Load more...");
411+
cell.textLabel.text = PFLocalizedString(@"Load more...", @"Load more...");
412412
}
413413

414414
cell.animating = self.loading;
@@ -517,26 +517,26 @@ - (void)_handleDeletionError:(NSError *)error {
517517
[self loadObjects];
518518

519519
NSString *errorMessage = [NSString stringWithFormat:@"%@: \"%@\"",
520-
NSLocalizedString(@"Error occurred during deletion", @"Error occurred during deletion"),
520+
PFLocalizedString(@"Error occurred during deletion", @"Error occurred during deletion"),
521521
error.localizedDescription];
522522

523523
if ([UIAlertController class]) {
524-
UIAlertController *errorController = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Error", @"Error")
524+
UIAlertController *errorController = [UIAlertController alertControllerWithTitle:PFLocalizedString(@"Error", @"Error")
525525
message:errorMessage
526526
preferredStyle:UIAlertControllerStyleAlert];
527527

528-
[errorController addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"OK", @"OK")
528+
[errorController addAction:[UIAlertAction actionWithTitle:PFLocalizedString(@"OK", @"OK")
529529
style:UIAlertActionStyleCancel
530530
handler:nil]];
531531

532532
[self presentViewController:errorController animated:YES completion:nil];
533533
} else {
534534
// Cast to `id` is required for building succesfully for app extensions,
535535
// this code actually never runs in App Extensions, since they are iOS 8.0+, so we are good with just a hack
536-
UIAlertView *alertView = [(id)[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Error", @"Error")
536+
UIAlertView *alertView = [(id)[UIAlertView alloc] initWithTitle:PFLocalizedString(@"Error", @"Error")
537537
message:errorMessage
538538
delegate:nil
539-
cancelButtonTitle:NSLocalizedString(@"OK", @"OK")
539+
cancelButtonTitle:PFLocalizedString(@"OK", @"OK")
540540
otherButtonTitles:nil];
541541

542542
[alertView show];

0 commit comments

Comments
 (0)