From ee21b287899faba48c08c9e77d42a66543fc0597 Mon Sep 17 00:00:00 2001 From: Alf Henrik Sauge Date: Mon, 10 Aug 2026 16:23:07 +0200 Subject: [PATCH] Remove hardcoded append in translation texts Arguments need to be part of the translation text otherwise word re-ordering isn't possible --- l10n/gittyup_de.ts | 6 +++--- l10n/gittyup_en.ts | 6 +++--- l10n/gittyup_es.ts | 6 +++--- l10n/gittyup_ja.ts | 6 +++--- l10n/gittyup_pt.ts | 6 +++--- l10n/gittyup_pt_BR.ts | 6 +++--- l10n/gittyup_ru.ts | 6 +++--- l10n/gittyup_ta.ts | 12 ++++++------ l10n/gittyup_zh_CN.ts | 12 ++++++------ src/dialogs/SettingsDialog.cpp | 2 +- src/ui/DetailView.cpp | 6 +++--- src/ui/FileContextMenu.cpp | 6 +++--- 12 files changed, 40 insertions(+), 40 deletions(-) diff --git a/l10n/gittyup_de.ts b/l10n/gittyup_de.ts index ce6264446..370612898 100644 --- a/l10n/gittyup_de.ts +++ b/l10n/gittyup_de.ts @@ -363,17 +363,17 @@ AuthorCommitterDate - Author/Committer: + Author/Committer: %1 - Author: + Author: %1 - Committer: + Committer: %1 diff --git a/l10n/gittyup_en.ts b/l10n/gittyup_en.ts index 44992e452..064d64215 100644 --- a/l10n/gittyup_en.ts +++ b/l10n/gittyup_en.ts @@ -355,17 +355,17 @@ AuthorCommitterDate - Author/Committer: + Author/Committer: %1 - Author: + Author: %1 - Committer: + Committer: %1 diff --git a/l10n/gittyup_es.ts b/l10n/gittyup_es.ts index 18a52ad06..109251326 100644 --- a/l10n/gittyup_es.ts +++ b/l10n/gittyup_es.ts @@ -363,17 +363,17 @@ AuthorCommitterDate - Author/Committer: + Author/Committer: %1 - Author: + Author: %1 - Committer: + Committer: %1 diff --git a/l10n/gittyup_ja.ts b/l10n/gittyup_ja.ts index b2ed9212e..1df717a03 100644 --- a/l10n/gittyup_ja.ts +++ b/l10n/gittyup_ja.ts @@ -363,17 +363,17 @@ AuthorCommitterDate - Author/Committer: + Author/Committer: %1 - Author: + Author: %1 - Committer: + Committer: %1 diff --git a/l10n/gittyup_pt.ts b/l10n/gittyup_pt.ts index 9a8e86e6b..c2b78b18b 100644 --- a/l10n/gittyup_pt.ts +++ b/l10n/gittyup_pt.ts @@ -363,17 +363,17 @@ AuthorCommitterDate - Author/Committer: + Author/Committer: %1 - Author: + Author: %1 - Committer: + Committer: %1 diff --git a/l10n/gittyup_pt_BR.ts b/l10n/gittyup_pt_BR.ts index 7414996c0..7319fa7f4 100644 --- a/l10n/gittyup_pt_BR.ts +++ b/l10n/gittyup_pt_BR.ts @@ -423,17 +423,17 @@ AuthorCommitterDate - Author/Committer: + Author/Committer: %1 - Author: + Author: %1 - Committer: + Committer: %1 diff --git a/l10n/gittyup_ru.ts b/l10n/gittyup_ru.ts index 4046c40c1..03addef4e 100644 --- a/l10n/gittyup_ru.ts +++ b/l10n/gittyup_ru.ts @@ -363,17 +363,17 @@ AuthorCommitterDate - Author/Committer: + Author/Committer: %1 - Author: + Author: %1 - Committer: + Committer: %1 diff --git a/l10n/gittyup_ta.ts b/l10n/gittyup_ta.ts index f9927dbe4..182a97ac1 100644 --- a/l10n/gittyup_ta.ts +++ b/l10n/gittyup_ta.ts @@ -288,16 +288,16 @@ AuthorCommitterDate - Author/Committer: - ஆசிரியர்/கமிட்டி: + Author/Committer: %1 + ஆசிரியர்/கமிட்டி: %1 - Author: - ஆசிரியர்: + Author: %1 + ஆசிரியர்: %1 - Committer: - ஆணையர்: + Committer: %1 + ஆணையர்: %1 diff --git a/l10n/gittyup_zh_CN.ts b/l10n/gittyup_zh_CN.ts index d978f4a24..a9a11a5e2 100644 --- a/l10n/gittyup_zh_CN.ts +++ b/l10n/gittyup_zh_CN.ts @@ -363,18 +363,18 @@ AuthorCommitterDate - Author/Committer: - 作者/提交者： + Author/Committer: %1 + 作者/提交者： %1 - Author: - 作者： + Author: %1 + 作者： %1 - Committer: - 提交者： + Committer: %1 + 提交者： %1 diff --git a/src/dialogs/SettingsDialog.cpp b/src/dialogs/SettingsDialog.cpp index 786f7a058..3661b2a44 100644 --- a/src/dialogs/SettingsDialog.cpp +++ b/src/dialogs/SettingsDialog.cpp @@ -273,7 +273,7 @@ class GeneralPanel : public QWidget { } mStoreCredentials->setChecked(checked); - QString info = tr("") + ""; + QString info = "
"; for (const auto &helper : CredentialHelper::getAvailableHelperInformation()) { info += QStringLiteral("
%1%2") diff --git a/src/ui/DetailView.cpp b/src/ui/DetailView.cpp index bb57f1201..c753e9d75 100644 --- a/src/ui/DetailView.cpp +++ b/src/ui/DetailView.cpp @@ -178,13 +178,13 @@ class AuthorCommitterDate : public QWidget { void setAuthorCommitter(const QString &author, const QString &committer) { mSameAuthorCommitter = author == committer; if (mSameAuthorCommitter) { - mAuthor->setText(tr("Author/Committer: ") + author); + mAuthor->setText(tr("Author/Committer: %1").arg(author)); mAuthor->adjustSize(); mCommitter->setVisible(false); } else { - mAuthor->setText(tr("Author: ") + author); + mAuthor->setText(tr("Author: %1").arg(author)); mAuthor->adjustSize(); - mCommitter->setText(tr("Committer: ") + committer); + mCommitter->setText(tr("Committer: %1").arg(committer)); mCommitter->adjustSize(); mCommitter->setVisible(true); } diff --git a/src/ui/FileContextMenu.cpp b/src/ui/FileContextMenu.cpp index 3e79cc71d..ba32ce2a5 100644 --- a/src/ui/FileContextMenu.cpp +++ b/src/ui/FileContextMenu.cpp @@ -422,8 +422,8 @@ void FileContextMenu::handleCommits(const QList &commits, view->addLogEntry(tr("Saving files"), tr("Saving files of selected version to disk")); for (const auto &file : files) { - const auto saveFile = - view->addLogEntry(tr("Save file ") + file, "Save file", save); + const auto saveFile = view->addLogEntry( + tr("Save file %1").arg(file), "Save file", save); // assumption. file is a file not a folder! if (!exportFile(view, folder, file)) view->error(saveFile, "save file", file, tr("Invalid Blob")); @@ -439,7 +439,7 @@ void FileContextMenu::handleCommits(const QList &commits, auto filename = file.split("/").last(); auto logentry = - view->addLogEntry(tr("Opening file"), tr("Open ") + filename); + view->addLogEntry(tr("Opening file"), tr("Open %1").arg(filename)); if (exportFile(view, folder, file)) QDesktopServices::openUrl(QUrl::fromLocalFile(