Skip to content

Remove hardcoded append in translation texts #987

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AHSauge wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove hardcoded append in translation texts #987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions l10n/gittyup_de.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,17 +363,17 @@
<name>AuthorCommitterDate</name>
<message>
<location filename="../src/ui/DetailView.cpp" line="178"/>
<source>Author/Committer: </source>
<source>Author/Committer: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/ui/DetailView.cpp" line="182"/>
<source>Author: </source>
<source>Author: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/ui/DetailView.cpp" line="184"/>
<source>Committer: </source>
<source>Committer: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
Expand Down
6 changes: 3 additions & 3 deletions l10n/gittyup_en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,17 +355,17 @@
<name>AuthorCommitterDate</name>
<message>
<location filename="../src/ui/DetailView.cpp" line="178"/>
<source>Author/Committer: </source>
<source>Author/Committer: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/ui/DetailView.cpp" line="182"/>
<source>Author: </source>
<source>Author: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/ui/DetailView.cpp" line="184"/>
<source>Committer: </source>
<source>Committer: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
Expand Down
6 changes: 3 additions & 3 deletions l10n/gittyup_es.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,17 +363,17 @@
<name>AuthorCommitterDate</name>
<message>
<location filename="../src/ui/DetailView.cpp" line="178"/>
<source>Author/Committer: </source>
<source>Author/Committer: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/ui/DetailView.cpp" line="182"/>
<source>Author: </source>
<source>Author: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/ui/DetailView.cpp" line="184"/>
<source>Committer: </source>
<source>Committer: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
Expand Down
6 changes: 3 additions & 3 deletions l10n/gittyup_ja.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,17 +363,17 @@
<name>AuthorCommitterDate</name>
<message>
<location filename="../src/ui/DetailView.cpp" line="178"/>
<source>Author/Committer: </source>
<source>Author/Committer: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/ui/DetailView.cpp" line="182"/>
<source>Author: </source>
<source>Author: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/ui/DetailView.cpp" line="184"/>
<source>Committer: </source>
<source>Committer: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
Expand Down
6 changes: 3 additions & 3 deletions l10n/gittyup_pt.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,17 +363,17 @@
<name>AuthorCommitterDate</name>
<message>
<location filename="../src/ui/DetailView.cpp" line="178"/>
<source>Author/Committer: </source>
<source>Author/Committer: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/ui/DetailView.cpp" line="182"/>
<source>Author: </source>
<source>Author: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/ui/DetailView.cpp" line="184"/>
<source>Committer: </source>
<source>Committer: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
Expand Down
6 changes: 3 additions & 3 deletions l10n/gittyup_pt_BR.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,17 +423,17 @@
<name>AuthorCommitterDate</name>
<message>
<location filename="../src/ui/DetailView.cpp" line="178"/>
<source>Author/Committer: </source>
<source>Author/Committer: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/ui/DetailView.cpp" line="182"/>
<source>Author: </source>
<source>Author: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/ui/DetailView.cpp" line="184"/>
<source>Committer: </source>
<source>Committer: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
Expand Down
6 changes: 3 additions & 3 deletions l10n/gittyup_ru.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,17 +363,17 @@
<name>AuthorCommitterDate</name>
<message>
<location filename="../src/ui/DetailView.cpp" line="178"/>
<source>Author/Committer: </source>
<source>Author/Committer: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/ui/DetailView.cpp" line="182"/>
<source>Author: </source>
<source>Author: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/ui/DetailView.cpp" line="184"/>
<source>Committer: </source>
<source>Committer: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
Expand Down
12 changes: 6 additions & 6 deletions l10n/gittyup_ta.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,16 +288,16 @@
<context>
<name>AuthorCommitterDate</name>
<message>
<source>Author/Committer: </source>
<translation>ஆசிரியர்/கமிட்டி:</translation>
<source>Author/Committer: %1</source>
<translation>ஆசிரியர்/கமிட்டி: %1</translation>
</message>
<message>
<source>Author: </source>
<translation>ஆசிரியர்:</translation>
<source>Author: %1</source>
<translation>ஆசிரியர்: %1</translation>
</message>
<message>
<source>Committer: </source>
<translation>ஆணையர்:</translation>
<source>Committer: %1</source>
<translation>ஆணையர்: %1</translation>
</message>
</context>
<context>
Expand Down
12 changes: 6 additions & 6 deletions l10n/gittyup_zh_CN.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,18 +363,18 @@
<name>AuthorCommitterDate</name>
<message>
<location filename="../src/ui/DetailView.cpp" line="178"/>
<source>Author/Committer: </source>
<translation>作者/提交者：</translation>
<source>Author/Committer: %1</source>
<translation>作者/提交者： %1</translation>
</message>
<message>
<location filename="../src/ui/DetailView.cpp" line="182"/>
<source>Author: </source>
<translation>作者：</translation>
<source>Author: %1</source>
<translation>作者： %1</translation>
</message>
<message>
<location filename="../src/ui/DetailView.cpp" line="184"/>
<source>Committer: </source>
<translation>提交者：</translation>
<source>Committer: %1</source>
<translation>提交者： %1</translation>
</message>
</context>
<context>
Expand Down
2 changes: 1 addition & 1 deletion src/dialogs/SettingsDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ class GeneralPanel : public QWidget {
}
mStoreCredentials->setChecked(checked);

QString info = tr("") + "<table>";
QString info = "<table>";
for (const auto &helper :
CredentialHelper::getAvailableHelperInformation()) {
info += QStringLiteral("<tr><td><b>%1</b></td><td>%2</td><td>")
Expand Down
6 changes: 3 additions & 3 deletions src/ui/DetailView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
6 changes: 3 additions & 3 deletions src/ui/FileContextMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,8 +422,8 @@ void FileContextMenu::handleCommits(const QList<git::Commit> &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"));
Expand All @@ -439,7 +439,7 @@ void FileContextMenu::handleCommits(const QList<git::Commit> &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(
Expand Down
Loading