From af6cf84918a0712bcca0680cc133b636af58a911 Mon Sep 17 00:00:00 2001
From: VladiMihaylenko <vxmihaylenko@gmail.com>
Date: Tue, 15 Mar 2016 13:21:01 +0300
Subject: [PATCH] [ios] [editor] Editor keys were applied.

---
 .../Classes/Components/MWMAddPlaceNavigationBar.xib    |  4 ++--
 iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.mm | 10 ++++++++++
 .../Maps/Classes/CustomAlert/MWMEditorViralAlert.xib   |  2 +-
 .../Login/MWMAuthorizationLoginViewController.mm       |  4 ++--
 .../BottomMenu/MWMBottomMenuViewController.mm          |  2 +-
 iphone/Maps/Classes/Editor/MWMEditorCategoryCell.xib   |  2 +-
 iphone/Maps/Classes/Editor/MWMEditorViewController.mm  |  2 +-
 .../Editor/MWMObjectsCategorySelectorController.mm     |  8 ++++----
 iphone/Maps/Classes/MWMPlacePageButtonCell.mm          |  2 +-
 iphone/Maps/Classes/MWMReportBaseController.m          |  2 +-
 iphone/Maps/Classes/MWMReportProblemController.mm      |  2 +-
 .../Maps/Classes/MWMReportProblemExtendedController.mm |  5 +++--
 iphone/Maps/Mapsme.storyboard                          |  8 +++++---
 13 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/iphone/Maps/Classes/Components/MWMAddPlaceNavigationBar.xib b/iphone/Maps/Classes/Components/MWMAddPlaceNavigationBar.xib
index cf1053f8a3..936deaa3ef 100644
--- a/iphone/Maps/Classes/Components/MWMAddPlaceNavigationBar.xib
+++ b/iphone/Maps/Classes/Components/MWMAddPlaceNavigationBar.xib
@@ -43,7 +43,7 @@
                             <userDefinedRuntimeAttributes>
                                 <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="whitePrimaryText"/>
                                 <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/>
-                                <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="choose_location"/>
+                                <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="editor_add_select_location"/>
                             </userDefinedRuntimeAttributes>
                         </label>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="JDK-CR-ehC">
@@ -85,7 +85,7 @@
                             <userDefinedRuntimeAttributes>
                                 <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular12"/>
                                 <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
-                                <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="adding_place_description"/>
+                                <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="editor_focus_map_on_location"/>
                             </userDefinedRuntimeAttributes>
                         </label>
                     </subviews>
diff --git a/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.mm b/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.mm
index fc89c52996..ddcc47947f 100644
--- a/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.mm
+++ b/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.mm
@@ -1,5 +1,12 @@
 #import "MWMEditorViralAlert.h"
 
+#include <array>
+
+namespace
+{
+  array<NSString *, 3> const messages {{L(@"editor_done_dialog_1"), L(@"editor_done_dialog_2"), L(@"editor_done_dialog_3")}};
+} // namespace
+
 @interface MWMEditorViralAlert ()
 
 @property (weak, nonatomic) IBOutlet UILabel * message;
@@ -14,6 +21,9 @@
   MWMEditorViralAlert * alert = [[[NSBundle mainBundle] loadNibNamed:[MWMEditorViralAlert className] owner:nil options:nil] firstObject];
   NSAssert(share, @"Share block can't be nil!");
   alert.share = share;
+  int const index = rand() % messages.size();
+  NSString * message = messages[index];
+  alert.message.text = message;
   return alert;
 }
 
diff --git a/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.xib b/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.xib
index b60440df56..5ca0cd9fae 100644
--- a/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.xib
+++ b/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.xib
@@ -31,7 +31,7 @@
                             <nil key="highlightedColor"/>
                             <userDefinedRuntimeAttributes>
                                 <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
-                                <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="thanks"/>
+                                <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="thank_you"/>
                                 <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium17"/>
                             </userDefinedRuntimeAttributes>
                         </label>
diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm
index 8e7c65b1dd..d58c71d81b 100644
--- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm
+++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm
@@ -175,11 +175,11 @@ using namespace osm_auth_ios;
     BOOL const noLocalChanges = (localChanges == 0);
     [self setLocalChangesHidden:noLocalChanges];
     if (!noLocalChanges)
-      self.localChangesLabel.text = [NSString stringWithFormat:@"%@: %@", L(@"not_sent").capitalizedString, @(localChanges)];
+      self.localChangesLabel.text = [NSString stringWithFormat:@"%@: %@", L(@"editor_profile_unsent_changes"), @(localChanges)];
 
     BOOL const noUploadedChanges = (uploadedChanges == 0);
     [self setUploadedChangesDisabled:noUploadedChanges];
