From 64a346a646dda45ba43cdbd97a7e45e08fcaef47 Mon Sep 17 00:00:00 2001
From: "r.kuznetsov" <r.kuznetsov@corp.mail.ru>
Date: Wed, 21 Feb 2018 14:16:11 +0300
Subject: [PATCH] Reverted wifi string key

---
 android/res/layout/fragment_editor.xml                       | 2 +-
 android/src/com/mapswithme/maps/MwmApplication.java          | 2 +-
 iphone/Maps/Classes/MapsAppDelegate.mm                       | 2 +-
 iphone/Maps/UI/Editor/MWMEditorViewController.mm             | 2 +-
 .../Content/RegularCell/MWMPlacePageRegularCell.mm           | 2 +-
 map/framework.cpp                                            | 5 +++--
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/android/res/layout/fragment_editor.xml b/android/res/layout/fragment_editor.xml
index 08793eaebf..0fb8651c58 100644
--- a/android/res/layout/fragment_editor.xml
+++ b/android/res/layout/fragment_editor.xml
@@ -257,7 +257,7 @@
             android:layout_marginStart="@dimen/editor_margin_left"
             android:layout_toLeftOf="@+id/sw__wifi"
             android:layout_toStartOf="@+id/sw__wifi"
-            android:text="@string/core_wifi"/>
+            android:text="@string/wifi"/>
 
           <android.support.v7.widget.SwitchCompat
             android:id="@+id/sw__wifi"
diff --git a/android/src/com/mapswithme/maps/MwmApplication.java b/android/src/com/mapswithme/maps/MwmApplication.java
index c52dd83321..c412ffd8fb 100644
--- a/android/src/com/mapswithme/maps/MwmApplication.java
+++ b/android/src/com/mapswithme/maps/MwmApplication.java
@@ -274,7 +274,7 @@ public class MwmApplication extends Application
     nativeAddLocalization("core_my_places", getString(R.string.core_my_places));
     nativeAddLocalization("core_my_position", getString(R.string.core_my_position));
     nativeAddLocalization("core_placepage_unknown_place", getString(R.string.core_placepage_unknown_place));
-    nativeAddLocalization("core_wifi", getString(R.string.core_wifi));
+    nativeAddLocalization("wifi", getString(R.string.wifi));
   }
 
   public void initCrashlytics()
diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm
index bff913a0e0..187a29929c 100644
--- a/iphone/Maps/Classes/MapsAppDelegate.mm
+++ b/iphone/Maps/Classes/MapsAppDelegate.mm
@@ -70,7 +70,7 @@ void InitLocalizedStrings()
   f.AddString("core_my_places", L(@"core_my_places").UTF8String);
   f.AddString("core_my_position", L(@"core_my_position").UTF8String);
   f.AddString("core_placepage_unknown_place", L(@"core_placepage_unknown_place").UTF8String);
-  f.AddString("core_wifi", L(@"core_wifi").UTF8String);
+  f.AddString("wifi", L(@"wifi").UTF8String);
 }
 
 void InitCrashTrackers()
diff --git a/iphone/Maps/UI/Editor/MWMEditorViewController.mm b/iphone/Maps/UI/Editor/MWMEditorViewController.mm
index 943131e6bf..22111d4040 100644
--- a/iphone/Maps/UI/Editor/MWMEditorViewController.mm
+++ b/iphone/Maps/UI/Editor/MWMEditorViewController.mm
@@ -529,7 +529,7 @@ void registerCellsForTableView(vector<MWMEditorCellType> const & cells, UITableV
     // TODO(Vlad, IgorTomko): Support all other possible Internet statuses.
     [tCell configWithDelegate:self
                          icon:[UIImage imageNamed:@"ic_placepage_wifi"]
-                         text:L(@"core_wifi")
+                         text:L(@"wifi")
                            on:m_mapObject.GetInternet() == osm::Internet::Wlan];
     break;
   }
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/RegularCell/MWMPlacePageRegularCell.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/RegularCell/MWMPlacePageRegularCell.mm
index 3119a74536..82acf283e1 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/RegularCell/MWMPlacePageRegularCell.mm
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/RegularCell/MWMPlacePageRegularCell.mm
@@ -73,7 +73,7 @@
     break;
   case MetainfoRows::Internet:
     self.toggleImage.hidden = YES;
-    name = @"core_wifi";
+    name = @"wifi";
     break;
   case MetainfoRows::Coordinate:
     self.toggleImage.hidden = NO;
diff --git a/map/framework.cpp b/map/framework.cpp
index bf89c65ebd..65d80ae5a5 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -397,7 +397,8 @@ Framework::Framework(FrameworkParams const & params)
   m_stringsBundle.SetDefaultString("core_placepage_unknown_place", "Unknown Place");
   m_stringsBundle.SetDefaultString("core_my_places", "My Places");
   m_stringsBundle.SetDefaultString("core_my_position", "My Position");
-  m_stringsBundle.SetDefaultString("core_wifi", "WiFi");
+  // Wi-Fi string is used in categories that's why does not have core_ prefix
+  m_stringsBundle.SetDefaultString("wifi", "WiFi");
 
   m_model.InitClassificator();
   m_model.SetOnMapDeregisteredCallback(bind(&Framework::OnMapDeregistered, this, _1));
@@ -803,7 +804,7 @@ void Framework::FillInfoFromFeatureType(FeatureType const & ft, place_page::Info
   feature::TypesHolder buildingHolder;
   buildingHolder.Assign(classif().GetTypeByPath({"building"}));
 
-  info.SetLocalizedWifiString(m_stringsBundle.GetString("core_wifi"));
+  info.SetLocalizedWifiString(m_stringsBundle.GetString("wifi"));
 
   if (ftypes::IsAddressObjectChecker::Instance()(ft))
     info.SetAddress(GetAddressInfoAtPoint(feature::GetCenter(ft)).FormatHouseAndStreet());