pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[ios] Updated downloader/onboarding/migration strings.

Browse source
This commit is contained in:
Ilya Grechuhin 2016-03-15 10:55:17 +03:00 • committed by Sergey Yershov
parent 1822bc4ca6
commit e5eea122a8
15 changed files with 58 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h
View file

@ -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;

4
iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm
View file

@ -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

2
iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h
View file

@ -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;

4
iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm
View file

@ -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

2
iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.h
View file

@ -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

22
iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm
View file

@ -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];

8
iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.xib
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15A284" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment version="2048" identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
</dependencies>
<customFonts key="customFonts">
<mutableArray key="HelveticaNeue.ttc">
@ -20,8 +20,8 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ogu-AE-Ohh" userLabel="ContainerView">
<rect key="frame" x="20" y="215" width="280" height="138"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Title" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="S3s-j7-v6E" userLabel="Title">
<rect key="frame" x="20" y="20.5" width="240" height="21.5"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Title" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="S3s-j7-v6E" userLabel="Title">
<rect key="frame" x="20" y="21" width="240" height="21"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="uht-Xi-vWk"/>
<constraint firstAttribute="width" constant="240" id="wsn-Cq-kJT"/>

12
iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMFirstLaunchController.mm
View file

@ -62,8 +62,8 @@ NSArray<TMWMWelcomeConfigBlock> * pagesConfigBlocks = @[
[^(MWMFirstLaunchController * controller)
{
controller.image.image = [UIImage imageNamed:@"img_onboarding_offline_maps"];
controller.alertTitle.text = L(@"first_launch_welcome_title");
controller.alertText.text = L(@"first_launch_welcome_text");
controller.alertTitle.text = L(@"onboarding_offline_maps_title");
controller.alertText.text = L(@"onboarding_offline_maps_message");
[controller.nextPageButton setTitle:L(@"whats_new_next_button") forState:UIControlStateNormal];
[controller.nextPageButton addTarget:controller.pageController
action:@selector(nextPage)
@ -72,8 +72,8 @@ NSArray<TMWMWelcomeConfigBlock> * pagesConfigBlocks = @[
[^(MWMFirstLaunchController * controller)
{
controller.image.image = [UIImage imageNamed:@"img_onboarding_geoposition"];
controller.alertTitle.text = L(@"first_launch_need_location_title");
controller.alertText.text = L(@"first_launch_need_location_text");
controller.alertTitle.text = L(@"onboarding_location_title");
controller.alertText.text = L(@"onboarding_location_message");
[controller.nextPageButton setTitle:L(@"whats_new_next_button") forState:UIControlStateNormal];
[controller.nextPageButton addTarget:controller.pageController
action:@selector(nextPage)
@ -82,8 +82,8 @@ NSArray<TMWMWelcomeConfigBlock> * pagesConfigBlocks = @[
[^(MWMFirstLaunchController * controller)
{
controller.image.image = [UIImage imageNamed:@"img_onboarding_notification"];
controller.alertTitle.text = L(@"first_launch_need_push_title");
controller.alertText.text = L(@"first_launch_need_push_text");
controller.alertTitle.text = L(@"onboarding_notifications_title");
controller.alertText.text = L(@"onboarding_notifications_message");
[controller.nextPageButton setTitle:L(@"whats_new_next_button") forState:UIControlStateNormal];
[controller.nextPageButton addTarget:controller.pageController
action:@selector(nextPage)

4
iphone/Maps/Classes/MapDownloader/DataSources/MWMMapDownloaderDefaultDataSource.mm
View file

@ -176,9 +176,9 @@ using namespace storage;
NodeAttrs nodeAttrs;
GetFramework().Storage().GetNodeAttrs(m_parentId, nodeAttrs);
if (nodeAttrs.m_localMwmSize == 0)
return [NSString stringWithFormat:@"%@", L(@"downloader_downloaded")];
return [NSString stringWithFormat:@"%@", L(@"downloader_dowloaded_subtitle")];
else
return [NSString stringWithFormat:@"%@ (%@)", L(@"downloader_downloaded"), formattedSize(nodeAttrs.m_localMwmSize)];
return [NSString stringWithFormat:@"%@ (%@)", L(@"downloader_dowloaded_subtitle"), formattedSize(nodeAttrs.m_localMwmSize)];
}
return self.indexes[section - self.countrySectionsShift];
}

2
iphone/Maps/Classes/MapDownloader/DataSources/MWMMapDownloaderExtendedDataSource.mm
View file

@ -104,7 +104,7 @@ using namespace storage;
- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section
{
if (section == self.closestCountriesSection)
return L(@"search_mode_nearme");
return L(@"downloader_near_me_subtitle");
return [super tableView:tableView titleForHeaderInSection:section - self.closestCountriesSectionShift];
}

2
iphone/Maps/Classes/MapDownloader/MWMMapDownloaderViewController.mm
View file

@ -39,7 +39,7 @@ using namespace storage;
- (void)viewDidLoad
{
[super viewDidLoad];
self.searchBar.placeholder = L(@"search_downloaded_maps");
self.searchBar.placeholder = L(@"downloader_search_field_hint");
[self setupSearchParams];
}

4
iphone/Maps/Classes/Migration/MWMMigrationView.mm
View file

@ -118,7 +118,7 @@
break;
case MWMMigrationViewState::Processing:
self.info.hidden = NO;
self.info.text = L(@"migration_preparing_update");
self.info.text = L(@"migration_prefetch_status");
[self startSpinner];
self.primaryButton.enabled = NO;
self.primaryButton.hidden = YES;
@ -134,7 +134,7 @@
case MWMMigrationViewState::ErrorNoSpace:
self.info.hidden = NO;
self.info.textColor = [UIColor red];
self.info.text = L(@"migration_no_space");
self.info.text = L(@"migration_no_space_message");
self.primaryButton.enabled = NO;
self.secondaryButton.enabled = NO;
break;

10
iphone/Maps/Classes/Migration/MWMMigrationViewController.mm
View file

@ -108,12 +108,17 @@ using namespace storage;
{
[self setState:MWMMigrationViewState::Default];
MWMAlertViewController * avc = self.alertController;
auto const retryBlock = ^
{
GetFramework().Storage().GetPrefetchStorage()->RetryDownloadNode(self->m_countryId);
};
switch (errorCode)
{
case NodeErrorCode::NoError:
break;
case NodeErrorCode::UnknownError:
[Statistics logEvent:kStatDownloaderMigrationError withParameters:@{kStatType : kStatUnknownError}];
[avc presentDownloaderInternalErrorAlertWithOkBlock:retryBlock];
[avc presentInternalErrorAlert];
break;
case NodeErrorCode::OutOfMemFailed:
@ -122,10 +127,7 @@ using namespace storage;
break;
case NodeErrorCode::NoInetConnection:
[Statistics logEvent:kStatDownloaderMigrationError withParameters:@{kStatType : kStatNoConnection}];
[avc presentDownloaderNoConnectionAlertWithOkBlock:^
{
GetFramework().Storage().GetPrefetchStorage()->RetryDownloadNode(self->m_countryId);
}];
[avc presentDownloaderNoConnectionAlertWithOkBlock:retryBlock];
break;
}
}

25
iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm
View file

@ -178,28 +178,29 @@ using namespace storage;
self.nodeSize.text = L(@"country_status_download_failed");
self.progress.state = MWMCircularProgressStateFailed;
MWMAlertViewController * avc = self.controller.alertController;
auto const retryBlock = ^
{
[Statistics logEvent:kStatDownloaderMapAction
withParameters:@{
kStatAction : kStatRetry,
kStatIsAuto : kStatNo,
kStatFrom : kStatMap,
kStatScenario : kStatDownload
}];
[MWMStorage retryDownloadNode:self->m_countryId];
};
switch (errorCode)
{
case NodeErrorCode::NoError:
break;
case NodeErrorCode::UnknownError:
[avc presentInternalErrorAlert];
[avc presentDownloaderInternalErrorAlertWithOkBlock:retryBlock];
break;
case NodeErrorCode::OutOfMemFailed:
[avc presentDownloaderNotEnoughSpaceAlert];
break;
case NodeErrorCode::NoInetConnection:
[avc presentDownloaderNoConnectionAlertWithOkBlock:^
{
[Statistics logEvent:kStatDownloaderMapAction
withParameters:@{
kStatAction : kStatRetry,
kStatIsAuto : kStatNo,
kStatFrom : kStatMap,
kStatScenario : kStatDownload
}];
[MWMStorage retryDownloadNode:self->m_countryId];
}];
[avc presentDownloaderNoConnectionAlertWithOkBlock:retryBlock];
break;
}
}

12
iphone/Maps/Mapsme.storyboard
View file

@ -92,7 +92,7 @@
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium17"/>
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="downloader_update_all"/>
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="downloader_update_all_button"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="allMapsAction" destination="eCI-mf-eCv" eventType="touchUpInside" id="slj-0v-XS7"/>
@ -240,7 +240,7 @@
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium17"/>
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="download_all"/>
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="downloader_download_all_button"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="allMapsAction" destination="cIk-gU-IeI" eventType="touchUpInside" id="BFl-NK-h9n"/>
@ -431,7 +431,7 @@
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
<integer key="value" value="8"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="update_all_maps"/>
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="migration_update_all_button"/>
<userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="whiteColor"/>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="linkBlueDark"/>
@ -454,7 +454,7 @@
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="Скачать текущую и удалить все старые карты"/>
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="migration_delete_all_download_current_button"/>
<userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="buttonEnabledBlueText"/>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="clearColor"/>
</userDefinedRuntimeAttributes>
@ -2822,9 +2822,9 @@ the world. Join us!</string>
<image name="separator_image" width="1" height="1"/>
</resources>
<inferredMetricsTieBreakers>
<segue reference="yAJ-jH-Dus"/>
<segue reference="OEF-kR-jKi"/>
<segue reference="Z0Z-aU-Vrq"/>
<segue reference="yAJ-jH-Dus"/>
<segue reference="mF7-g4-gSS"/>
<segue reference="w48-2Y-VXA"/>
</inferredMetricsTieBreakers>
</document>