aboutsummaryrefslogtreecommitdiff
path: root/common/translation.cpp
diff options
context:
space:
mode:
authorAlejandro Marzini2010-08-16 00:21:07 +0000
committerAlejandro Marzini2010-08-16 00:21:07 +0000
commitb0409d673921163085d2e2fa440911080a7cf884 (patch)
tree81b1bb895db6baed7881ca5cbc7ff3a830286189 /common/translation.cpp
parent503578ac1087b91dcb912fd7918454de73538b34 (diff)
parentb49761b6eae3a0aadefef4c4ffee6a7b583cc3ac (diff)
downloadscummvm-rg350-b0409d673921163085d2e2fa440911080a7cf884.tar.gz
scummvm-rg350-b0409d673921163085d2e2fa440911080a7cf884.tar.bz2
scummvm-rg350-b0409d673921163085d2e2fa440911080a7cf884.zip
Merge trunk, from r51777 to r52105
svn-id: r52108
Diffstat (limited to 'common/translation.cpp')
-rw-r--r--common/translation.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/common/translation.cpp b/common/translation.cpp
index b52aad0d1f..36ce4be83f 100644
--- a/common/translation.cpp
+++ b/common/translation.cpp
@@ -211,6 +211,10 @@ String TranslationManager::getTranslation(const String &message) {
const TLangArray TranslationManager::getSupportedLanguageNames() const {
return TLangArray();
}
+
+const char *TranslationManager::getCurrentCharset() {
+ return "ASCII";
+}
#endif // USE_TRANSLATION