From b319509a6a8a0cd015a81b9694353b0e0eeee90a Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Sun, 22 Apr 2018 13:30:56 +0200
Subject: [PATCH] Update string

---
 OsmAnd/res/values/strings.xml                 |  6 +++--
 .../dialogs/ChoosePlanDialogFragment.java     | 24 ++++++++++---------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 718f7fabe4..31dd78a544 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -9,14 +9,16 @@
          3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
     PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work  :-)  Thx - Hardy
     -->
+    <string name="monthly_map_updates">Map updates: <b>every month</b></string>
+    <string name="daily_map_updates">Map updates: <b>every day, every hour</b></string>
     <string name="in_app_purchase">In-App purchase</string>
     <string name="in_app_purchase_desc">One time payment</string>
     <string name="in_app_purchase_desc_ex">Once purchased, it will be permanently available to you.</string>
     <string name="purchase_unlim_title">Buy - %1$s</string>
-    <string name="purchase_subscription_title">Subscript - %1$s</string>
+    <string name="purchase_subscription_title">Subscribe - %1$s</string>
 
     <string name="wikivoyage_offline">Wikivoyage offline</string>
-    <string name="dayly_map_updates">Map updates: every day</string>
+    
     <string name="unlimited_downloads">Unlimited downloads</string>
     <string name="wikipedia_offline">Wikipedia offline</string>
     <string name="contour_lines_sea_depth">Contour lines + Sea depth</string>
diff --git a/OsmAnd/src/net/osmand/plus/dialogs/ChoosePlanDialogFragment.java b/OsmAnd/src/net/osmand/plus/dialogs/ChoosePlanDialogFragment.java
index f75ebcaafe..bc50903aaa 100644
--- a/OsmAnd/src/net/osmand/plus/dialogs/ChoosePlanDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dialogs/ChoosePlanDialogFragment.java
@@ -47,20 +47,20 @@ public class ChoosePlanDialogFragment extends BaseOsmAndDialogFragment {
 	private PlanType planType;
 
 	private OsmAndFeature[] osmandLiveFeatures = {
-			OsmAndFeature.WIKIVOYAGE_OFFLINE,
-			OsmAndFeature.DAYLY_MAP_UPDATES,
 			OsmAndFeature.UNLIMITED_DOWNLOADS,
+			OsmAndFeature.DAILY_MAP_UPDATES,
 			OsmAndFeature.WIKIPEDIA_OFFLINE,
+			OsmAndFeature.WIKIVOYAGE_OFFLINE,
 			OsmAndFeature.CONTOUR_LINES_SEA_DEPTH,
-			OsmAndFeature.UNLOCK_ALL_FEATURES,
-			OsmAndFeature.DONATION_TO_OSM
+			OsmAndFeature.DONATION_TO_OSM,
+//			OsmAndFeature.UNLOCK_ALL_FEATURES,
 	};
 
 	private OsmAndFeature[] osmandUnlimitedFeatures = {
-			OsmAndFeature.WIKIVOYAGE_OFFLINE,
-			OsmAndFeature.DAYLY_MAP_UPDATES,
 			OsmAndFeature.UNLIMITED_DOWNLOADS,
-			OsmAndFeature.WIKIPEDIA_OFFLINE
+			OsmAndFeature.MONTHLY_MAP_UPDATES,
+			OsmAndFeature.WIKIPEDIA_OFFLINE,
+			OsmAndFeature.WIKIVOYAGE_OFFLINE,
 	};
 
 	public enum PlanType {
@@ -85,7 +85,8 @@ public class ChoosePlanDialogFragment extends BaseOsmAndDialogFragment {
 
 	public enum OsmAndFeature {
 		WIKIVOYAGE_OFFLINE(R.string.wikivoyage_offline),
-		DAYLY_MAP_UPDATES(R.string.dayly_map_updates),
+		DAILY_MAP_UPDATES(R.string.daily_map_updates),
+		MONTHLY_MAP_UPDATES(R.string.monthly_map_updates),
 		UNLIMITED_DOWNLOADS(R.string.unlimited_downloads),
 		WIKIPEDIA_OFFLINE(R.string.wikipedia_offline),
 		CONTOUR_LINES_SEA_DEPTH(R.string.contour_lines_sea_depth),
@@ -103,7 +104,7 @@ public class ChoosePlanDialogFragment extends BaseOsmAndDialogFragment {
 		}
 
 		public static OsmAndFeature[] possibleValues() {
-			return new OsmAndFeature[]{WIKIVOYAGE_OFFLINE, DAYLY_MAP_UPDATES, UNLIMITED_DOWNLOADS,
+			return new OsmAndFeature[]{WIKIVOYAGE_OFFLINE, DAILY_MAP_UPDATES, MONTHLY_MAP_UPDATES, UNLIMITED_DOWNLOADS,
 					WIKIPEDIA_OFFLINE, CONTOUR_LINES_SEA_DEPTH, UNLOCK_ALL_FEATURES, DONATION_TO_OSM};
 		}
 	}
@@ -239,8 +240,9 @@ public class ChoosePlanDialogFragment extends BaseOsmAndDialogFragment {
 		View featureRowDiv = null;
 		for (OsmAndFeature feature : osmandLiveFeatures) {
 			String featureName = feature.toHumanString(ctx);
-			View featureRow = inflate(planType.osmandLiveFeature == feature
-					? R.layout.purchase_dialog_card_selected_row : R.layout.purchase_dialog_card_row, cardView);
+//			View featureRow = inflate(planType.osmandLiveFeature == feature
+//					? R.layout.purchase_dialog_card_selected_row : R.layout.purchase_dialog_card_row, cardView);
+			View featureRow = inflate(R.layout.purchase_dialog_card_row, cardView);
 			TextViewEx titleView = (TextViewEx) featureRow.findViewById(R.id.title);
 			titleView.setText(featureName);
 			featureRowDiv = featureRow.findViewById(R.id.div);