diff options
Diffstat (limited to 'core/translation.cpp')
| -rw-r--r-- | core/translation.cpp | 90 |
1 files changed, 74 insertions, 16 deletions
diff --git a/core/translation.cpp b/core/translation.cpp index 045771f7c7..8247cd1201 100644 --- a/core/translation.cpp +++ b/core/translation.cpp @@ -5,7 +5,7 @@ /* GODOT ENGINE */ /* http://www.godotengine.org */ /*************************************************************************/ -/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur. */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ @@ -470,6 +470,11 @@ void Translation::get_message_list(List<StringName> *r_messages) const { } +int Translation::get_message_count() const { + + return translation_map.size(); +}; + void Translation::_bind_methods() { @@ -479,6 +484,7 @@ void Translation::_bind_methods() { ObjectTypeDB::bind_method(_MD("get_message","src_message"),&Translation::get_message); ObjectTypeDB::bind_method(_MD("erase_message","src_message"),&Translation::erase_message); ObjectTypeDB::bind_method(_MD("get_message_list"),&Translation::_get_message_list); + ObjectTypeDB::bind_method(_MD("get_message_count"),&Translation::get_message_count); ObjectTypeDB::bind_method(_MD("_set_messages"),&Translation::_set_messages); ObjectTypeDB::bind_method(_MD("_get_messages"),&Translation::_get_messages); @@ -519,6 +525,11 @@ void TranslationServer::remove_translation(const Ref<Translation> &p_translation translations.erase(p_translation); } +void TranslationServer::clear() { + + translations.clear(); +}; + StringName TranslationServer::translate(const StringName& p_message) const { //translate using locale @@ -539,7 +550,7 @@ StringName TranslationServer::translate(const StringName& p_message) const { continue; // locale not match //near match - bool match = (l!=lptr); + bool match = (l!=locale); if (near_match && !match) continue; //only near-match once @@ -559,6 +570,42 @@ StringName TranslationServer::translate(const StringName& p_message) const { } + if (!res) { + //try again with fallback + if (fallback.length()>=2) { + + const CharType *fptr=&fallback[0]; + bool near_match=false; + for (const Set< Ref<Translation> >::Element *E=translations.front();E;E=E->next()) { + + const Ref<Translation>& t = E->get(); + String l = t->get_locale(); + if (fptr[0]!=l[0] || fptr[1]!=l[1]) + continue; // locale not match + + //near match + bool match = (l!=fallback); + + if (near_match && !match) + continue; //only near-match once + + StringName r=t->get_message(p_message); + + if (!r) + continue; + + res=r; + + if (match) + break; + else + near_match=true; + + } + } + } + + if (!res) return p_message; @@ -593,9 +640,27 @@ bool TranslationServer::_load_translations(const String& p_from) { void TranslationServer::setup() { - - set_locale( GLOBAL_DEF("locale/default",OS::get_singleton()->get_locale()) ); - fallback = GLOBAL_DEF("locale/fallback",""); + String test = GLOBAL_DEF("locale/test",""); + test=test.strip_edges(); + if (test!="") + set_locale( test ); + else + set_locale( OS::get_singleton()->get_locale() ); + fallback = GLOBAL_DEF("locale/fallback","en"); +#ifdef TOOLS_ENABLED + + { + String options=""; + int idx=0; + while(locale_list[idx]) { + if (idx>0) + options+=", "; + options+=locale_list[idx]; + idx++; + } + Globals::get_singleton()->set_custom_property_info("locale/fallback",PropertyInfo(Variant::STRING,"locale/fallback",PROPERTY_HINT_ENUM,options)); + } +#endif //load translations } @@ -609,12 +674,16 @@ void TranslationServer::_bind_methods() { ObjectTypeDB::bind_method(_MD("add_translation"),&TranslationServer::add_translation); ObjectTypeDB::bind_method(_MD("remove_translation"),&TranslationServer::remove_translation); + + ObjectTypeDB::bind_method(_MD("clear"),&TranslationServer::clear); + } void TranslationServer::load_translations() { String locale = get_locale(); bool found = _load_translations("locale/translations"); //all + if (_load_translations("locale/translations_"+locale.substr(0,2))) found=true; if ( locale.substr(0,2) != locale ) { @@ -623,17 +692,6 @@ void TranslationServer::load_translations() { } - if (!found && fallback!="") { //none found anywhere, use fallback - - _load_translations("locale/translations_"+fallback.substr(0,2)); - if ( fallback.substr(0,2) != fallback ) { - _load_translations("locale/translations_"+fallback); - } - - this->locale=fallback; - - } - } TranslationServer::TranslationServer() { |