Avoid to use heavy function languages::CurrentLanguage().

4 files changed, 13 insertions, 0 deletions

diff --git a/search/search_engine.cpp b/search/search_engine.cpp
index 737f5ee98f..4f4ef29504 100644
--- a/search/search_engine.cpp
+++ b/search/search_engine.cpp
@@ -334,6 +334,11 @@ m2::RectD Engine::GetCountryBounds(string const & file) const
   return m_pData->m_infoGetter.CalcLimitRect(file);
 }
 
+int8_t Engine::GetCurrentLanguage() const
+{
+  return m_pQuery->GetPrefferedLanguage();
+}
+
 void Engine::ClearCaches()
 {
   /// @todo Add m_pData->m_infoGetter clearing routine.
diff --git a/search/search_engine.hpp b/search/search_engine.hpp
index 7a20b703af..7bfaea42bf 100644
--- a/search/search_engine.hpp
+++ b/search/search_engine.hpp
@@ -43,6 +43,8 @@ public:
   string GetCountryFile(m2::PointD const & pt);
   string GetCountryCode(m2::PointD const & pt);
 
+  int8_t GetCurrentLanguage() const;
+
 private:
   template <class T> string GetCountryNameT(T const & t);
 public:
diff --git a/search/search_query.cpp b/search/search_query.cpp
index c066faf3a7..d7982d6ece 100644
--- a/search/search_query.cpp
+++ b/search/search_query.cpp
@@ -177,6 +177,11 @@ void Query::SetInputLanguage(int8_t lang)
   SetLanguage(LANG_INPUT, lang);
 }
 
+int8_t Query::GetPrefferedLanguage() const
+{
+  return GetLanguage(LANG_CURRENT);
+}
+
 void Query::ClearCache()
 {
   for (size_t i = 0; i < RECTSCOUNT; ++i)
diff --git a/search/search_query.hpp b/search/search_query.hpp
index 575fd66567..aff43c6337 100644
--- a/search/search_query.hpp
+++ b/search/search_query.hpp
@@ -73,6 +73,7 @@ public:
 
   void SetPreferredLanguage(string const & lang);
   void SetInputLanguage(int8_t lang);
+  int8_t GetPrefferedLanguage() const;
 
   void Search(string const & query, Results & res);
   void SearchAllInViewport(m2::RectD const & viewport, Results & res, unsigned int resultsNeeded = 30);