Update i18n strings

Author: Chuan Ren

Auth/FirebaseAuthUI/FUIAuthBaseViewController.m

@@ -236,7 +236,7 @@ + (void)showAlertWithTitle:(nullable NSString *)title
                            message:message
                        actionTitle:nil
                      actionHandler:nil
-                      dismissTitle:@"OK"
+                      dismissTitle:FUILocalizedString(kStr_OK)
                     dismissHandler:nil
           presentingViewController:presentingViewController];
 }

Auth/FirebaseAuthUI/FUIAuthStrings.h

@@ -37,6 +37,7 @@ extern NSString *const kStr_Close;
 extern NSString *const kStr_ConfirmEmail;
 extern NSString *const kStr_Email;
 extern NSString *const kStr_EmailAlreadyInUseError;
+extern NSString *const kStr_EmailSentConfirmationMessage;
 extern NSString *const kStr_EnterYourEmail;
 extern NSString *const kStr_EnterYourPassword;
 extern NSString *const kStr_Error;
@@ -57,12 +58,17 @@ extern NSString *const kStr_PasswordVerificationMessage;
 extern NSString *const kStr_ProviderUsedPreviouslyMessage;
 extern NSString *const kStr_Save;
 extern NSString *const kStr_Send;
+extern NSString *const kStr_Resend;
+extern NSString *const kStr_SignedIn;
 extern NSString *const kStr_SignInTitle;
 extern NSString *const kStr_SignInTooManyTimesError;
 extern NSString *const kStr_SignInWithEmail;
+extern NSString *const kStr_SignInEmailSent;
 extern NSString *const kStr_SignUpTitle;
 extern NSString *const kStr_SignUpTooManyTimesError;
 extern NSString *const kStr_TermsOfService;
+extern NSString *const kStr_TroubleGettingEmailTitle;
+extern NSString *const kStr_TroubleGettingEmailMessage;
 extern NSString *const kStr_PrivacyPolicy;
 extern NSString *const kStr_TermsOfServiceMessage;
 extern NSString *const kStr_UserNotFoundError;

Auth/FirebaseAuthUI/FUIAuthStrings.m

@@ -43,6 +43,7 @@
 NSString *const kStr_ConfirmEmail = @"ConfirmEmail";
 NSString *const kStr_Email = @"Email";
 NSString *const kStr_EmailAlreadyInUseError = @"EmailAlreadyInUseError";
+NSString *const kStr_EmailSentConfirmationMessage = @"EmailSentConfirmationMessage";
 NSString *const kStr_EnterYourEmail = @"EnterYourEmail";
 NSString *const kStr_EnterYourPassword = @"EnterYourPassword";
 NSString *const kStr_Error = @"Error";
@@ -63,12 +64,17 @@
 NSString *const kStr_ProviderUsedPreviouslyMessage = @"ProviderUsedPreviouslyMessage";
 NSString *const kStr_Save = @"Save";
 NSString *const kStr_Send = @"Send";
+NSString *const kStr_Resend = @"Resend";
+NSString *const kStr_SignedIn = @"SignedIn";
 NSString *const kStr_SignInTitle = @"SignInTitle";
 NSString *const kStr_SignInTooManyTimesError = @"SignInTooManyTimesError";
 NSString *const kStr_SignInWithEmail = @"SignInWithEmail";
+NSString *const kStr_SignInEmailSent = @"SignInEmailSent";
 NSString *const kStr_SignUpTitle = @"SignUpTitle";
 NSString *const kStr_SignUpTooManyTimesError = @"SignUpTooManyTimesError";
 NSString *const kStr_TermsOfService = @"TermsOfService";
+NSString *const kStr_TroubleGettingEmailTitle = @"TroubleGettingEmailTitle";
+NSString *const kStr_TroubleGettingEmailMessage = @"TroubleGettingEmailMessage";
 NSString *const kStr_PrivacyPolicy = @"PrivacyPolicy";
 NSString *const kStr_TermsOfServiceMessage = @"TermsOfServiceMessage";
 NSString *const kStr_UserNotFoundError = @"UserNotFoundError";

Auth/FirebaseAuthUI/Strings/en.lproj/FirebaseAuthUI.strings

@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Save";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Send";
 
+/* Resend button title. */
+"Resend" = "Resend";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Email";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Choose password";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Trouble signing in?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Confirm Email";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Signed in!";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Trouble getting emails?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Try these common fixes: \n - Check if the email was marked as spam or filtered.\n - Check your internet connection.\n - Check that you did not misspell your email.\n - Check that your inbox space is not running out or other inbox settings related issues.\n If the steps above didn't work, you can resend the email. Note that this will deactivate the link in the older email.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "A sign-in email with additional instrucitons was sent to %@. Check your email to complete sign-in.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Sign-in email Sent";

EmailAuth/FirebaseEmailAuthUI/FUIConfirmEmailViewController.m

@@ -167,7 +167,7 @@ - (void)onNext:(NSString *)emailText {
       }
     }
 
