diff --git a/Classes/AssistantView.m b/Classes/AssistantView.m index 800e9fc69..70dd6165f 100644 --- a/Classes/AssistantView.m +++ b/Classes/AssistantView.m @@ -242,7 +242,7 @@ static UICompositeViewDescription *compositeDescription = nil; nil) preferredStyle:UIAlertControllerStyleAlert]; - UIAlertAction* defaultAction = [UIAlertAction actionWithTitle:@"Cancel" + UIAlertAction* defaultAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {}]; @@ -285,7 +285,7 @@ static UICompositeViewDescription *compositeDescription = nil; nil) preferredStyle:UIAlertControllerStyleAlert]; - UIAlertAction* defaultAction = [UIAlertAction actionWithTitle:@"Cancel" + UIAlertAction* defaultAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {}]; @@ -826,10 +826,12 @@ static UICompositeViewDescription *compositeDescription = nil; message:[AssistantView StringForXMLRPCError:err] preferredStyle:UIAlertControllerStyleAlert]; - UIAlertAction* defaultAction = [UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleDefault + UIAlertAction* defaultAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil) + style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {}]; - UIAlertAction* continueAction = [UIAlertAction actionWithTitle:@"Continue" style:UIAlertActionStyleDefault + UIAlertAction* continueAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Continue", nil) + style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) { [PhoneMainView.instance popToView:DialerView.compositeViewDescription]; }]; @@ -859,7 +861,7 @@ static UICompositeViewDescription *compositeDescription = nil; _outgoingView = AssistantLinkView.compositeViewDescription; [self configureProxyConfig]; } else { - if (linphone_account_creator_get_username(account_creator) && strcmp(resp, "ERROR_ACCOUNT_DOESNT_EXIST")) { + if (linphone_account_creator_get_username(account_creator) && (strcmp(resp, "ERROR_ACCOUNT_DOESNT_EXIST") == 0)) { [self showErrorPopup:"ERROR_BAD_CREDENTIALS"]; } else { [self showErrorPopup:resp]; @@ -1210,12 +1212,12 @@ void assistant_is_account_linked(LinphoneAccountCreator *creator, LinphoneAccoun [self findButton:ViewElement_PhoneButton].hidden = emailSwitch.isOn; self.phoneLabel.hidden = emailSwitch.isOn; self.phoneTitle.hidden = emailSwitch.isOn; - + self.phoneTitle.text = NSLocalizedString(@"Please confirm your country code and enter your phone number", nil); self.infoLoginButton.hidden = !usernameView.hidden; if (!usernameView.hidden) { - self.subtileLabel_useLinphoneAccount.text = @"Please enter your username and password"; + self.subtileLabel_useLinphoneAccount.text = NSLocalizedString(@"Please enter your username and password", nil); } else { - self.subtileLabel_useLinphoneAccount.text = @"Please confirm your country code and enter your phone number"; + self.subtileLabel_useLinphoneAccount.text = NSLocalizedString(@"Please confirm your country code and enter your phone number", nil); } diff --git a/Classes/CallView.m b/Classes/CallView.m index ee8008076..d72579975 100644 --- a/Classes/CallView.m +++ b/Classes/CallView.m @@ -547,7 +547,7 @@ static void hideSpinner(LinphoneCall *call, void *user_data) { nil) preferredStyle:UIAlertControllerStyleAlert]; - UIAlertAction* defaultAction = [UIAlertAction actionWithTitle:@"Continue" + UIAlertAction* defaultAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Continue", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {}]; diff --git a/Classes/ChatConversationView.m b/Classes/ChatConversationView.m index b7b9d2aac..c24b14f34 100644 --- a/Classes/ChatConversationView.m +++ b/Classes/ChatConversationView.m @@ -205,7 +205,7 @@ static UICompositeViewDescription *compositeDescription = nil; nil) preferredStyle:UIAlertControllerStyleAlert]; - UIAlertAction* defaultAction = [UIAlertAction actionWithTitle:@"Continue" + UIAlertAction* defaultAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Continue", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {}]; diff --git a/Classes/ContactsListView.m b/Classes/ContactsListView.m index 6859c169d..15d5398d5 100644 --- a/Classes/ContactsListView.m +++ b/Classes/ContactsListView.m @@ -138,7 +138,7 @@ static UICompositeViewDescription *compositeDescription = nil; nil) preferredStyle:UIAlertControllerStyleAlert]; - UIAlertAction* defaultAction = [UIAlertAction actionWithTitle:@"Continue" + UIAlertAction* defaultAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Continue", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {}]; diff --git a/Classes/FirstLoginView.m b/Classes/FirstLoginView.m index 7c613d0c4..d6c8be897 100644 --- a/Classes/FirstLoginView.m +++ b/Classes/FirstLoginView.m @@ -191,7 +191,7 @@ static UICompositeViewDescription *compositeDescription = nil; case LinphoneConfiguringFailed: { [_waitView setHidden:true]; UIAlertController *errView = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Configuration failed", nil) - message:NSLocalizedString(@"Cannot retrieve your configuration. Please check credentiels or try again later", nil) + message:NSLocalizedString(@"Cannot retrieve your configuration. Please check credentials or try again later", nil) preferredStyle:UIAlertControllerStyleAlert]; UIAlertAction* defaultAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"OK", nil) @@ -260,7 +260,7 @@ static UICompositeViewDescription *compositeDescription = nil; nil) preferredStyle:UIAlertControllerStyleAlert]; - UIAlertAction* defaultAction = [UIAlertAction actionWithTitle:@"Cancel" + UIAlertAction* defaultAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {}]; diff --git a/Classes/InAppProductsManager.m b/Classes/InAppProductsManager.m index 9611faa69..3b105e0c4 100644 --- a/Classes/InAppProductsManager.m +++ b/Classes/InAppProductsManager.m @@ -411,16 +411,17 @@ } }else{ - UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"Account expiring" + UIAlertController *alert = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Account expiring", nil) message:expireText preferredStyle:UIAlertControllerStyleAlert]; - UIAlertAction* buyAction = [UIAlertAction actionWithTitle:@"Buy" style:UIAlertActionStyleDefault + UIAlertAction* buyAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Buy", nil) + style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) { [PhoneMainView.instance changeCurrentView:ShopView.compositeViewDescription]; }]; - UIAlertAction *laterAction = [UIAlertAction actionWithTitle:@"Later" + UIAlertAction *laterAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Later", nil) style:UIAlertActionStyleCancel handler:^(UIAlertAction *action){ // [alert dismissViewControllerAnimated:FALSE]; diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m index 5822603a8..bcc659796 100644 --- a/Classes/LinphoneAppDelegate.m +++ b/Classes/LinphoneAppDelegate.m @@ -518,13 +518,13 @@ didInvalidatePushTokenForType:(NSString *)type { LOGI(@"incoming voip notfication: %@ ", payload.dictionaryPayload); if(floor(NSFoundationVersionNumber) > NSFoundationVersionNumber_iOS_9_x_Max) { //Call category - UNNotificationAction* act_ans = [UNNotificationAction actionWithIdentifier:@"Answer" title:@"Answer" options:UNNotificationActionOptionForeground]; - UNNotificationAction* act_dec = [UNNotificationAction actionWithIdentifier:@"Decline" title:@"Decline" options:UNNotificationActionOptionNone]; + UNNotificationAction* act_ans = [UNNotificationAction actionWithIdentifier:@"Answer" title:NSLocalizedString(@"Answer", nil) options:UNNotificationActionOptionForeground]; + UNNotificationAction* act_dec = [UNNotificationAction actionWithIdentifier:@"Decline" title:NSLocalizedString(@"Decline", nil) options:UNNotificationActionOptionNone]; UNNotificationCategory* cat_call = [UNNotificationCategory categoryWithIdentifier:@"call_cat" actions:[NSArray arrayWithObjects:act_ans, act_dec, nil] intentIdentifiers:[[NSMutableArray alloc] init] options:UNNotificationCategoryOptionCustomDismissAction]; //Msg category - UNTextInputNotificationAction* act_reply = [UNTextInputNotificationAction actionWithIdentifier:@"Reply" title:@"Reply" options:UNNotificationActionOptionNone]; - UNNotificationAction* act_seen = [UNNotificationAction actionWithIdentifier:@"Seen" title:@"Mark as seen" options:UNNotificationActionOptionNone]; + UNTextInputNotificationAction* act_reply = [UNTextInputNotificationAction actionWithIdentifier:@"Reply" title:NSLocalizedString(@"Reply", nil) options:UNNotificationActionOptionNone]; + UNNotificationAction* act_seen = [UNNotificationAction actionWithIdentifier:@"Seen" title:NSLocalizedString(@"Mark as seen", nil) options:UNNotificationActionOptionNone]; UNNotificationCategory* cat_msg = [UNNotificationCategory categoryWithIdentifier:@"msg_cat" actions:[NSArray arrayWithObjects:act_reply, act_seen, nil] intentIdentifiers:[[NSMutableArray alloc] init] options:UNNotificationCategoryOptionCustomDismissAction]; //UNUserNotificationCenter* notifCenter = [UNUserNotificationCenter currentNotificationCenter]; diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index ed344fc52..715fd7b40 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -749,7 +749,7 @@ static void linphone_iphone_display_status(struct _LinphoneCore *lc, const char } } else { UNMutableNotificationContent* content = [[UNMutableNotificationContent alloc] init]; - content.title = @"Incoming call"; + content.title = NSLocalizedString(@"Incoming call", nil); content.body = address; content.sound = [UNNotificationSound soundNamed:@"notes_of_the_optimistic.caf"]; content.categoryIdentifier = @"call_cat"; @@ -810,7 +810,7 @@ static void linphone_iphone_display_status(struct _LinphoneCore *lc, const char LinphoneCallLog *UNlog = linphone_call_get_call_log(call); if (UNlog == NULL || linphone_call_log_get_status(UNlog) == LinphoneCallMissed) { UNMutableNotificationContent* missed_content = [[UNMutableNotificationContent alloc] init]; - missed_content.title = @"Missed call"; + missed_content.title = NSLocalizedString(@"Missed call", nil); missed_content.body = address; UNNotificationRequest *missed_req = [UNNotificationRequest requestWithIdentifier:@"call_request" content:missed_content trigger:NULL]; [[UNUserNotificationCenter currentNotificationCenter] addNotificationRequest:missed_req withCompletionHandler:^(NSError * _Nullable error) { @@ -1197,7 +1197,7 @@ static void linphone_iphone_popup_password_request(LinphoneCore *lc, const char } } else { UNMutableNotificationContent* content = [[UNMutableNotificationContent alloc] init]; - content.title = @"Message received"; + content.title = NSLocalizedString(@"Message received", nil); if ([LinphoneManager.instance lpConfigBoolForKey:@"show_msg_in_notif" withDefault:YES]) { content.subtitle = from; content.body = [UIChatBubbleTextCell TextMessageForChat:msg]; diff --git a/Classes/de.lproj/AboutView.strings b/Classes/de.lproj/AboutView.strings index 1869f6963..a4b29b9e1 100644 Binary files a/Classes/de.lproj/AboutView.strings and b/Classes/de.lproj/AboutView.strings differ diff --git a/Classes/de.lproj/AssistantLinkView.strings b/Classes/de.lproj/AssistantLinkView.strings index 01277a6e6..d0d2758fa 100644 Binary files a/Classes/de.lproj/AssistantLinkView.strings and b/Classes/de.lproj/AssistantLinkView.strings differ diff --git a/Classes/de.lproj/AssistantViewScreens.strings b/Classes/de.lproj/AssistantViewScreens.strings index 87998f1e4..50d2db428 100644 Binary files a/Classes/de.lproj/AssistantViewScreens.strings and b/Classes/de.lproj/AssistantViewScreens.strings differ diff --git a/Classes/de.lproj/CountryListView.strings b/Classes/de.lproj/CountryListView.strings index 0a3f35e25..3091c70c6 100644 Binary files a/Classes/de.lproj/CountryListView.strings and b/Classes/de.lproj/CountryListView.strings differ diff --git a/Resources/ar.lproj/Localizable.strings b/Resources/ar.lproj/Localizable.strings index c26a8ca1b..38f111dd4 100644 Binary files a/Resources/ar.lproj/Localizable.strings and b/Resources/ar.lproj/Localizable.strings differ diff --git a/Resources/de.lproj/Localizable.strings b/Resources/de.lproj/Localizable.strings index 55e5d0f8b..cf07e4d9a 100644 Binary files a/Resources/de.lproj/Localizable.strings and b/Resources/de.lproj/Localizable.strings differ diff --git a/Resources/en.lproj/Localizable.strings b/Resources/en.lproj/Localizable.strings index fce0e8960..147c7bfaa 100644 Binary files a/Resources/en.lproj/Localizable.strings and b/Resources/en.lproj/Localizable.strings differ diff --git a/Resources/fr.lproj/Localizable.strings b/Resources/fr.lproj/Localizable.strings index 22e26b89e..9c6a40e24 100644 Binary files a/Resources/fr.lproj/Localizable.strings and b/Resources/fr.lproj/Localizable.strings differ diff --git a/Resources/ja.lproj/Localizable.strings b/Resources/ja.lproj/Localizable.strings index 70cb09d17..08a0723d0 100644 Binary files a/Resources/ja.lproj/Localizable.strings and b/Resources/ja.lproj/Localizable.strings differ diff --git a/Resources/nl.lproj/Localizable.strings b/Resources/nl.lproj/Localizable.strings index c37960298..66acdfc5e 100644 Binary files a/Resources/nl.lproj/Localizable.strings and b/Resources/nl.lproj/Localizable.strings differ diff --git a/Resources/pl.lproj/Localizable.strings b/Resources/pl.lproj/Localizable.strings index 531318a84..566857a09 100644 Binary files a/Resources/pl.lproj/Localizable.strings and b/Resources/pl.lproj/Localizable.strings differ diff --git a/Resources/pt_BR.lproj/Localizable.strings b/Resources/pt_BR.lproj/Localizable.strings index 07abe3b01..667d162d7 100644 Binary files a/Resources/pt_BR.lproj/Localizable.strings and b/Resources/pt_BR.lproj/Localizable.strings differ diff --git a/Resources/ru.lproj/Localizable.strings b/Resources/ru.lproj/Localizable.strings index 4daaab807..ebae68368 100644 Binary files a/Resources/ru.lproj/Localizable.strings and b/Resources/ru.lproj/Localizable.strings differ diff --git a/Resources/sv.lproj/Localizable.strings b/Resources/sv.lproj/Localizable.strings index 7663b0de2..51a483daf 100644 Binary files a/Resources/sv.lproj/Localizable.strings and b/Resources/sv.lproj/Localizable.strings differ diff --git a/Resources/tr.lproj/Localizable.strings b/Resources/tr.lproj/Localizable.strings index 9b53c2f03..0aa34bac1 100644 Binary files a/Resources/tr.lproj/Localizable.strings and b/Resources/tr.lproj/Localizable.strings differ diff --git a/Resources/zh_CN.lproj/Localizable.strings b/Resources/zh_CN.lproj/Localizable.strings index 334fc5150..f6933943d 100644 Binary files a/Resources/zh_CN.lproj/Localizable.strings and b/Resources/zh_CN.lproj/Localizable.strings differ diff --git a/Resources/zh_TW.lproj/Localizable.strings b/Resources/zh_TW.lproj/Localizable.strings index 98aaa10d3..2dc412647 100644 Binary files a/Resources/zh_TW.lproj/Localizable.strings and b/Resources/zh_TW.lproj/Localizable.strings differ diff --git a/Settings/InAppSettings.bundle/de.lproj/Network.strings b/Settings/InAppSettings.bundle/de.lproj/Network.strings index fa48a67bc..7ef850380 100644 Binary files a/Settings/InAppSettings.bundle/de.lproj/Network.strings and b/Settings/InAppSettings.bundle/de.lproj/Network.strings differ diff --git a/Settings/InAppSettings.bundle/fr.lproj/Network.strings b/Settings/InAppSettings.bundle/fr.lproj/Network.strings index 82d3b1082..5a052d1f6 100644 Binary files a/Settings/InAppSettings.bundle/fr.lproj/Network.strings and b/Settings/InAppSettings.bundle/fr.lproj/Network.strings differ