From 7acde8155df636e4961fddd815908ff2315d1f5c Mon Sep 17 00:00:00 2001 From: Brieuc Viel Date: Tue, 13 Sep 2016 14:05:14 +0200 Subject: [PATCH] Assistant updated wit hnew texts and organization --- Classes/AssistantView.m | 19 +- Classes/Base.lproj/AssistantViewScreens.xib | 533 ++++++++------------ 2 files changed, 228 insertions(+), 324 deletions(-) diff --git a/Classes/AssistantView.m b/Classes/AssistantView.m index c93ba0538..99f44058c 100644 --- a/Classes/AssistantView.m +++ b/Classes/AssistantView.m @@ -699,7 +699,9 @@ static UICompositeViewDescription *compositeDescription = nil; return NSLocalizedString(@"This account is not activated yet.", nil); if IS(ERROR_ALIAS_ALREADY_IN_USE) - return NSLocalizedString(@"This alias is already used.", nil); + return NSLocalizedString(@"This phone number is already used. Please type a different number. \nYou can delete " + @"your existing account if you want to reuse your phone number.", + nil); if IS(ERROR_ALIAS_DOESNT_EXIST) return NSLocalizedString(@"This alias does not exist.", nil); @@ -711,7 +713,7 @@ static UICompositeViewDescription *compositeDescription = nil; return NSLocalizedString(@"This email does not exist.", nil); if IS(ERROR_KEY_DOESNT_MATCH) - return NSLocalizedString(@"The confirmation code is invalid.", nil); + return NSLocalizedString(@"The confirmation code is invalid. \nPlease check your SMS and try again.", nil); if IS(ERROR_PASSWORD_DOESNT_MATCH) return NSLocalizedString(@"Passwords do not match.", nil); @@ -1081,11 +1083,14 @@ void assistant_is_account_activated(LinphoneAccountCreator *creator, LinphoneAcc - (IBAction)onPhoneNumberDisclosureClick:(id)sender { UIAlertView *errorView = [[UIAlertView alloc] - initWithTitle:NSLocalizedString(@"What is my phone number for?", nil) - message:NSLocalizedString(@"A SMS code will be sent to your phone number to validate your account.", nil) - delegate:nil - cancelButtonTitle:NSLocalizedString(@"OK", nil) - otherButtonTitles:nil, nil]; + initWithTitle:NSLocalizedString(@"What will my phone number be used for?", nil) + message:NSLocalizedString(@"Thanks to your phone number, your friends will find you more easily. " + @"\nYou will see in your address book who is using Linphone and your " + @"friends will know that they can reach you on Linphone as well.", + nil) + delegate:nil + cancelButtonTitle:NSLocalizedString(@"OK", nil) + otherButtonTitles:nil, nil]; [errorView show]; } diff --git a/Classes/Base.lproj/AssistantViewScreens.xib b/Classes/Base.lproj/AssistantViewScreens.xib index 596f83346..2b45520ba 100644 --- a/Classes/Base.lproj/AssistantViewScreens.xib +++ b/Classes/Base.lproj/AssistantViewScreens.xib @@ -1,12 +1,13 @@ - + - - + + + @@ -32,26 +33,23 @@ - - + @@ -156,52 +151,50 @@ - - - + - - + @@ -996,6 +927,7 @@ Once it is done, come back here and click on the button. + @@ -1004,6 +936,7 @@ Once it is done, come back here and click on the button. + @@ -1017,7 +950,6 @@ Once it is done, come back here and click on the button. - @@ -1026,53 +958,48 @@ Once it is done, come back here and click on the button. - - + - - + - + @@ -1082,31 +1009,28 @@ Once it is done, come back here and click on the button. - - + - + @@ -1116,31 +1040,28 @@ Once it is done, come back here and click on the button. - - + - + @@ -1150,25 +1071,22 @@ Once it is done, come back here and click on the button. - @@ -1177,25 +1095,23 @@ Once it is done, come back here and click on the button. - + - - + - + @@ -1204,16 +1120,14 @@ Once it is done, come back here and click on the button. - + @@ -1297,41 +1211,37 @@ Once it is done, come back here and click on the button. - - + - + @@ -1340,16 +1250,14 @@ Once it is done, come back here and click on the button. - + @@ -1400,41 +1308,37 @@ Once it is done, come back here and click on the button. - - + - + @@ -1443,22 +1347,20 @@ Once it is done, come back here and click on the button. - - + - + @@ -1467,22 +1369,20 @@ Once it is done, come back here and click on the button. - - + - + @@ -1491,7 +1391,6 @@ Once it is done, come back here and click on the button. - +