-    [[self class] showAlertWithTitle:@"Signed in!"
+    [[self class] showAlertWithTitle:FUILocalizedString(kStr_SignedIn)
                              message:nil
                          actionTitle:nil
                        actionHandler:nil

EmailAuth/FirebaseEmailAuthUI/FUIEmailAuth.m

@@ -304,7 +304,7 @@ - (void)handleUnverifiedProviderLinking:(NSString *)providerID
         [self.authUI invokeResultCallbackWithAuthDataResult:authResult URL:nil error:error];
       };
 
-      [FUIAuthBaseViewController showAlertWithTitle:@"Signed in!"
+      [FUIAuthBaseViewController showAlertWithTitle:FUILocalizedString(kStr_SignedIn)
                                             message:nil
                                         actionTitle:nil
                                       actionHandler:nil
@@ -352,7 +352,7 @@ - (void)handleAnonymousUpgrade:(NSString *)anonymousUserID email:(NSString *)ema
             return;
         }
       }
-      [FUIAuthBaseViewController showAlertWithMessage:@"Signed in!"];
+      [FUIAuthBaseViewController showAlertWithMessage:FUILocalizedString(kStr_SignedIn)];
     };
 
     [self.authUI.auth.currentUser
@@ -408,11 +408,11 @@ - (void)handleEmaiLinkSignIn:(NSString *)email {
       [self.authUI invokeResultCallbackWithAuthDataResult:authResult URL:nil error:error];
     };
 
-    [FUIAuthBaseViewController showAlertWithTitle:@"Signed in!"
+    [FUIAuthBaseViewController showAlertWithTitle:FUILocalizedString(kStr_SignedIn)
                                           message:nil
                                       actionTitle:nil
                                     actionHandler:nil
-                                     dismissTitle:@"OK"
+                                     dismissTitle:FUILocalizedString(kStr_OK)
                                    dismissHandler:dismissHandler
                          presentingViewController:nil];
   };

EmailAuth/FirebaseEmailAuthUI/FUIEmailEntryViewController.m

@@ -55,18 +55,6 @@
  */
 static NSString *const kNextButtonAccessibilityID = @"NextButtonAccessibilityID";
 
-/** @var kTroubleGettingEmailMessage
- @brief The message used in trouble getting email alert view.
- */
-static NSString *const kTroubleGettingEmailMessage =
-    @"Try these common fixes: \n \
-    - Check if the email was marked as spam or filtered.\n \
-    - Check your internet connection.\n \
-    - Check that you did not misspell your email.\n \
-    - Check that your inbox space is not running out or other inbox settings related issues.\n \
-    If the steps above didn't work, you can resend the email.\
-    Note that this will deactivate the link in the older email.";
-
 @interface FUIEmailEntryViewController () <UITableViewDataSource, UITextFieldDelegate>
 @end
 
@@ -237,30 +225,29 @@ - (void)sendSignInLinkToEmail:(NSString*)email {
     [self decrementActivity];
 
     if (error) {
-      [FUIAuthBaseViewController showAlertWithTitle:@"Error"
+      [FUIAuthBaseViewController showAlertWithTitle:FUILocalizedString(kStr_Error)
                                             message:error.description
                            presentingViewController:self];
     } else {
       NSString *successMessage =
-          [NSString stringWithFormat: @"A sign-in email with additional instrucitons was sent to "
-                                      "%@. Check your email to complete sign-in.", email];
-      [FUIAuthBaseViewController showAlertWithTitle:@"Sign-in email Sent"
+          [NSString stringWithFormat: FUILocalizedString(kStr_EmailSentConfirmationMessage), email];
+      [FUIAuthBaseViewController showAlertWithTitle:FUILocalizedString(kStr_SignInEmailSent)
                                             message:successMessage
-                                        actionTitle:@"Trouble getting email?"
+                                        actionTitle:FUILocalizedString(kStr_TroubleGettingEmailTitle)
                                       actionHandler:^{
                                         [FUIAuthBaseViewController
-                                           showAlertWithTitle:@"Trouble getting emails?"
-                                                      message:kTroubleGettingEmailMessage
-                                                  actionTitle:@"Resend"
+                                           showAlertWithTitle:FUILocalizedString(kStr_TroubleGettingEmailTitle)
+                                                      message:FUILocalizedString(kStr_TroubleGettingEmailMessage)
+                                                  actionTitle:FUILocalizedString(kStr_Resend)
                                                 actionHandler:^{
                                                   [self sendSignInLinkToEmail:email];
-                                                } dismissTitle:@"Back"
+                                                } dismissTitle:FUILocalizedString(kStr_Back)
                                                dismissHandler:^{
                                                  [self.navigationController popToRootViewControllerAnimated:YES];
                                                }
                                      presentingViewController:self];
                                       }
-                                       dismissTitle:@"Back"
+                                       dismissTitle:FUILocalizedString(kStr_Back)
                                      dismissHandler:^{
                                        [self.navigationController popToRootViewControllerAnimated:YES];
                                      }