Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #9246 from JosJuice/translation-eot
DolphinQt: Don't return 0x04 bytes from tr
  • Loading branch information
leoetlino committed Nov 18, 2020
2 parents 31d7be5 + 53da972 commit eb1581b
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions Source/Core/DolphinQt/Translation.cpp
Expand Up @@ -186,7 +186,7 @@ class MoFile
[](const char* a, const char* b) { return strcmp(a, b) < 0; });

if (iter == end || strcmp(*iter, original_string) != 0)
return original_string;
return nullptr;

u32 offset = ReadU32(&m_data[m_offset_translation_table + std::distance(begin, iter) * 8 + 4]);
return &m_data[offset];
Expand Down Expand Up @@ -214,17 +214,21 @@ class MoTranslator : public QTranslator
QString translate(const char* context, const char* source_text,
const char* disambiguation = nullptr, int n = -1) const override
{
const char* translated_text;

if (disambiguation)
{
std::string combined_string = disambiguation;
combined_string += '\4';
combined_string += source_text;
return QString::fromUtf8(m_mo_file.Translate(combined_string.c_str()));
translated_text = m_mo_file.Translate(combined_string.c_str());
}
else
{
return QString::fromUtf8(m_mo_file.Translate(source_text));
translated_text = m_mo_file.Translate(source_text);
}

return QString::fromUtf8(translated_text ? translated_text : source_text);
}

private:
Expand Down

0 comments on commit eb1581b

Please sign in to comment.