From 750aadbc9a0366a2a6ccd2be80a7f20ff101c668 Mon Sep 17 00:00:00 2001 From: LaGrunge Date: Wed, 9 Oct 2019 15:06:46 +0300 Subject: [PATCH] Remove localization --- indexer/map_object.cpp | 3 +-- platform/CMakeLists.txt | 2 -- platform/localization.hpp | 10 ---------- platform/localization.mm | 28 ---------------------------- platform/localization_dummy.cpp | 10 ---------- 5 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 platform/localization.hpp delete mode 100644 platform/localization.mm delete mode 100644 platform/localization_dummy.cpp diff --git a/indexer/map_object.cpp b/indexer/map_object.cpp index 88e3698..6349466 100644 --- a/indexer/map_object.cpp +++ b/indexer/map_object.cpp @@ -4,7 +4,6 @@ #include "indexer/feature_algo.hpp" #include "indexer/ftypes_matcher.hpp" -#include "platform/localization.hpp" #include "platform/measurement_utils.hpp" #include "base/logging.hpp" @@ -117,7 +116,7 @@ string MapObject::GetLocalizedType() const feature::TypesHolder copy(m_types); copy.SortBySpec(); - return platform::GetLocalizedTypeName(classif().GetReadableObjectName(*copy.begin())); + return classif().GetReadableObjectName(*copy.begin()); } vector MapObject::AvailableProperties() const diff --git a/platform/CMakeLists.txt b/platform/CMakeLists.txt index 0a143bd..64c2485 100644 --- a/platform/CMakeLists.txt +++ b/platform/CMakeLists.txt @@ -13,8 +13,6 @@ set( local_country_file.hpp local_country_file_utils.cpp local_country_file_utils.hpp - localization.hpp - localization_dummy.cpp measurement_utils.cpp measurement_utils.hpp mwm_version.cpp diff --git a/platform/localization.hpp b/platform/localization.hpp deleted file mode 100644 index b733732..0000000 --- a/platform/localization.hpp +++ /dev/null @@ -1,10 +0,0 @@ -#pragma once - -#include - -namespace platform -{ -extern std::string GetLocalizedTypeName(std::string const & type); -extern std::string GetLocalizedBrandName(std::string const & brand); -extern std::string GetLocalizedString(std::string const & key); -} // namespace platform diff --git a/platform/localization.mm b/platform/localization.mm deleted file mode 100644 index da00397..0000000 --- a/platform/localization.mm +++ /dev/null @@ -1,28 +0,0 @@ -#include "platform/localization.hpp" - -#include - -#import - -namespace platform -{ -std::string GetLocalizedTypeName(std::string const & type) -{ - auto key = "type." + type; - std::replace(key.begin(), key.end(), '-', '.'); - std::replace(key.begin(), key.end(), ':', '_'); - - return [NSLocalizedString(@(key.c_str()), @"") UTF8String]; -} - -std::string GetLocalizedBrandName(std::string const & brand) -{ - auto const key = "brand." + brand; - return [NSLocalizedString(@(key.c_str()), @"") UTF8String]; -} - -std::string GetLocalizedString(std::string const & key) -{ - return [NSLocalizedString(@(key.c_str()), @"") UTF8String]; -} -} // namespace platform diff --git a/platform/localization_dummy.cpp b/platform/localization_dummy.cpp deleted file mode 100644 index 640415a..0000000 --- a/platform/localization_dummy.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include "platform/localization.hpp" - -namespace platform -{ -std::string GetLocalizedTypeName(std::string const & type) { return type; } - -std::string GetLocalizedBrandName(std::string const & brand) { return brand; } - -std::string GetLocalizedString(std::string const & key) { return key; } -} // namespace platform