From 61619d2dcfe86bc5ff4179b02899fabdf9699ea2 Mon Sep 17 00:00:00 2001 From: xmd5a Date: Wed, 28 Feb 2018 14:40:47 +0300 Subject: [PATCH 1/3] Add phrase --- OsmAnd/res/values-ru/phrases.xml | 2 ++ OsmAnd/res/values/phrases.xml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml index 7275754f22..6f0d692ba3 100644 --- a/OsmAnd/res/values-ru/phrases.xml +++ b/OsmAnd/res/values-ru/phrases.xml @@ -3736,4 +3736,6 @@ Разъём + Магазин напольных покрытий + diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml index ac5d0a0919..c430d7acb6 100644 --- a/OsmAnd/res/values/phrases.xml +++ b/OsmAnd/res/values/phrases.xml @@ -3756,4 +3756,6 @@ Medium Low + Flooring store + From 870bfe2e2b6cf21bbaa1e59b877c5f897ba660d0 Mon Sep 17 00:00:00 2001 From: Chumva Date: Wed, 28 Feb 2018 17:17:29 +0200 Subject: [PATCH 2/3] fixed bug with title language --- .../osmand/plus/mapcontextmenu/WikipediaDialogFragment.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/WikipediaDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/WikipediaDialogFragment.java index 6747198d1f..73cd329e58 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/WikipediaDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/WikipediaDialogFragment.java @@ -167,8 +167,7 @@ public class WikipediaDialogFragment extends DialogFragment { if (TextUtils.isEmpty(preferredLanguage)) { preferredLanguage = getMyApplication().getLanguage(); } - - final String title = TextUtils.isEmpty(preferredLanguage) ? amenity.getName() : amenity.getName(lang); + final String title = TextUtils.isEmpty(preferredLanguage) ? amenity.getName() : amenity.getName(preferredLanguage); ((TextView) mainView.findViewById(R.id.title_text_view)).setText(title); String lng = amenity.getContentLanguage("content", preferredLanguage, "en"); From 04c99a132a3500f55a044411a22280b56efc2e62 Mon Sep 17 00:00:00 2001 From: xmd5a Date: Wed, 28 Feb 2018 23:05:23 +0300 Subject: [PATCH 3/3] Add phrase --- OsmAnd/res/values-ru/phrases.xml | 3 ++- OsmAnd/res/values/phrases.xml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml index 6f0d692ba3..b981d60f74 100644 --- a/OsmAnd/res/values-ru/phrases.xml +++ b/OsmAnd/res/values-ru/phrases.xml @@ -3736,6 +3736,7 @@ Разъём - Магазин напольных покрытий + Напольные покрытия + Глиняная посуда diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml index c430d7acb6..4a1fd69fc6 100644 --- a/OsmAnd/res/values/phrases.xml +++ b/OsmAnd/res/values/phrases.xml @@ -3757,5 +3757,6 @@ Low Flooring store + Pottery