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 677eb2ad26..f90bc1afcf 100644 --- a/android/app/src/main/java/app/organicmaps/util/Utils.java +++ b/android/app/src/main/java/app/organicmaps/util/Utils.java @@ -646,8 +646,18 @@ public class Utils if (TextUtils.isEmpty(brand)) return ""; - String key = "brand." + brand; - return getLocalizedFeatureByKey(context, key); + try + { + @StringRes + int nameId = context.getResources().getIdentifier("brand." + brand, "string", context.getPackageName()); + if (nameId == INVALID_ID || nameId == View.NO_ID) + return brand; + return context.getString(nameId); + } + catch (Resources.NotFoundException e) + { + } + return brand; } private static class SupportInfoWithLogsCallback implements LogsManager.OnZipCompletedListener diff --git a/platform/localization.mm b/platform/localization.mm index 7f92daf41c..6854418b0e 100644 --- a/platform/localization.mm +++ b/platform/localization.mm @@ -18,7 +18,7 @@ std::string GetLocalizedTypeName(std::string const & type) std::string GetLocalizedBrandName(std::string const & brand) { auto const key = "brand." + brand; - return [NSLocalizedString(@(key.c_str()), @"") UTF8String]; + return [NSLocalizedStringWithDefaultValue(@(key.c_str()), nil, NSBundle.mainBundle, @(brand.c_str()), @"") UTF8String]; } std::string GetLocalizedString(std::string const & key)