-    self.uploadedChangesLabel.text = [NSString stringWithFormat:@"%@: %@", L(@"changes").capitalizedString, @(uploadedChanges)];
+    self.uploadedChangesLabel.text = [NSString stringWithFormat:@"%@: %@", L(@"editor_profile_changes"), @(uploadedChanges)];
     self.lastUploadLabel.hidden = noUploadedChanges;
     if (!noUploadedChanges)
     {
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm
index d259d720fc..9ee11f5f03 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm
@@ -278,7 +278,7 @@ typedef NS_ENUM(NSUInteger, MWMBottomMenuViewCell)
   {
   case MWMBottomMenuViewCellAddPlace:
     [cell configureWithImageName:@"ic_add_place"
-                           label:L(@"add_place")
+                           label:L(@"placepage_add_place_button")
                       badgeCount:0];
     break;
   case MWMBottomMenuViewCellDownload:
diff --git a/iphone/Maps/Classes/Editor/MWMEditorCategoryCell.xib b/iphone/Maps/Classes/Editor/MWMEditorCategoryCell.xib
index 2c6ede85f3..0408c19b8f 100644
--- a/iphone/Maps/Classes/Editor/MWMEditorCategoryCell.xib
+++ b/iphone/Maps/Classes/Editor/MWMEditorCategoryCell.xib
@@ -37,7 +37,7 @@
                         <userDefinedRuntimeAttributes>
                             <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/>
                             <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
-                            <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="editor_category"/>
+                            <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="editor_edit_place_category_title"/>
                         </userDefinedRuntimeAttributes>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="501" verticalHuggingPriority="251" text="Label" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qrd-hP-nIJ">
diff --git a/iphone/Maps/Classes/Editor/MWMEditorViewController.mm b/iphone/Maps/Classes/Editor/MWMEditorViewController.mm
index 21875bb69e..209e7cae9d 100644
--- a/iphone/Maps/Classes/Editor/MWMEditorViewController.mm
+++ b/iphone/Maps/Classes/Editor/MWMEditorViewController.mm
@@ -121,7 +121,7 @@ NSString * reuseIdentifier(MWMPlacePageCellType cellType)
 
 - (void)configNavBar
 {
-  self.title = L(@"edit_place").capitalizedString;
+  self.title = L(self.isCreating ? @"editor_add_place_title" : @"editor_edit_place_title").capitalizedString;
   self.navigationItem.rightBarButtonItem =
       [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemSave
                                                     target:self
diff --git a/iphone/Maps/Classes/Editor/MWMObjectsCategorySelectorController.mm b/iphone/Maps/Classes/Editor/MWMObjectsCategorySelectorController.mm
index 29e3fc91d9..bc883aa144 100644
--- a/iphone/Maps/Classes/Editor/MWMObjectsCategorySelectorController.mm
+++ b/iphone/Maps/Classes/Editor/MWMObjectsCategorySelectorController.mm
@@ -66,13 +66,13 @@ namespace
 
 - (void)configNavBar
 {
-  self.title = L(@"feature_type").capitalizedString;
+  self.title = L(@"editor_add_select_category");
 }
 
 - (void)configSearchBar
 {
   self.searchBar.backgroundImage = [UIImage imageWithColor:[UIColor primary]];
-  self.searchBar.placeholder = L(@"search_in_types");
+  self.searchBar.placeholder = L(@"_search_in_types");
   UITextField * textFiled = [self.searchBar valueForKey:@"searchField"];
   UILabel * placeholder = [textFiled valueForKey:@"_placeholderLabel"];
   placeholder.textColor = [UIColor blackHintText];
@@ -150,8 +150,8 @@ namespace
   if (self.isSearch)
     return nil;
   if (m_categories.m_lastUsed.empty())
-    return L(@"all_categories_header");
-  return section == 0 ? L(@"recent_categories_header") : L(@"all_categories_header");
+    return L(@"editor_add_select_category_all_subtitle");
+  return section == 0 ? L(@"editor_add_select_category_popular_subtitle") : L(@"editor_add_select_category_all_subtitle");
 }
 
 - (vector<Category> const &)dataSourceForSection:(NSInteger)section
diff --git a/iphone/Maps/Classes/MWMPlacePageButtonCell.mm b/iphone/Maps/Classes/MWMPlacePageButtonCell.mm
index 8dcbc4d435..db4c3e6dbc 100644
--- a/iphone/Maps/Classes/MWMPlacePageButtonCell.mm
+++ b/iphone/Maps/Classes/MWMPlacePageButtonCell.mm
@@ -19,7 +19,7 @@
   self.placePage = placePage;
   self.isReport = isReport;
   [self.titleButton setTitleColor:isReport ? [UIColor red] : [UIColor linkBlue] forState:UIControlStateNormal];
-  [self.titleButton setTitle:isReport ? L(@"report_problem") : L(@"edit_place") forState:UIControlStateNormal];
+  [self.titleButton setTitle:isReport ? L(@"placepage_report_problem_button") : L(@"edit_place") forState:UIControlStateNormal];
 }
 
 - (IBAction)buttonTap
diff --git a/iphone/Maps/Classes/MWMReportBaseController.m b/iphone/Maps/Classes/MWMReportBaseController.m
index 4fa1ac02c8..7ed9eaffa8 100644
--- a/iphone/Maps/Classes/MWMReportBaseController.m
+++ b/iphone/Maps/Classes/MWMReportBaseController.m
@@ -4,7 +4,7 @@
 
 - (void)configNavBar
 {
-  self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:L(@"send")
+  self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:L(@"editor_report_problem_send_button")
                                             style:UIBarButtonItemStylePlain target:self action:@selector(send)];
 }
 
diff --git a/iphone/Maps/Classes/MWMReportProblemController.mm b/iphone/Maps/Classes/MWMReportProblemController.mm
index 1ab28d49e8..64c5db9186 100644
--- a/iphone/Maps/Classes/MWMReportProblemController.mm
+++ b/iphone/Maps/Classes/MWMReportProblemController.mm
@@ -19,7 +19,7 @@
 - (void)configNavBar
 {
   [super configNavBar];
-  self.title = L(@"problem");
+  self.title = L(@"editor_report_problem_title");
 }
 
 #pragma mark - UITableView
diff --git a/iphone/Maps/Classes/MWMReportProblemExtendedController.mm b/iphone/Maps/Classes/MWMReportProblemExtendedController.mm
index 0feeb07d82..c48ef5f9cc 100644
--- a/iphone/Maps/Classes/MWMReportProblemExtendedController.mm
+++ b/iphone/Maps/Classes/MWMReportProblemExtendedController.mm
@@ -17,7 +17,7 @@
 - (void)configNavBar
 {
   [super configNavBar];
-  self.title = L(@"other");
+  self.title = L(@"editor_report_problem_title");
 }
 
 #pragma mark - UITableView
@@ -25,7 +25,8 @@
 - (NSString *)tableView:(UITableView *)tableView titleForFooterInSection:(NSInteger)section
 {
   NSAssert(section == 0, @"Invalid section!");
-  return L(@"report_problem_extended_description");
+  return [NSString stringWithFormat:@"%@\n\n%@", L(@"editor_report_problem_desription_1"),
+                                               L(@"editor_report_problem_desription_2")];
 }
 
 @end
diff --git a/iphone/Maps/Mapsme.storyboard b/iphone/Maps/Mapsme.storyboard
index 466369d687..30f22b1d3c 100644
--- a/iphone/Maps/Mapsme.storyboard
+++ b/iphone/Maps/Mapsme.storyboard
@@ -1588,7 +1588,7 @@
                                                     <userDefinedRuntimeAttributes>
                                                         <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
                                                         <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/>
-                                                        <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="place_doesnt_exist"/>
+                                                        <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="editor_report_problem_no_place_title"/>
                                                     </userDefinedRuntimeAttributes>
                                                 </label>
                                             </subviews>
@@ -1621,7 +1621,7 @@
                                                     <userDefinedRuntimeAttributes>
                                                         <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
                                                         <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/>
-                                                        <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="other"/>
+                                                        <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="editor_report_problem_other_title"/>
                                                     </userDefinedRuntimeAttributes>
                                                 </label>
                                             </subviews>
@@ -1954,7 +1954,7 @@
                                                 <userDefinedRuntimeAttributes>
                                                     <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/>
                                                     <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
-                                                    <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="not_sent"/>
+                                                    <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="editor_profile_unsent_changes"/>
                                                 </userDefinedRuntimeAttributes>
                                             </label>
                                         </subviews>
@@ -2826,5 +2826,7 @@ the world. Join us!</string>
         <segue reference="yAJ-jH-Dus"/>
         <segue reference="mF7-g4-gSS"/>
         <segue reference="w48-2Y-VXA"/>
+        <segue reference="Z0Z-aU-Vrq"/>
+        <segue reference="Pet-Wq-d4a"/>
     </inferredMetricsTieBreakers>
 </document>