From 9edf452d275f888fb8778c42221f9618689ee79a Mon Sep 17 00:00:00 2001 From: Antonin Delpeuch Date: Sat, 16 Mar 2024 10:03:07 +0100 Subject: [PATCH] Localize building levels in place view. To make it clearer what this field is about and what the numerical value means. For #4452. Signed-off-by: Antonin Delpeuch --- android/app/src/main/java/app/organicmaps/util/Utils.java | 7 +++++++ .../app/organicmaps/widget/placepage/PlacePageView.java | 3 ++- data/strings/strings.txt | 8 ++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/android/app/src/main/java/app/organicmaps/util/Utils.java b/android/app/src/main/java/app/organicmaps/util/Utils.java index 3b6b80f038..dbdf109188 100644 --- a/android/app/src/main/java/app/organicmaps/util/Utils.java +++ b/android/app/src/main/java/app/organicmaps/util/Utils.java @@ -662,6 +662,13 @@ public class Utils return brand; } + public static String getLocalizedLevel(@NonNull Context context, @Nullable String level) + { + if (TextUtils.isEmpty(level)) + return ""; + return context.getString(R.string.level_value_generic, level); + } + private static class SupportInfoWithLogsCallback implements LogsManager.OnZipCompletedListener { @NonNull diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java index f452f99e79..67ae7d51e8 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java @@ -405,7 +405,8 @@ public class PlacePageView extends Fragment implements View.OnClickListener, refreshMetadataOrHide(Framework.nativeGetActiveObjectFormattedCuisine(), mCuisine, mTvCuisine); refreshWiFi(); refreshMetadataOrHide(mMapObject.getMetadata(Metadata.MetadataType.FMD_FLATS), mEntrance, mTvEntrance); - refreshMetadataOrHide(mMapObject.getMetadata(Metadata.MetadataType.FMD_LEVEL), mLevel, mTvLevel); + final String level = Utils.getLocalizedLevel(getContext(), mMapObject.getMetadata(Metadata.MetadataType.FMD_LEVEL)); + refreshMetadataOrHide(level, mLevel, mTvLevel); final String cap = mMapObject.getMetadata(Metadata.MetadataType.FMD_CAPACITY); refreshMetadataOrHide(!TextUtils.isEmpty(cap) ? getString(R.string.capacity, cap) : "", mCapacity, mTvCapacity); diff --git a/data/strings/strings.txt b/data/strings/strings.txt index 3844c63576..ea385a2cb0 100644 --- a/data/strings/strings.txt +++ b/data/strings/strings.txt @@ -14612,6 +14612,14 @@ zh-Hans = 楼层 zh-Hant = 樓層 + [level_value_generic] + tags = android,ios + comment = Building level + en = Level: %s + de = Stock: %s + fr = Niveau : %s + ru = Этаж: %s + [please_note] tags = ios en = Please note