ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Partially revert "DolphinQt/Assembler: improve translatability" 

This reverts the parts of commit c8c9928eb1 that made translatability
worse rather than better. Changing "Error in column %2" to "%1 in column
%2" not only means that the translators have to check the i18n comments
to know what word hides behind %1, but there's also the problem that
the translator might need to translate "Error" in this context
differently from the standalone string "Error". Having to copy-paste
some HTML tags may be annoying for translators, but it's a far less
serious problem.
This commit is contained in:
JosJuice 2024-01-20 14:38:04 +01:00
parent db43f905e8
commit 6cd67e3937
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/DolphinQt/Debugger/AssembleInstructionDialog.cpp
View File

@ -17,10 +17,9 @@ namespace
{ {
QString HtmlFormatErrorLoc(const Common::GekkoAssembler::AssemblerError& err) QString HtmlFormatErrorLoc(const Common::GekkoAssembler::AssemblerError& err)
{ {
const QString error = QStringLiteral("<span style=\"color: red; font-weight: bold\">%1</span>") return QObject::tr("<span style=\"color: red; font-weight: bold\">Error</span> on line %1 col %2")
.arg(QObject::tr("Error")); .arg(err.line + 1)
// i18n: '%1' is the translation of 'Error' .arg(err.col + 1);
return QObject::tr("%1 in column %2").arg(error).arg(err.col + 1);
} }
QString HtmlFormatErrorLine(const Common::GekkoAssembler::AssemblerError& err) QString HtmlFormatErrorLine(const Common::GekkoAssembler::AssemblerError& err)

13
Source/Core/DolphinQt/Debugger/AssemblerWidget.cpp
View File

@ -48,10 +48,9 @@ using namespace Common::GekkoAssembler;
QString HtmlFormatErrorLoc(const AssemblerError& err) QString HtmlFormatErrorLoc(const AssemblerError& err)
{ {
const QString error = QStringLiteral("<span style=\"color: red; font-weight: bold\">%1</span>") return QObject::tr("<span style=\"color: red; font-weight: bold\">Error</span> on line %1 col %2")
.arg(QObject::tr("Error")); .arg(err.line + 1)
// i18n: '%1' is the translation of 'Error' .arg(err.col + 1);
return QObject::tr("%1 on line %1 column %2").arg(error).arg(err.line + 1).arg(err.col + 1);
} }
QString HtmlFormatErrorLine(const AssemblerError& err) QString HtmlFormatErrorLine(const AssemblerError& err)
@ -525,10 +524,8 @@ void AssemblerWidget::OnAssemble(std::vector<CodeBlock>* asm_out)
if (!good) if (!good)
{ {
base_address = 0; base_address = 0;
const QString warning = m_error_box->append(
QStringLiteral("<span style=\"color:#ffcc00\">%1</span>").arg(tr("Warning")); tr("<span style=\"color:#ffcc00\">Warning</span> invalid base address, defaulting to 0"));
// i18n: '%1' is the translation of 'Warning'
m_error_box->append(tr("%1 invalid base address, defaulting to 0").arg(warning));
} }
const std::string contents = active_editor->toPlainText().toStdString(); const std::string contents = active_editor->toPlainText().toStdString();