[iOS] Localization fixes for the place page (tolls, ferries, etc.)

5 files changed, 5 insertions, 19 deletions

diff --git a/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm b/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm
index bfe762de50..118103077c 100644
--- a/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm
+++ b/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm
@@ -595,12 +595,6 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type, place_page:
 }
 
 
-- (void)avoidMotorway {
-  [MWMRouter avoidRoadTypeAndRebuild:MWMRoadTypeMotorway];
-  [self closePlacePage];
-}
-
-
 - (void)avoidToll {
   [Statistics logEvent:kStatPlacepageDrivingOptionsAction
         withParameters:@{kStatType : [kStatToll capitalizedString]}];
diff --git a/iphone/Maps/UI/PlacePage/MWMPlacePageProtocol.h b/iphone/Maps/UI/PlacePage/MWMPlacePageProtocol.h
index e7cf1434cb..c2041f5586 100644
--- a/iphone/Maps/UI/PlacePage/MWMPlacePageProtocol.h
+++ b/iphone/Maps/UI/PlacePage/MWMPlacePageProtocol.h
@@ -24,7 +24,6 @@
 - (void)avoidToll;
 - (void)avoidDirty;
 - (void)avoidFerry;
-- (void)avoidMotorway;
 
 @end
 
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.h b/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.h
index e48fd0d29e..e227fc1e40 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.h
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.h
@@ -15,8 +15,7 @@ enum class EButton  // Required button's order
   Share,
   AvoidToll,
   AvoidDirty,
-  AvoidFerry,
-  AvoidMotorway
+  AvoidFerry
 };
 
 NSString * titleForButton(EButton type, int partnerIndex, BOOL isSelected);
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.mm
index f7f9ab20b5..b71b03bfe5 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.mm
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.mm
@@ -27,10 +27,9 @@ NSString * titleForButton(EButton type, int partnerIndex, BOOL isSelected)
   case EButton::More: return L(@"placepage_more_button");
   case EButton::RouteAddStop: return L(@"placepage_add_stop");
   case EButton::RouteRemoveStop: return L(@"placepage_remove_stop");
-  case EButton::AvoidToll: return L(@"avoid_tolls");
-  case EButton::AvoidDirty: return L(@"avoid_unpaved");
-  case EButton::AvoidFerry: return L(@"avoid_ferry");
-  case EButton::AvoidMotorway: return L(@"avoid_motorways");
+  case EButton::AvoidToll: return L(@"avoid_toll_roads_placepage");
+  case EButton::AvoidDirty: return L(@"avoid_unpaved_roads_placepage");
+  case EButton::AvoidFerry: return L(@"avoid_ferry_crossing_placepage");
   case EButton::Partner: return titleForPartner(partnerIndex);
   }
 }
@@ -171,11 +170,7 @@ UIColor * backgroundColorForPartner(int partnerIndex)
     case EButton::AvoidFerry:
       [self.button setImage:[UIImage imageNamed:@"ic_avoid_ferry"]
                    forState:UIControlStateNormal];
-      break;
-    case EButton::AvoidMotorway:
-      [self.button setImage:[UIImage imageNamed:@"ic_remove_route_point"]
-                   forState:UIControlStateNormal];
-      break;
+      break; 
   }
   self.button.enabled = !isDisabled;
 }
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMPlacePageActionBar.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMPlacePageActionBar.mm
index 4ab8b3dc88..4bb856b7d2 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMPlacePageActionBar.mm
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMPlacePageActionBar.mm
@@ -245,7 +245,6 @@
   case EButton::AvoidToll: [delegate avoidToll]; break;
   case EButton::AvoidDirty: [delegate avoidDirty]; break;
   case EButton::AvoidFerry: [delegate avoidFerry]; break;
-  case EButton::AvoidMotorway: [delegate avoidMotorway]; break;
   case EButton::Partner: [delegate openPartner]; break;
   }
 }