From 3b4ffd7199d990d1cbd0e7cbe23fa41f04d38e74 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 5 Apr 2017 19:03:59 +0300 Subject: Add chat command for translate message from player language to english. Also add po field into languages.xml. --- src/utils/translation/podict.cpp | 5 +++++ src/utils/translation/podict.h | 2 ++ src/utils/translation/translationmanager.cpp | 8 +++++++- src/utils/translation/translationmanager.h | 2 ++ 4 files changed, 16 insertions(+), 1 deletion(-) (limited to 'src/utils/translation') diff --git a/src/utils/translation/podict.cpp b/src/utils/translation/podict.cpp index 37b1b2fe8..56fd42467 100644 --- a/src/utils/translation/podict.cpp +++ b/src/utils/translation/podict.cpp @@ -54,3 +54,8 @@ const char *PoDict::getChar(const char *const str) return str; return mPoLines[str].c_str(); } + +bool PoDict::haveStr(const std::string &str) const +{ + return mPoLines.find(str) != mPoLines.end(); +} diff --git a/src/utils/translation/podict.h b/src/utils/translation/podict.h index a8b18bba4..d40aa1499 100644 --- a/src/utils/translation/podict.h +++ b/src/utils/translation/podict.h @@ -41,6 +41,8 @@ class PoDict final const char *getChar(const char *const str); + bool haveStr(const std::string &str) const; + #ifndef UNITTESTS protected: #endif // UNITTESTS diff --git a/src/utils/translation/translationmanager.cpp b/src/utils/translation/translationmanager.cpp index f64d8e612..808ad5f2f 100644 --- a/src/utils/translation/translationmanager.cpp +++ b/src/utils/translation/translationmanager.cpp @@ -43,7 +43,13 @@ void TranslationManager::loadCurrentLang() delete translator; translator = loadLang(getLang(), ""); translator = loadLang(getLang(), "help/", translator); - dictionary = loadLang(getLang(), "dict/"); +} + +void TranslationManager::loadDictionaryLang() +{ + delete dictionary; + delete reverseDictionary; + dictionary = loadLang(getServerLang(), "dict/"); reverseDictionary = reverseLang(dictionary); } diff --git a/src/utils/translation/translationmanager.h b/src/utils/translation/translationmanager.h index 81ac4fda7..088d97449 100644 --- a/src/utils/translation/translationmanager.h +++ b/src/utils/translation/translationmanager.h @@ -43,6 +43,8 @@ class TranslationManager final static void loadCurrentLang(); + static void loadDictionaryLang(); + #ifdef ENABLE_CUSTOMNLS static void loadGettextLang(); #endif // ENABLE_CUSTOMNLS -- cgit v1.2.3-60-g2f50