From cf828dc1cf6e2a9875a8d0aca9d732a67745de37 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 9 Feb 2017 12:02:17 -0500 Subject: [PATCH] =?UTF-8?q?Rework=20=E2=80=9Cverify=20code=E2=80=9D=20view?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Ensure all controls visible at all times, on all form factors, even with keyboard active. * Improve focus (i.e. auto-focus textfield on arrival and after errors). * Move to programmatic view creation and layout. * Improve spacing and sizing. * Replace “change number” button with “back” button. * Submit code with return key. * Improve copy for clarity. // FREEBIE --- Signal/src/AppDelegate.m | 4 +- .../src/Storyboards/Registration.storyboard | 259 +----------------- .../CodeVerificationViewController.h | 46 +--- .../CodeVerificationViewController.m | 218 ++++++++++++--- .../RegistrationViewController.m | 11 +- .../az_AZ.lproj/Localizable.strings | 2 +- .../translations/bg.lproj/Localizable.strings | 2 +- .../translations/bs.lproj/Localizable.strings | 2 +- .../translations/ca.lproj/Localizable.strings | 2 +- .../translations/cs.lproj/Localizable.strings | 2 +- .../translations/da.lproj/Localizable.strings | 2 +- .../translations/de.lproj/Localizable.strings | 2 +- .../el_GR.lproj/Localizable.strings | 2 +- .../translations/en.lproj/Localizable.strings | 10 +- .../translations/es.lproj/Localizable.strings | 2 +- .../translations/fi.lproj/Localizable.strings | 2 +- .../fil.lproj/Localizable.strings | 2 +- .../translations/fr.lproj/Localizable.strings | 2 +- .../translations/gl.lproj/Localizable.strings | 2 +- .../translations/hr.lproj/Localizable.strings | 2 +- .../translations/hu.lproj/Localizable.strings | 2 +- .../translations/id.lproj/Localizable.strings | 2 +- .../it_IT.lproj/Localizable.strings | 2 +- .../ja_JP.lproj/Localizable.strings | 2 +- .../ko_KR.lproj/Localizable.strings | 2 +- .../translations/lv.lproj/Localizable.strings | 2 +- .../translations/mk.lproj/Localizable.strings | 2 +- .../nb_NO.lproj/Localizable.strings | 2 +- .../translations/nl.lproj/Localizable.strings | 2 +- .../translations/pl.lproj/Localizable.strings | 2 +- .../pt_BR.lproj/Localizable.strings | 2 +- .../pt_PT.lproj/Localizable.strings | 2 +- .../translations/ro.lproj/Localizable.strings | 2 +- .../translations/ru.lproj/Localizable.strings | 2 +- .../translations/sl.lproj/Localizable.strings | 2 +- .../translations/sn.lproj/Localizable.strings | 2 +- .../translations/sq.lproj/Localizable.strings | 2 +- .../sv_SE.lproj/Localizable.strings | 2 +- .../th_TH.lproj/Localizable.strings | 2 +- .../tr_TR.lproj/Localizable.strings | 2 +- .../zh_CN.lproj/Localizable.strings | 2 +- 41 files changed, 236 insertions(+), 382 deletions(-) diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m index 0c2962f41..97933aaf0 100644 --- a/Signal/src/AppDelegate.m +++ b/Signal/src/AppDelegate.m @@ -246,9 +246,7 @@ static NSString *const kURLHostVerifyPrefix = @"verify"; if ([controller isKindOfClass:[CodeVerificationViewController class]]) { CodeVerificationViewController *cvvc = (CodeVerificationViewController *)controller; NSString *verificationCode = [url.path substringFromIndex:1]; - - cvvc.challengeTextField.text = verificationCode; - [cvvc verifyChallengeAction:nil]; + [cvvc setVerificationCodeAndTryToVerify:verificationCode]; } else { DDLogWarn(@"Not the verification view controller we expected. Got %@ instead", NSStringFromClass(controller.class)); diff --git a/Signal/src/Storyboards/Registration.storyboard b/Signal/src/Storyboards/Registration.storyboard index d027b5bfa..ed7e33216 100644 --- a/Signal/src/Storyboards/Registration.storyboard +++ b/Signal/src/Storyboards/Registration.storyboard @@ -1,5 +1,5 @@ - + @@ -353,268 +353,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -651,7 +395,6 @@ - diff --git a/Signal/src/view controllers/CodeVerificationViewController.h b/Signal/src/view controllers/CodeVerificationViewController.h index b162c22d6..6d4817ee1 100644 --- a/Signal/src/view controllers/CodeVerificationViewController.h +++ b/Signal/src/view controllers/CodeVerificationViewController.h @@ -1,51 +1,11 @@ // -// CodeVerificationViewController.h -// Signal -// -// Created by Dylan Bourgeois on 13/11/14. -// Copyright (c) 2014 Open Whisper Systems. All rights reserved. -// -// This class allows the user to send the server their verification code and request new codes to be sent via SMS or -// voice. +// Copyright (c) 2017 Open Whisper Systems. All rights reserved. // #import -@interface CodeVerificationViewController : UIViewController - -@property (nonatomic, strong) IBOutlet UIImageView *signalLogo; - -// Where the user enters the verification code they wish to document -@property (nonatomic, strong) IBOutlet UITextField *challengeTextField; - -@property (nonatomic, strong) NSString *formattedPhoneNumber; - -@property (nonatomic, strong) IBOutlet UILabel *headerLabel; -// User action buttons -@property (nonatomic, strong) IBOutlet UIButton *challengeButton; -@property (nonatomic, strong) IBOutlet UIButton *sendCodeViaSMSAgainButton; -@property (nonatomic, strong) IBOutlet UIButton *sendCodeViaVoiceButton; - -@property (nonatomic, strong) IBOutlet UIActivityIndicatorView *submitCodeSpinner; -@property (nonatomic, strong) IBOutlet UIActivityIndicatorView *requestCodeAgainSpinner; -@property (nonatomic, strong) IBOutlet UIActivityIndicatorView *requestCallSpinner; -@property (nonatomic, strong) IBOutlet UIButton *changeNumberButton; -@property (nonatomic) IBOutlet NSLayoutConstraint *headerConstraint; - -// Displays phone number entered in previous step. There is a UI option (segue) which allows the user to go back and -// edit this. -@property (nonatomic, strong) IBOutlet UILabel *phoneNumberEntered; - - -// User verifies code -- (IBAction)verifyChallengeAction:(id)sender; -// User requests new code via SMS -- (IBAction)sendCodeSMSAction:(id)sender; -// User requests new code via voice phone call -- (IBAction)sendCodeVoiceAction:(id)sender; +@interface CodeVerificationViewController : UIViewController -// This ensures the user doesn't keep creating server requests before the server has responded for all buttons that -// result in server requests -- (void)enableServerActions:(BOOL)enabled; +- (void)setVerificationCodeAndTryToVerify:(NSString *)verificationCode; @end diff --git a/Signal/src/view controllers/CodeVerificationViewController.m b/Signal/src/view controllers/CodeVerificationViewController.m index e9386ec12..eb8c94b26 100644 --- a/Signal/src/view controllers/CodeVerificationViewController.m +++ b/Signal/src/view controllers/CodeVerificationViewController.m @@ -1,9 +1,5 @@ // -// CodeVerificationViewController.m -// Signal -// -// Created by Dylan Bourgeois on 13/11/14. -// Copyright (c) 2014 Open Whisper Systems. All rights reserved. +// Copyright (c) 2017 Open Whisper Systems. All rights reserved. // #import "CodeVerificationViewController.h" @@ -21,12 +17,28 @@ NS_ASSUME_NONNULL_BEGIN NSString *const kCompletedRegistrationSegue = @"CompletedRegistration"; -@interface CodeVerificationViewController () +@interface CodeVerificationViewController () + +@property (nonatomic, readonly) AccountManager *accountManager; + +// Where the user enters the verification code they wish to document +@property (nonatomic) UITextField *challengeTextField; + +@property (nonatomic) UILabel *phoneNumberLabel; + +//// User action buttons +@property (nonatomic) UIButton *challengeButton; +@property (nonatomic) UIButton *sendCodeViaSMSAgainButton; +@property (nonatomic) UIButton *sendCodeViaVoiceButton; -@property (nonatomic, strong, readonly) AccountManager *accountManager; +@property (nonatomic) UIActivityIndicatorView *submitCodeSpinner; +@property (nonatomic) UIActivityIndicatorView *requestCodeAgainSpinner; +@property (nonatomic) UIActivityIndicatorView *requestCallSpinner; @end +#pragma mark - + @implementation CodeVerificationViewController - (nullable instancetype)initWithCoder:(NSCoder *)aDecoder @@ -55,30 +67,165 @@ NSString *const kCompletedRegistrationSegue = @"CompletedRegistration"; - (void)viewDidLoad { [super viewDidLoad]; + + [self createViews]; + [self initializeKeyboardHandlers]; - _headerLabel.text = NSLocalizedString(@"VERIFICATION_HEADER", @"Navigation title in the registration flow - during the sms code verification process."); +} + +- (void)createViews { + self.view.backgroundColor = [UIColor whiteColor]; + self.view.opaque = YES; + + // TODO: Move this to UIColor+OWS? + UIColor *signalBlueColor = [UIColor colorWithRed:0.1135657504 + green:0.4787300229 + blue:0.89595204589999999 + alpha:1.]; + + UIView *header = [UIView new]; + header.backgroundColor = signalBlueColor; + [self.view addSubview:header]; + [header autoPinWidthToSuperview]; + [header autoPinEdgeToSuperviewEdge:ALEdgeTop]; + [header autoSetDimension:ALDimensionHeight toSize:ScaleFromIPhone5To7Plus(60, 60)]; + + UILabel *titleLabel = [UILabel new]; + titleLabel.textColor = [UIColor whiteColor]; + titleLabel.text = NSLocalizedString(@"VERIFICATION_HEADER", @"Navigation title in the registration flow - during the sms code verification process."); + titleLabel.font = [UIFont ows_mediumFontWithSize:20.f]; + [header addSubview:titleLabel]; + [titleLabel autoPinToTopLayoutGuideOfViewController:self withInset:0]; + [titleLabel autoPinEdgeToSuperviewEdge:ALEdgeBottom]; + [titleLabel autoHCenterInSuperview]; + + UIButton *backButton = [UIButton buttonWithType:UIButtonTypeCustom]; + [backButton setTitle:NSLocalizedString(@"VERIFICATION_BACK_BUTTON", @"button text for back button on verification view") + forState:UIControlStateNormal]; + [backButton setTitleColor:[UIColor whiteColor] + forState:UIControlStateNormal]; + backButton.titleLabel.font = [UIFont ows_mediumFontWithSize:14.f]; + [header addSubview:backButton]; + [backButton autoPinEdgeToSuperviewEdge:ALEdgeLeft withInset:ScaleFromIPhone5To7Plus(10, 10)]; + [backButton autoAlignAxis:ALAxisHorizontal toSameAxisOfView:titleLabel]; + [backButton addTarget:self action:@selector(backButtonPressed:) forControlEvents:UIControlEventTouchUpInside]; + + _phoneNumberLabel = [UILabel new]; + _phoneNumberLabel.textColor = [UIColor ows_darkGrayColor]; + _phoneNumberLabel.font = [UIFont ows_regularFontWithSize:20.f]; + [self.view addSubview:_phoneNumberLabel]; + [_phoneNumberLabel autoHCenterInSuperview]; + [_phoneNumberLabel autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:header + withOffset:ScaleFromIPhone5To7Plus(25, 100)]; + + _challengeTextField = [UITextField new]; + _challengeTextField.textColor = [UIColor blackColor]; _challengeTextField.placeholder = NSLocalizedString(@"VERIFICATION_CHALLENGE_DEFAULT_TEXT", - @"Text field placeholder for SMS verification code during registration"); + @"Text field placeholder for SMS verification code during registration"); + _challengeTextField.font = [UIFont ows_lightFontWithSize:21.f]; + _challengeTextField.textAlignment = NSTextAlignmentCenter; _challengeTextField.delegate = self; + [self.view addSubview:_challengeTextField]; + [_challengeTextField autoPinWidthToSuperviewWithMargin:ScaleFromIPhone5To7Plus(36, 36)]; + [_challengeTextField autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:_phoneNumberLabel + withOffset:ScaleFromIPhone5To7Plus(25, 25)]; + + UIView *underscoreView = [UIView new]; + underscoreView.backgroundColor = [UIColor colorWithWhite:0.5 alpha:1.f]; + [self.view addSubview:underscoreView]; + [underscoreView autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:_challengeTextField + withOffset:ScaleFromIPhone5To7Plus(3, 3)]; + [underscoreView autoPinWidthToSuperviewWithMargin:ScaleFromIPhone5To7Plus(36, 36)]; + [underscoreView autoSetDimension:ALDimensionHeight toSize:1.f]; + + _challengeButton = [UIButton buttonWithType:UIButtonTypeCustom]; + _challengeButton.backgroundColor = signalBlueColor; [_challengeButton setTitle:NSLocalizedString(@"VERIFICATION_CHALLENGE_SUBMIT_CODE", @"button text during registration to submit your SMS verification code") - forState:UIControlStateNormal]; - + forState:UIControlStateNormal]; + [_challengeButton setTitleColor:[UIColor whiteColor] + forState:UIControlStateNormal]; + _challengeButton.titleLabel.font = [UIFont ows_mediumFontWithSize:14.f]; + [_challengeButton addTarget:self + action:@selector(verifyChallengeAction:) + forControlEvents:UIControlEventTouchUpInside]; + [self.view addSubview:_challengeButton]; + [_challengeButton autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:underscoreView + withOffset:ScaleFromIPhone5To7Plus(15, 15)]; + [_challengeButton autoPinWidthToSuperviewWithMargin:ScaleFromIPhone5To7Plus(36, 36)]; + [_challengeButton autoSetDimension:ALDimensionHeight toSize:47.f]; + + _submitCodeSpinner = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhite]; + [_challengeButton addSubview:_submitCodeSpinner]; + [_submitCodeSpinner autoSetDimension:ALDimensionWidth toSize:ScaleFromIPhone5To7Plus(20, 20)]; + [_submitCodeSpinner autoSetDimension:ALDimensionHeight toSize:ScaleFromIPhone5To7Plus(20, 20)]; + [_submitCodeSpinner autoVCenterInSuperview]; + [_submitCodeSpinner autoPinEdgeToSuperviewEdge:ALEdgeRight withInset:ScaleFromIPhone5To7Plus(15, 15)]; + + _sendCodeViaSMSAgainButton = [UIButton buttonWithType:UIButtonTypeCustom]; + _sendCodeViaSMSAgainButton.backgroundColor = [UIColor whiteColor]; [_sendCodeViaSMSAgainButton setTitle:NSLocalizedString(@"VERIFICATION_CHALLENGE_SUBMIT_AGAIN", @"button text during registration to request another SMS code be sent") - forState:UIControlStateNormal]; - [_sendCodeViaVoiceButton - setTitle:[@" " stringByAppendingString:NSLocalizedString(@"VERIFICATION_CHALLENGE_SEND_VIAVOICE", @"button text during registration to request phone number verification be done via phone call")] - forState:UIControlStateNormal]; - [_changeNumberButton - setTitle:[@" " stringByAppendingString:NSLocalizedString(@"VERIFICATION_CHALLENGE_CHANGE_NUMBER", @"button text during registration to make corrections to your submitted phone number")] - forState:UIControlStateNormal]; + forState:UIControlStateNormal]; + [_sendCodeViaSMSAgainButton setTitleColor:signalBlueColor + forState:UIControlStateNormal]; + _sendCodeViaSMSAgainButton.titleLabel.font = [UIFont ows_mediumFontWithSize:14.f]; + [_sendCodeViaSMSAgainButton addTarget:self + action:@selector(sendCodeViaSMSAction:) + forControlEvents:UIControlEventTouchUpInside]; + [self.view addSubview:_sendCodeViaSMSAgainButton]; + [_sendCodeViaSMSAgainButton autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:_challengeButton + withOffset:ScaleFromIPhone5To7Plus(10, 10)]; + [_sendCodeViaSMSAgainButton autoPinWidthToSuperviewWithMargin:ScaleFromIPhone5To7Plus(36, 36)]; + [_sendCodeViaSMSAgainButton autoSetDimension:ALDimensionHeight toSize:35]; + + _requestCodeAgainSpinner = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray]; + [_sendCodeViaSMSAgainButton addSubview:_requestCodeAgainSpinner]; + [_requestCodeAgainSpinner autoSetDimension:ALDimensionWidth toSize:ScaleFromIPhone5To7Plus(20, 20)]; + [_requestCodeAgainSpinner autoSetDimension:ALDimensionHeight toSize:ScaleFromIPhone5To7Plus(20, 20)]; + [_requestCodeAgainSpinner autoVCenterInSuperview]; + [_requestCodeAgainSpinner autoPinEdgeToSuperviewEdge:ALEdgeRight withInset:ScaleFromIPhone5To7Plus(15, 15)]; + + _sendCodeViaVoiceButton = [UIButton buttonWithType:UIButtonTypeCustom]; + _sendCodeViaVoiceButton.backgroundColor = [UIColor whiteColor]; + [_sendCodeViaVoiceButton setTitle:NSLocalizedString(@"VERIFICATION_CHALLENGE_SEND_VIA_VOICE", + @"button text during registration to request phone number verification be done via phone call") + forState:UIControlStateNormal]; + [_sendCodeViaVoiceButton setTitleColor:signalBlueColor + forState:UIControlStateNormal]; + _sendCodeViaVoiceButton.titleLabel.font = [UIFont ows_mediumFontWithSize:14.f]; + [_sendCodeViaVoiceButton addTarget:self + action:@selector(sendCodeViaVoiceAction:) + forControlEvents:UIControlEventTouchUpInside]; + [self.view addSubview:_sendCodeViaVoiceButton]; + [_sendCodeViaVoiceButton autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:_sendCodeViaSMSAgainButton + withOffset:ScaleFromIPhone5To7Plus(0, 0)]; + [_sendCodeViaVoiceButton autoPinWidthToSuperviewWithMargin:ScaleFromIPhone5To7Plus(36, 36)]; + [_sendCodeViaVoiceButton autoSetDimension:ALDimensionHeight toSize:35]; + + _requestCallSpinner = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray]; + [_sendCodeViaVoiceButton addSubview:_requestCallSpinner]; + [_requestCallSpinner autoSetDimension:ALDimensionWidth toSize:ScaleFromIPhone5To7Plus(20, 20)]; + [_requestCallSpinner autoSetDimension:ALDimensionHeight toSize:ScaleFromIPhone5To7Plus(20, 20)]; + [_requestCallSpinner autoVCenterInSuperview]; + [_requestCallSpinner autoPinEdgeToSuperviewEdge:ALEdgeRight withInset:ScaleFromIPhone5To7Plus(15, 15)]; +} + +- (void)updatePhoneNumberLabel { + NSString *phoneNumber = [PhoneNumber bestEffortFormatPartialUserSpecifiedTextToLookLikeAPhoneNumber:[TSAccountManager localNumber]]; + + _phoneNumberLabel.text = [NSString stringWithFormat:NSLocalizedString(@"VERIFICATION_PHONE_NUMBER_FORMAT", + @"Label indicating the phone number currently being verified."), + phoneNumber]; } - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; [self enableServerActions:YES]; - [_phoneNumberEntered setText: - [PhoneNumber bestEffortFormatPartialUserSpecifiedTextToLookLikeAPhoneNumber:[TSAccountManager localNumber]]]; - [self adjustScreenSizes]; + [self updatePhoneNumberLabel]; +} + +- (void)viewDidAppear:(BOOL)animated { + [super viewDidAppear:animated]; + [_challengeTextField becomeFirstResponder]; } - (void)startActivityIndicator @@ -94,7 +241,7 @@ NSString *const kCompletedRegistrationSegue = @"CompletedRegistration"; [self.submitCodeSpinner stopAnimating]; } -- (IBAction)verifyChallengeAction:(id)sender +- (void)verifyChallengeAction:(nullable id)sender { [self startActivityIndicator]; [self.accountManager registerWithVerificationCode:[self validationCodeFromTextField]] @@ -123,7 +270,9 @@ NSString *const kCompletedRegistrationSegue = @"CompletedRegistration"; preferredStyle:UIAlertControllerStyleAlert]; UIAlertAction *dismissAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"DISMISS_BUTTON_TEXT", nil) style:UIAlertActionStyleDefault - handler:nil]; + handler:^(UIAlertAction *action) { + [_challengeTextField becomeFirstResponder]; + }]; [alertController addAction:dismissAction]; [self presentViewController:alertController animated:YES completion:nil]; @@ -158,7 +307,8 @@ NSString *const kCompletedRegistrationSegue = @"CompletedRegistration"; } #pragma mark - Send codes again -- (IBAction)sendCodeSMSAction:(id)sender { + +- (void)sendCodeViaSMSAction:(id)sender { [self enableServerActions:NO]; [_requestCodeAgainSpinner startAnimating]; @@ -175,7 +325,7 @@ NSString *const kCompletedRegistrationSegue = @"CompletedRegistration"; }]; } -- (IBAction)sendCodeVoiceAction:(id)sender { +- (void)sendCodeViaVoiceAction:(id)sender { [self enableServerActions:NO]; [_requestCallSpinner startAnimating]; @@ -209,6 +359,9 @@ NSString *const kCompletedRegistrationSegue = @"CompletedRegistration"; [_sendCodeViaVoiceButton setEnabled:enabled]; } +- (void)backButtonPressed:(id)sender { + [self.navigationController popViewControllerAnimated:YES]; +} #pragma mark - Keyboard notifications @@ -249,14 +402,15 @@ NSString *const kCompletedRegistrationSegue = @"CompletedRegistration"; return YES; } -- (void)adjustScreenSizes -{ - CGFloat screenHeight = [UIScreen mainScreen].bounds.size.height; +- (BOOL)textFieldShouldReturn:(UITextField *)textField { + [self verifyChallengeAction:nil]; + [textField resignFirstResponder]; + return NO; +} - if (screenHeight < 667) { // iphone 5 - self.signalLogo.hidden = YES; - _headerConstraint.constant = 120; - } +- (void)setVerificationCodeAndTryToVerify:(NSString *)verificationCode { + self.challengeTextField.text = verificationCode; + [self verifyChallengeAction:nil]; } #pragma mark - Logging diff --git a/Signal/src/view controllers/RegistrationViewController.m b/Signal/src/view controllers/RegistrationViewController.m index 6e855166e..cdbcc4fe3 100644 --- a/Signal/src/view controllers/RegistrationViewController.m +++ b/Signal/src/view controllers/RegistrationViewController.m @@ -1,9 +1,5 @@ // -// RegistrationViewController.m -// Signal -// -// Created by Dylan Bourgeois on 13/11/14. -// Copyright (c) 2014 Open Whisper Systems. All rights reserved. +// Copyright (c) 2017 Open Whisper Systems. All rights reserved. // #import "RegistrationViewController.h" @@ -218,13 +214,10 @@ static NSString *const kCodeSentSegue = @"codeSent"; } #pragma mark - Navigation + // In a storyboard-based application, you will often want to do a little preparation before navigation - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { if ([[segue identifier] isEqualToString:kCodeSentSegue]) { - CodeVerificationViewController *vc = [segue destinationViewController]; - vc.formattedPhoneNumber = [PhoneNumber - bestEffortFormatPartialUserSpecifiedTextToLookLikeAPhoneNumber:_phoneNumberTextField.text - withSpecifiedCountryCodeString:_countryCodeButton.titleLabel.text]; } } diff --git a/Signal/translations/az_AZ.lproj/Localizable.strings b/Signal/translations/az_AZ.lproj/Localizable.strings index 8c031b3f6..df4b6428f 100644 --- a/Signal/translations/az_AZ.lproj/Localizable.strings +++ b/Signal/translations/az_AZ.lproj/Localizable.strings @@ -928,7 +928,7 @@ "VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Təsdiqləmə kodu"; /* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIAVOICE" = "Əvəzində mənə zəng et"; +"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Əvəzində mənə zəng et"; /* button text during registration to request another SMS code be sent */ "VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Kodu yenidən istə"; diff --git a/Signal/translations/bg.lproj/Localizable.strings b/Signal/translations/bg.lproj/Localizable.strings index e864f18d4..4053119fb 100644 --- a/Signal/translations/bg.lproj/Localizable.strings +++ b/Signal/translations/bg.lproj/Localizable.strings @@ -928,7 +928,7 @@ "VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Код за потвърждение"; /* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIAVOICE" = "Звънни ми вместо това"; +"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Звънни ми вместо това"; /* button text during registration to request another SMS code be sent */ "VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Изпрати кода отново"; diff --git a/Signal/translations/bs.lproj/Localizable.strings b/Signal/translations/bs.lproj/Localizable.strings index 3dec51f16..3cf4c37eb 100644 --- a/Signal/translations/bs.lproj/Localizable.strings +++ b/Signal/translations/bs.lproj/Localizable.strings @@ -928,7 +928,7 @@ "VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Verifikacijski kôd"; /* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIAVOICE" = "Potvrdi pozivom"; +"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Potvrdi pozivom"; /* button text during registration to request another SMS code be sent */ "VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Ponovo zatraži kôd"; diff --git a/Signal/translations/ca.lproj/Localizable.strings b/Signal/translations/ca.lproj/Localizable.strings index b1e20e2c9..5efec4a9f 100644 --- a/Signal/translations/ca.lproj/Localizable.strings +++ b/Signal/translations/ca.lproj/Localizable.strings @@ -928,7 +928,7 @@ "VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Codi de verificació"; /* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIAVOICE" = "Telefona'm, millor"; +"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Telefona'm, millor"; /* button text during registration to request another SMS code be sent */ "VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Sol·licita el codi de nou"; diff --git a/Signal/translations/cs.lproj/Localizable.strings b/Signal/translations/cs.lproj/Localizable.strings index 4eb788c5c..d88b12715 100644 --- a/Signal/translations/cs.lproj/Localizable.strings +++ b/Signal/translations/cs.lproj/Localizable.strings @@ -928,7 +928,7 @@ "VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Ověřovací kód"; /* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIAVOICE" = "Místo toho mi zavolejte"; +"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Místo toho mi zavolejte"; /* button text during registration to request another SMS code be sent */ "VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Znovu zzažádat o kód"; diff --git a/Signal/translations/da.lproj/Localizable.strings b/Signal/translations/da.lproj/Localizable.strings index 25d9dba1e..b0c61abb5 100644 --- a/Signal/translations/da.lproj/Localizable.strings +++ b/Signal/translations/da.lproj/Localizable.strings @@ -928,7 +928,7 @@ "VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Verifikationskode"; /* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIAVOICE" = "Ring til mig i stedet"; +"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Ring til mig i stedet"; /* button text during registration to request another SMS code be sent */ "VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Bed om kode igen"; diff --git a/Signal/translations/de.lproj/Localizable.strings b/Signal/translations/de.lproj/Localizable.strings index a2f37b8e3..560cb7433 100644 --- a/Signal/translations/de.lproj/Localizable.strings +++ b/Signal/translations/de.lproj/Localizable.strings @@ -928,7 +928,7 @@ "VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Bestätigungscode"; /* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIAVOICE" = "Mich stattdessen anrufen"; +"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Mich stattdessen anrufen"; /* button text during registration to request another SMS code be sent */ "VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Code erneut anfordern"; diff --git a/Signal/translations/el_GR.lproj/Localizable.strings b/Signal/translations/el_GR.lproj/Localizable.strings index dc038e93e..0f20766a1 100644 --- a/Signal/translations/el_GR.lproj/Localizable.strings +++ b/Signal/translations/el_GR.lproj/Localizable.strings @@ -928,7 +928,7 @@ "VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Κωδικός επαλήθευσης"; /* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIAVOICE" = "Καλέστε εμένα "; +"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Καλέστε εμένα "; /* button text during registration to request another SMS code be sent */ "VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Αίτηση κωδικού ξανά"; diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index c264dbea3..7daacee4b 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -921,6 +921,9 @@ /* message footer while attachment is uploading */ "UPLOADING_MESSAGE_TEXT" = "Uploading..."; +/* button text for back button on verification view */ +"VERIFICATION_BACK_BUTTON" = "Back"; + /* button text during registration to make corrections to your submitted phone number */ "VERIFICATION_CHALLENGE_CHANGE_NUMBER" = "Change Number"; @@ -928,10 +931,10 @@ "VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Verification Code"; /* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIAVOICE" = "Call Me Instead"; +"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Call Me Instead"; /* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Request Code Again"; +"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Resend Code by SMS"; /* button text during registration to submit your SMS verification code */ "VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Submit Verification Code"; @@ -939,6 +942,9 @@ /* Navigation title in the registration flow - during the sms code verification process. */ "VERIFICATION_HEADER" = "Verify"; +/* Label indicating the phone number currently being verified. */ +"VERIFICATION_PHONE_NUMBER_FORMAT" = "Verifying: %@"; + /* table cell label in conversation settings */ "VERIFY_PRIVACY" = "Verify Safety Number"; diff --git a/Signal/translations/es.lproj/Localizable.strings b/Signal/translations/es.lproj/Localizable.strings index ffa5d7456..aacab3b87 100644 --- a/Signal/translations/es.lproj/Localizable.strings +++ b/Signal/translations/es.lproj/Localizable.strings @@ -928,7 +928,7 @@ "VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Código de verificación"; /* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIAVOICE" = "Recibir llamada con código"; +"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Recibir llamada con código"; /* button text during registration to request another SMS code be sent */ "VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Solicitar código nuevamente"; diff --git a/Signal/translations/fi.lproj/Localizable.strings b/Signal/translations/fi.lproj/Localizable.strings index 6b12b2bda..d1872ccf3 100644 --- a/Signal/translations/fi.lproj/Localizable.strings +++ b/Signal/translations/fi.lproj/Localizable.strings @@ -928,7 +928,7 @@ "VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Vahvistuskoodi"; /* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIAVOICE" = "Soita minulle mielummin"; +"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Soita minulle mielummin"; /* button text during registration to request another SMS code be sent */ "VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Pyydä koodia uudelleen"; diff --git a/Signal/translations/fil.lproj/Localizable.strings b/Signal/translations/fil.lproj/Localizable.strings index 90c518ef0..3ce3b5237 100644 --- a/Signal/translations/fil.lproj/Localizable.strings +++ b/Signal/translations/fil.lproj/Localizable.strings @@ -928,7 +928,7 @@ "VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Verification Code"; /* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIAVOICE" = "Call Me Instead"; +"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Call Me Instead"; /* button text during registration to request another SMS code be sent */ "VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Request Code Again"; diff --git a/Signal/translations/fr.lproj/Localizable.strings b/Signal/translations/fr.lproj/Localizable.strings index c83ab889c..9111ef30e 100644 --- a/Signal/translations/fr.lproj/Localizable.strings +++ b/Signal/translations/fr.lproj/Localizable.strings @@ -928,7 +928,7 @@ "VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Code de vérification"; /* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIAVOICE" = "Appelez-moi plutôt"; +"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Appelez-moi plutôt"; /* button text during registration to request another SMS code be sent */ "VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Redemander un code"; diff --git a/Signal/translations/gl.lproj/Localizable.strings b/Signal/translations/gl.lproj/Localizable.strings index adea8ebe8..eac6e9330 100644 --- a/Signal/translations/gl.lproj/Localizable.strings +++ b/Signal/translations/gl.lproj/Localizable.strings @@ -928,7 +928,7 @@ "VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Código de verificación"; /* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIAVOICE" = "Chámame"; +"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Chámame"; /* button text during registration to request another SMS code be sent */ "VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Volver solicitar o código"; diff --git a/Signal/translations/hr.lproj/Localizable.strings b/Signal/translations/hr.lproj/Localizable.strings index 044106fdf..6fd49397d 100644 --- a/Signal/translations/hr.lproj/Localizable.strings +++ b/Signal/translations/hr.lproj/Localizable.strings @@ -928,7 +928,7 @@ "VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Verifikacijski kôd"; /* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIAVOICE" = "Potvrdi pozivom"; +"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Potvrdi pozivom"; /* button text during registration to request another SMS code be sent */ "VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Ponovo zatraži kôd"; diff --git a/Signal/translations/hu.lproj/Localizable.strings b/Signal/translations/hu.lproj/Localizable.strings index b606c208a..95349f822 100644 --- a/Signal/translations/hu.lproj/Localizable.strings +++ b/Signal/translations/hu.lproj/Localizable.strings @@ -928,7 +928,7 @@ "VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Hitelesítő kód küldése"; /* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIAVOICE" = "Inkább hívj"; +"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Inkább hívj"; /* button text during registration to request another SMS code be sent */ "VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Kód újrakérése"; diff --git a/Signal/translations/id.lproj/Localizable.strings b/Signal/translations/id.lproj/Localizable.strings index 35e607138..e2209dc4a 100644 --- a/Signal/translations/id.lproj/Localizable.strings +++ b/Signal/translations/id.lproj/Localizable.strings @@ -928,7 +928,7 @@ "VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Kode Verifikasi"; /* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIAVOICE" = "Telefon saya saja"; +"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Telefon saya saja"; /* button text during registration to request another SMS code be sent */ "VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Meminta Kode Lagi"; diff --git a/Signal/translations/it_IT.lproj/Localizable.strings b/Signal/translations/it_IT.lproj/Localizable.strings index 0628e9d3f..c9ab8c771 100644 --- a/Signal/translations/it_IT.lproj/Localizable.strings +++ b/Signal/translations/it_IT.lproj/Localizable.strings @@ -928,7 +928,7 @@ "VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Codice di verifica"; /* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIAVOICE" = "Oppure chiamami"; +"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Oppure chiamami"; /* button text during registration to request another SMS code be sent */ "VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Richiedi un nuovo codice"; diff --git a/Signal/translations/ja_JP.lproj/Localizable.strings b/Signal/translations/ja_JP.lproj/Localizable.strings index c9a97f44c..b480ec553 100644 --- a/Signal/translations/ja_JP.lproj/Localizable.strings +++ b/Signal/translations/ja_JP.lproj/Localizable.strings @@ -928,7 +928,7 @@ "VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "認証コード"; /* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIAVOICE" = "電話で行う"; +"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "電話で行う"; /* button text during registration to request another SMS code be sent */ "VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "コードを再発行する"; diff --git a/Signal/translations/ko_KR.lproj/Localizable.strings b/Signal/translations/ko_KR.lproj/Localizable.strings index 810cb635e..bfe89beb2 100644 --- a/Signal/translations/ko_KR.lproj/Localizable.strings +++ b/Signal/translations/ko_KR.lproj/Localizable.strings @@ -928,7 +928,7 @@ "VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "확인 코드"; /* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIAVOICE" = "대신 전화 해주세요"; +"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "대신 전화 해주세요"; /* button text during registration to request another SMS code be sent */ "VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "코드 다시 요청하기"; diff --git a/Signal/translations/lv.lproj/Localizable.strings b/Signal/translations/lv.lproj/Localizable.strings index b7d98a536..be27e57bc 100644 --- a/Signal/translations/lv.lproj/Localizable.strings +++ b/Signal/translations/lv.lproj/Localizable.strings @@ -928,7 +928,7 @@ "VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Pārbaudes kods"; /* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIAVOICE" = "Piezvani man!"; +"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Piezvani man!"; /* button text during registration to request another SMS code be sent */ "VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Pieprasīt kodu vēlreiz"; diff --git a/Signal/translations/mk.lproj/Localizable.strings b/Signal/translations/mk.lproj/Localizable.strings index 8665efc89..e69e607b0 100644 --- a/Signal/translations/mk.lproj/Localizable.strings +++ b/Signal/translations/mk.lproj/Localizable.strings @@ -928,7 +928,7 @@ "VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Код за потврда"; /* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIAVOICE" = "Наместо тоа јави ми се"; +"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Наместо тоа јави ми се"; /* button text during registration to request another SMS code be sent */ "VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Повторно побарај код"; diff --git a/Signal/translations/nb_NO.lproj/Localizable.strings b/Signal/translations/nb_NO.lproj/Localizable.strings index 44218555a..9a055b845 100644 --- a/Signal/translations/nb_NO.lproj/Localizable.strings +++ b/Signal/translations/nb_NO.lproj/Localizable.strings @@ -928,7 +928,7 @@ "VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Verifikasjonskode"; /* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIAVOICE" = "Ring meg istedenfor"; +"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Ring meg istedenfor"; /* button text during registration to request another SMS code be sent */ "VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Be om kode på nytt"; diff --git a/Signal/translations/nl.lproj/Localizable.strings b/Signal/translations/nl.lproj/Localizable.strings index 765b5c5eb..3eb1af0f1 100644 --- a/Signal/translations/nl.lproj/Localizable.strings +++ b/Signal/translations/nl.lproj/Localizable.strings @@ -928,7 +928,7 @@ "VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Verificatiecode"; /* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIAVOICE" = "Bel mij"; +"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Bel mij"; /* button text during registration to request another SMS code be sent */ "VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Code opnieuw aanvragen"; diff --git a/Signal/translations/pl.lproj/Localizable.strings b/Signal/translations/pl.lproj/Localizable.strings index 6ce8fbd4c..236448ede 100644 --- a/Signal/translations/pl.lproj/Localizable.strings +++ b/Signal/translations/pl.lproj/Localizable.strings @@ -928,7 +928,7 @@ "VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Kod weryfikacyjny"; /* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIAVOICE" = "Zadzwoń do mnie"; +"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Zadzwoń do mnie"; /* button text during registration to request another SMS code be sent */ "VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Pobierz kod ponownie"; diff --git a/Signal/translations/pt_BR.lproj/Localizable.strings b/Signal/translations/pt_BR.lproj/Localizable.strings index da86030d5..2c614ac41 100644 --- a/Signal/translations/pt_BR.lproj/Localizable.strings +++ b/Signal/translations/pt_BR.lproj/Localizable.strings @@ -928,7 +928,7 @@ "VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Código de Verificação"; /* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIAVOICE" = "Ligue-me então"; +"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Ligue-me então"; /* button text during registration to request another SMS code be sent */ "VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Requisitar Código Novamente"; diff --git a/Signal/translations/pt_PT.lproj/Localizable.strings b/Signal/translations/pt_PT.lproj/Localizable.strings index bbe608212..578defcea 100644 --- a/Signal/translations/pt_PT.lproj/Localizable.strings +++ b/Signal/translations/pt_PT.lproj/Localizable.strings @@ -928,7 +928,7 @@ "VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Código de Verificação"; /* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIAVOICE" = "Verificar por Chamada"; +"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Verificar por Chamada"; /* button text during registration to request another SMS code be sent */ "VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Pedir Código Novamente"; diff --git a/Signal/translations/ro.lproj/Localizable.strings b/Signal/translations/ro.lproj/Localizable.strings index 5eae27dc0..0d1a3f46b 100644 --- a/Signal/translations/ro.lproj/Localizable.strings +++ b/Signal/translations/ro.lproj/Localizable.strings @@ -928,7 +928,7 @@ "VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Cod de Verificare"; /* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIAVOICE" = "Mai bine Sună-mă"; +"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Mai bine Sună-mă"; /* button text during registration to request another SMS code be sent */ "VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Solicită codul din nou"; diff --git a/Signal/translations/ru.lproj/Localizable.strings b/Signal/translations/ru.lproj/Localizable.strings index 856576986..bb0d744d7 100644 --- a/Signal/translations/ru.lproj/Localizable.strings +++ b/Signal/translations/ru.lproj/Localizable.strings @@ -928,7 +928,7 @@ "VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Код подтверждения"; /* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIAVOICE" = "Лучше позвоните мне"; +"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Лучше позвоните мне"; /* button text during registration to request another SMS code be sent */ "VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Запросить код заново"; diff --git a/Signal/translations/sl.lproj/Localizable.strings b/Signal/translations/sl.lproj/Localizable.strings index 98a8671dc..8975cbc92 100644 --- a/Signal/translations/sl.lproj/Localizable.strings +++ b/Signal/translations/sl.lproj/Localizable.strings @@ -928,7 +928,7 @@ "VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Verifikacijska koda"; /* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIAVOICE" = "Raje me pokličite"; +"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Raje me pokličite"; /* button text during registration to request another SMS code be sent */ "VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Ponovno zahtevajte kodo"; diff --git a/Signal/translations/sn.lproj/Localizable.strings b/Signal/translations/sn.lproj/Localizable.strings index 10ad191fe..bfffc14c7 100644 --- a/Signal/translations/sn.lproj/Localizable.strings +++ b/Signal/translations/sn.lproj/Localizable.strings @@ -928,7 +928,7 @@ "VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Murau wekuongorora kururama"; /* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIAVOICE" = "Ndifonere ini panzvimbo"; +"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Ndifonere ini panzvimbo"; /* button text during registration to request another SMS code be sent */ "VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Kumbira murau zvakare "; diff --git a/Signal/translations/sq.lproj/Localizable.strings b/Signal/translations/sq.lproj/Localizable.strings index 38de28755..279160901 100644 --- a/Signal/translations/sq.lproj/Localizable.strings +++ b/Signal/translations/sq.lproj/Localizable.strings @@ -928,7 +928,7 @@ "VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Verifiko Kodin"; /* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIAVOICE" = "Bëj thirrje"; +"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Bëj thirrje"; /* button text during registration to request another SMS code be sent */ "VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Kërko Kod Sërish"; diff --git a/Signal/translations/sv_SE.lproj/Localizable.strings b/Signal/translations/sv_SE.lproj/Localizable.strings index 5bb5f926c..57568d525 100644 --- a/Signal/translations/sv_SE.lproj/Localizable.strings +++ b/Signal/translations/sv_SE.lproj/Localizable.strings @@ -928,7 +928,7 @@ "VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Verifieringskod"; /* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIAVOICE" = "Ring mig istället"; +"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Ring mig istället"; /* button text during registration to request another SMS code be sent */ "VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Begär ny kod"; diff --git a/Signal/translations/th_TH.lproj/Localizable.strings b/Signal/translations/th_TH.lproj/Localizable.strings index 8f6e15b66..8250bb343 100644 --- a/Signal/translations/th_TH.lproj/Localizable.strings +++ b/Signal/translations/th_TH.lproj/Localizable.strings @@ -928,7 +928,7 @@ "VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "รหัสตรวจสอบ"; /* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIAVOICE" = "โทรหาฉันแทน"; +"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "โทรหาฉันแทน"; /* button text during registration to request another SMS code be sent */ "VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "ขอรหัสอีกครั้ง"; diff --git a/Signal/translations/tr_TR.lproj/Localizable.strings b/Signal/translations/tr_TR.lproj/Localizable.strings index 0b907a002..c2e9eebdd 100644 --- a/Signal/translations/tr_TR.lproj/Localizable.strings +++ b/Signal/translations/tr_TR.lproj/Localizable.strings @@ -928,7 +928,7 @@ "VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Doğrulama Kodu"; /* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIAVOICE" = "Onun yerine beni ara"; +"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Onun yerine beni ara"; /* button text during registration to request another SMS code be sent */ "VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Doğrulama Kodunu Tekrar İste"; diff --git a/Signal/translations/zh_CN.lproj/Localizable.strings b/Signal/translations/zh_CN.lproj/Localizable.strings index 439033d32..75d406540 100644 --- a/Signal/translations/zh_CN.lproj/Localizable.strings +++ b/Signal/translations/zh_CN.lproj/Localizable.strings @@ -928,7 +928,7 @@ "VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "验证码"; /* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIAVOICE" = "通过电话呼叫我以获取验证码"; +"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "通过电话呼叫我以获取验证码"; /* button text during registration to request another SMS code be sent */ "VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "重新获取验证码";