From 050649759d10f1098eef8b66b734043a1b4990da Mon Sep 17 00:00:00 2001 From: vng Date: Mon, 26 Jul 2021 13:48:33 +0300 Subject: [PATCH] [iOS] Fixed using of some localized string constants. Signed-off-by: vng --- .../MWMDownloadTransitMapAlert.mm | 13 ++++++------- .../Maps/UI/Editor/MWMEditorAdditionalNamesHeader.m | 3 +-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm index f5363a99c6..e81e19b7cf 100644 --- a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm @@ -4,7 +4,6 @@ #import "MWMDownloaderDialogHeader.h" #import "MWMStorage+UI.h" #import "SwiftBridge.h" -#import "UILabel+RuntimeAttributes.h" #include @@ -66,16 +65,16 @@ CGFloat const kAnimationDuration = .05; case routing::RouterResultCode::InconsistentMWMandRoute: case routing::RouterResultCode::RouteNotFound: case routing::RouterResultCode::RouteFileNotExist: - alert.titleLabel.localizedText = @"dialog_routing_download_files"; - alert.messageLabel.localizedText = @"dialog_routing_download_and_update_all"; + alert.titleLabel.text = L(@"dialog_routing_download_files"); + alert.messageLabel.text = L(@"dialog_routing_download_and_update_all"); break; case routing::RouterResultCode::FileTooOld: - alert.titleLabel.localizedText = @"dialog_routing_download_files"; - alert.messageLabel.localizedText = @"dialog_routing_download_and_update_maps"; + alert.titleLabel.text = L(@"dialog_routing_download_files"); + alert.messageLabel.text = L(@"dialog_routing_download_and_update_maps"); break; case routing::RouterResultCode::NeedMoreMaps: - alert.titleLabel.localizedText = @"dialog_routing_download_and_build_cross_route"; - alert.messageLabel.localizedText = @"dialog_routing_download_cross_route"; + alert.titleLabel.text = L(@"dialog_routing_download_and_build_cross_route"); + alert.messageLabel.text = L(@"dialog_routing_download_cross_route"); break; default: NSAssert(false, @"Incorrect code!"); diff --git a/iphone/Maps/UI/Editor/MWMEditorAdditionalNamesHeader.m b/iphone/Maps/UI/Editor/MWMEditorAdditionalNamesHeader.m index 542d660137..6923db703d 100644 --- a/iphone/Maps/UI/Editor/MWMEditorAdditionalNamesHeader.m +++ b/iphone/Maps/UI/Editor/MWMEditorAdditionalNamesHeader.m @@ -1,6 +1,5 @@ #import "MWMButton.h" #import "MWMEditorAdditionalNamesHeader.h" -#import "UILabel+RuntimeAttributes.h" @interface MWMEditorAdditionalNamesHeader () @@ -16,7 +15,7 @@ { MWMEditorAdditionalNamesHeader * h = [NSBundle.mainBundle loadNibNamed:[self className] owner:nil options:nil].firstObject; - h.label.localizedText = L(@"place_name").uppercaseString; + h.label.text = L(@"place_name").uppercaseString; h.toggleBlock = toggleBlock; return h; }