From 20aa24a74b190b060663afafb279d11641204840 Mon Sep 17 00:00:00 2001 From: map-per Date: Wed, 4 Dec 2024 08:15:56 +0100 Subject: [PATCH] EN as additional search language in the editor Signed-off-by: map-per --- .../src/main/cpp/app/organicmaps/editor/Editor.cpp | 13 ++++++++----- .../Editor/MWMObjectsCategorySelectorDataSource.mm | 1 + 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/android/app/src/main/cpp/app/organicmaps/editor/Editor.cpp b/android/app/src/main/cpp/app/organicmaps/editor/Editor.cpp index c8f9992770..a62eb8c21f 100644 --- a/android/app/src/main/cpp/app/organicmaps/editor/Editor.cpp +++ b/android/app/src/main/cpp/app/organicmaps/editor/Editor.cpp @@ -406,8 +406,10 @@ Java_app_organicmaps_editor_Editor_nativeGetAllCreatableFeatureTypes(JNIEnv * en jstring jLang) { std::string const & lang = jni::ToNativeString(env, jLang); - GetFeatureCategories().AddLanguage(lang); - return jni::ToJavaStringArray(env, GetFeatureCategories().GetAllCreatableTypeNames()); + auto & categories = GetFeatureCategories(); + categories.AddLanguage(lang); + categories.AddLanguage("en"); + return jni::ToJavaStringArray(env, categories.GetAllCreatableTypeNames()); } JNIEXPORT jobjectArray JNICALL @@ -416,9 +418,10 @@ Java_app_organicmaps_editor_Editor_nativeSearchCreatableFeatureTypes(JNIEnv * en jstring jLang) { std::string const & lang = jni::ToNativeString(env, jLang); - GetFeatureCategories().AddLanguage(lang); - return jni::ToJavaStringArray(env, - GetFeatureCategories().Search(jni::ToNativeString(env, query))); + auto & categories = GetFeatureCategories(); + categories.AddLanguage(lang); + categories.AddLanguage("en"); + return jni::ToJavaStringArray(env, categories.Search(jni::ToNativeString(env, query))); } JNIEXPORT jobjectArray JNICALL diff --git a/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorDataSource.mm b/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorDataSource.mm index 7db8e370d1..43e482f58c 100644 --- a/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorDataSource.mm +++ b/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorDataSource.mm @@ -50,6 +50,7 @@ std::string locale() { m_categories = GetFramework().GetEditorCategories(); m_categories.AddLanguage(locale()); + m_categories.AddLanguage("en"); auto const & types = m_categories.GetAllCreatableTypeNames(); m_categoriesList.reserve(types.size());