Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorv.mikhaylenko <v.mikhaylenko@corp.mail.ru>2015-07-11 12:23:54 +0300
committerAlex Zolotarev <alex@maps.me>2015-09-23 02:55:39 +0300
commitb3753db2397a54d3a61bb9d76ec265154ad18145 (patch)
tree392fe494f1d1c73f5c7a7cd9330a99e996f0bb43 /iphone/Maps/Classes/CustomAlert
parent5704b2d992130301658ac7636afde14e0ddd7503 (diff)
[ios] Setup correct strings in default dialogs.
Diffstat (limited to 'iphone/Maps/Classes/CustomAlert')
-rw-r--r--iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.h1
-rw-r--r--iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm25
2 files changed, 13 insertions, 13 deletions
diff --git a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.h b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.h
index 4767cb5dfb..ed72c045ec 100644
--- a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.h
+++ b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.h
@@ -17,7 +17,6 @@
+ (instancetype)noCurrentPositionAlert;
+ (instancetype)pointsInDifferentMWMAlert;
+ (instancetype)routingDisclaimerAlert;
-+ (instancetype)routeNotExist;
+ (instancetype)disabledLocationAlert;
+ (instancetype)notWiFiAlertWithName:(NSString *)name downloadBlock:(void(^)())block;
+ (instancetype)notConnectionAlert;
diff --git a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm
index d9d9b2a270..2af0ebd239 100644
--- a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm
+++ b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm
@@ -38,7 +38,8 @@ static NSString * const kDefaultAlertNibName = @"MWMDefaultAlert";
+ (instancetype)routeNotFoundAlert
{
- return [self defaultAlertWithTitle:@"route_not_found" message:@"routing_failed_route_not_found" rightButtonTitle:@"ok" leftButtonTitle:nil rightButtonAction:nil];
+ NSString * message = [NSString stringWithFormat:@"%@\n\n%@", L(@"dialog_routing_cant_build_route"), L(@"dialog_routing_change_start_or_end")];
+ return [self defaultAlertWithTitle:@"dialog_routing_unable_locate_route" message:message rightButtonTitle:@"ok" leftButtonTitle:nil rightButtonAction:nil];
}
+ (instancetype)locationServiceNotSupportedAlert
@@ -63,32 +64,32 @@ static NSString * const kDefaultAlertNibName = @"MWMDefaultAlert";
+ (instancetype)endPointNotFoundAlert
{
- return [self defaultAlertWithTitle:@"change_final_point" message:@"routing_failed_dst_point_not_found" rightButtonTitle:@"ok" leftButtonTitle:nil rightButtonAction:nil];
+ NSString * message = [NSString stringWithFormat:@"%@\n\n%@", L(@"dialog_routing_end_not_determined"), L(@"dialog_routing_select_closer_end")];
+ return [self defaultAlertWithTitle:@"dialog_routing_change_end" message:message rightButtonTitle:@"ok" leftButtonTitle:nil rightButtonAction:nil];
}
+ (instancetype)startPointNotFoundAlert
{
- return [self defaultAlertWithTitle:@"change_start_point" message:@"routing_failed_start_point_not_found" rightButtonTitle:@"ok" leftButtonTitle:nil rightButtonAction:nil];
-}
-
-+ (instancetype)routeNotExist
-{
- return [self defaultAlertWithTitle:@"ggg" message:@"route_not_exist" rightButtonTitle:@"ok" leftButtonTitle:nil rightButtonAction:nil];
+ NSString * message = [NSString stringWithFormat:@"%@\n\n%@", L(@"dialog_routing_start_not_determined"), L(@"dialog_routing_select_closer_start")];
+ return [self defaultAlertWithTitle:@"dialog_routing_change_start" message:message rightButtonTitle:@"ok" leftButtonTitle:nil rightButtonAction:nil];
}
+ (instancetype)internalErrorAlert
{
- return [self defaultAlertWithTitle:@"internal_error" message:@"routing_failed_internal_error" rightButtonTitle:@"ok" leftButtonTitle:nil rightButtonAction:nil];
+ NSString * message = [NSString stringWithFormat:@"%@\n\n%@", L(@"dialog_routing_application_error"), L(@"dialog_routing_try_again")];
+ return [self defaultAlertWithTitle:@"dialog_routing_system_errorr" message:message rightButtonTitle:@"ok" leftButtonTitle:nil rightButtonAction:nil];
}
+ (instancetype)noCurrentPositionAlert
{
- return [self defaultAlertWithTitle:@"check_gps" message:@"routing_failed_unknown_my_position" rightButtonTitle:@"OK" leftButtonTitle:nil rightButtonAction:nil];
+ NSString * message = [NSString stringWithFormat:@"%@\n\n%@", L(@"dialog_routing_error_location_not_found"), L(@"dialog_routing_location_turn_wifi")];
+ return [self defaultAlertWithTitle:@"dialog_routing_check_gps" message:message rightButtonTitle:@"OK" leftButtonTitle:nil rightButtonAction:nil];
}
+ (instancetype)routingDisclaimerAlert
{
- return [self defaultAlertWithTitle:@"gggg" message:@"routing_disclaimer" rightButtonTitle:@"ok" leftButtonTitle:nil rightButtonAction:nil];
+ NSString * message = [NSString stringWithFormat:@"%@\n\n%@\n\n%@\n\n%@", L(@"dialog_routing_disclaimer_priority"), L(@"dialog_routing_disclaimer_precision"), L(@"dialog_routing_disclaimer_recommendations"),L(@"dialog_routing_disclaimer_beware")];
+ return [self defaultAlertWithTitle:@"dialog_routing_disclaimer_title" message:message rightButtonTitle:@"ok" leftButtonTitle:nil rightButtonAction:nil];
}
+ (instancetype)disabledLocationAlert
@@ -100,7 +101,7 @@ static NSString * const kDefaultAlertNibName = @"MWMDefaultAlert";
GetFramework().GetLocationState()->SwitchToNextMode();
[[MapsAppDelegate theApp].m_locationManager start:(id<LocationObserver>)manager];
};
- return [MWMDefaultAlert defaultAlertWithTitle:@"turn_on_geolocation" message:@"turn_geolaction_on" rightButtonTitle:@"turn_on" leftButtonTitle:@"not_now" rightButtonAction:action];
+ return [MWMDefaultAlert defaultAlertWithTitle:@"dialog_routing_location_turn_on" message:@"dialog_routing_location_unknown_turn_on" rightButtonTitle:@"turn_on" leftButtonTitle:@"later" rightButtonAction:action];
}
+ (instancetype)pointsInDifferentMWMAlert