diff --git a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h index 930c8dbbfe..bde1e69c59 100644 --- a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h +++ b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h @@ -30,7 +30,7 @@ - (void)presentDisableAutoDownloadAlertWithOkBlock:(nonnull TMWMVoidBlock)okBlock; - (void)presentDownloaderNoConnectionAlertWithOkBlock:(nonnull TMWMVoidBlock)okBlock; - (void)presentDownloaderNotEnoughSpaceAlert; -- (void)presentDownloaderInternalErrorAlertForMap:(nonnull NSString *)name okBlock:(nonnull TMWMVoidBlock)okBlock; +- (void)presentDownloaderInternalErrorAlertWithOkBlock:(nonnull TMWMVoidBlock)okBlock; - (void)presentDownloaderNeedUpdateAlertWithOkBlock:(nonnull TMWMVoidBlock)okBlock; - (void)presentEditorViralAlertWithShareBlock:(nonnull TMWMVoidBlock)share; - (void)closeAlertWithCompletion:(nullable TMWMVoidBlock)completion; diff --git a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm index 83fd8c7205..4cd3bda69f 100644 --- a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm +++ b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm @@ -168,9 +168,9 @@ static NSString * const kAlertControllerNibIdentifier = @"MWMAlertViewController [self displayAlert:[MWMAlert downloaderNotEnoughSpaceAlert]]; } -- (void)presentDownloaderInternalErrorAlertForMap:(nonnull NSString *)name okBlock:(nonnull TMWMVoidBlock)okBlock +- (void)presentDownloaderInternalErrorAlertWithOkBlock:(nonnull TMWMVoidBlock)okBlock { - [self displayAlert:[MWMAlert downloaderInternalErrorAlertForMap:name okBlock:okBlock]]; + [self displayAlert:[MWMAlert downloaderInternalErrorAlertWithOkBlock:okBlock]]; } - (void)presentDownloaderNeedUpdateAlertWithOkBlock:(nonnull TMWMVoidBlock)okBlock diff --git a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h index 33701b4315..7a699080b1 100644 --- a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h +++ b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h @@ -27,7 +27,7 @@ + (MWMAlert *)disableAutoDownloadAlertWithOkBlock:(TMWMVoidBlock)okBlock; + (MWMAlert *)downloaderNoConnectionAlertWithOkBlock:(TMWMVoidBlock)okBlock; + (MWMAlert *)downloaderNotEnoughSpaceAlert; -+ (MWMAlert *)downloaderInternalErrorAlertForMap:(NSString *)name okBlock:(TMWMVoidBlock)okBlock; ++ (MWMAlert *)downloaderInternalErrorAlertWithOkBlock:(TMWMVoidBlock)okBlock; + (MWMAlert *)downloaderNeedUpdateAlertWithOkBlock:(TMWMVoidBlock)okBlock; + (MWMAlert *)editorViralAlertWithShareBlock:(TMWMVoidBlock)share; - (void)close; diff --git a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm index 876b7fbb2f..a936623204 100644 --- a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm @@ -131,9 +131,9 @@ return [MWMDefaultAlert downloaderNotEnoughSpaceAlert]; } -+ (MWMAlert *)downloaderInternalErrorAlertForMap:(NSString *)name okBlock:(TMWMVoidBlock)okBlock ++ (MWMAlert *)downloaderInternalErrorAlertWithOkBlock:(TMWMVoidBlock)okBlock { - return [MWMDefaultAlert downloaderInternalErrorAlertForMap:name okBlock:okBlock]; + return [MWMDefaultAlert downloaderInternalErrorAlertWithOkBlock:okBlock]; } + (MWMAlert *)downloaderNeedUpdateAlertWithOkBlock:(TMWMVoidBlock)okBlock diff --git a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.h b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.h index d292c31808..89e458c0b9 100644 --- a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.h +++ b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.h @@ -21,7 +21,7 @@ + (instancetype)disableAutoDownloadAlertWithOkBlock:(TMWMVoidBlock)okBlock; + (instancetype)downloaderNoConnectionAlertWithOkBlock:(TMWMVoidBlock)okBlock; + (instancetype)downloaderNotEnoughSpaceAlert; -+ (instancetype)downloaderInternalErrorAlertForMap:(NSString *)name okBlock:(TMWMVoidBlock)okBlock; ++ (instancetype)downloaderInternalErrorAlertWithOkBlock:(TMWMVoidBlock)okBlock; + (instancetype)downloaderNeedUpdateAlertWithOkBlock:(TMWMVoidBlock)okBlock; @end diff --git a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm index 46937ce12f..be2130aea8 100644 --- a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm @@ -65,7 +65,7 @@ static NSString * const kDefaultAlertNibName = @"MWMDefaultAlert"; + (instancetype)noConnectionAlert { kStatisticsEvent = @"No Connection Alert"; - MWMDefaultAlert * alert = [self defaultAlertWithTitle:@"no_internet_connection_detected" + MWMDefaultAlert * alert = [self defaultAlertWithTitle:@"common_check_internet_connection_dialog" message:nil rightButtonTitle:@"ok" leftButtonTitle:nil @@ -77,8 +77,8 @@ static NSString * const kDefaultAlertNibName = @"MWMDefaultAlert"; + (instancetype)unsavedEditsAlertWithOkBlock:(TMWMVoidBlock)okBlock { kStatisticsEvent = @"Editor unsaved changes on delete"; - return [self defaultAlertWithTitle:@"editor_unsavde_changes" - message:nil + return [self defaultAlertWithTitle:@"please_note" + message:@"downloader_delete_map_dialog" rightButtonTitle:@"delete" leftButtonTitle:nil rightButtonAction:okBlock]; @@ -87,7 +87,7 @@ static NSString * const kDefaultAlertNibName = @"MWMDefaultAlert"; + (instancetype)noWiFiAlertWithName:(NSString *)name okBlock:(TMWMVoidBlock)okBlock { kStatisticsEvent = @"No WiFi Alert"; - NSString * title = [NSString stringWithFormat:L(@"no_wifi_ask_cellular_download"), name]; + NSString * title = [NSString stringWithFormat:L(@"common_no_wifi_dialog"), name]; MWMDefaultAlert * alert = [self defaultAlertWithTitle:title message:nil rightButtonTitle:@"use_cellular_data" @@ -170,7 +170,7 @@ static NSString * const kDefaultAlertNibName = @"MWMDefaultAlert"; { kStatisticsEvent = @"No Current Position Alert"; NSString * message = - [NSString stringWithFormat:@"%@\n\n%@", L(@"dialog_routing_error_location_not_found"), + [NSString stringWithFormat:@"%@\n\n%@", L(@"common_current_location_unknown_dialog"), L(@"dialog_routing_location_turn_wifi")]; return [self defaultAlertWithTitle:@"dialog_routing_check_gps" message:message @@ -249,8 +249,8 @@ static NSString * const kDefaultAlertNibName = @"MWMDefaultAlert"; + (instancetype)downloaderNotEnoughSpaceAlert { kStatisticsEvent = @"Downloader Not Enough Space Alert"; - MWMDefaultAlert * alert = [self defaultAlertWithTitle:@"downloader_error" - message:@"downloader_not_enough_space" + MWMDefaultAlert * alert = [self defaultAlertWithTitle:@"downloader_no_space_title" + message:@"downloader_no_space_message" rightButtonTitle:@"close" leftButtonTitle:nil rightButtonAction:nil]; @@ -258,13 +258,11 @@ static NSString * const kDefaultAlertNibName = @"MWMDefaultAlert"; return alert; } -+ (instancetype)downloaderInternalErrorAlertForMap:(NSString *)name okBlock:(TMWMVoidBlock)okBlock ++ (instancetype)downloaderInternalErrorAlertWithOkBlock:(TMWMVoidBlock)okBlock { kStatisticsEvent = @"Downloader Internal Error Alert"; - NSString * message = - [NSString stringWithFormat:@"%@%@", L(@"downloader_internal_error_for_map"), name]; - MWMDefaultAlert * alert = [self defaultAlertWithTitle:@"downloader_error" - message:message + MWMDefaultAlert * alert = [self defaultAlertWithTitle:@"migration_download_error_dialog" + message:nil rightButtonTitle:@"downloader_retry" leftButtonTitle:@"cancel" rightButtonAction:okBlock]; diff --git a/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.xib b/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.xib index f2df92af35..e0016e313c 100644 --- a/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.xib @@ -1,8 +1,8 @@ - + - + @@ -20,8 +20,8 @@ -