ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-05-21 05:40:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

COMMON: Properly process translations with context in TransMan in .po

Browse Source
This commit is contained in:
Eugene Sandulenko
2026-03-02 02:21:22 +01:00
parent ef5f8ff51d
commit 3eb74d00a8
2 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/translation.cpp
+27 -3
View File
@@ -120,7 +120,7 @@ U32String TranslationManager::getTranslation(const char *message) const {
return getTranslation(message, nullptr);
}
U32String TranslationManager::getPoTranslation(const char* message) const {
U32String TranslationManager::getPoTranslation(const char *message) const {
if (_currentTranslationMessages.empty() || *message == '\0')
return U32String(message);
@@ -132,9 +132,27 @@ U32String TranslationManager::getPoTranslation(const char* message) const {
return _currentTranslationMessages[messageIndex].msgstr.decode();
}
U32String TranslationManager::getPoTranslation(const char *message, const char *context) const {
if (_currentTranslationMessages.empty() || *message == '\0')
return U32String(message);
Common::String key = message;
if (context && *context != '\0') {
key += "\x04"; // Use the same separation mark as gettext does for context
key += context;
}
int messageIndex = _poTranslations.getValOrDefault(key.c_str(), -1);
if (messageIndex == -1)
return U32String(message);
return _currentTranslationMessages[messageIndex].msgstr.decode();
}
U32String TranslationManager::getTranslation(const char *message, const char *context) const {
if (_usingPo)
return getPoTranslation(message);
return getPoTranslation(message, context);
// If no language is set or message is empty, return msgid as is
if (_currentTranslationMessages.empty() || *message == '\0')
@@ -447,8 +465,14 @@ bool TranslationManager::loadLanguagePo(int index) {
_currentTranslationMessages.reserve(numEntries);
for (int i = 0; i < numEntries; ++i) {
const Common::PlainPoMessageEntry *entry = poData->entry(i);
Common::String key = entry->msgid;
_poTranslations[entry->msgid] = i;
if (entry->msgctxt) {
key += "\x04"; // Use the same separation mark as gettext does for context
key += entry->msgctxt;
}
_poTranslations[key] = i;
PoMessageEntry engineEntry;
engineEntry.msgid = i;
engineEntry.msgstr = entry->msgstr;
common/translation.h
+2 -1
View File
@@ -257,11 +257,12 @@ private:
/**
* Return the translation of @p message into the current language loaded from a .po file.
*
*
* In case the message is not found in the translation catalog,
* return the original untranslated message, as a U32String.
*/
U32String getPoTranslation(const char *message) const;
U32String getPoTranslation(const char *message, const char *context) const;
/**
* Load the translation for the given language from its .po file.