From b8a0473c68b05539442162c267242723c13dd01c Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Fri, 22 Mar 2024 08:00:03 +0100 Subject: Change toast for copying sha to clipboard to include what was copied This makes it easier to see that "y, enter" copies the full sha, whereas ctrl-o copies an abbreviated sha. --- pkg/gui/controllers/basic_commits_controller.go | 2 +- pkg/i18n/english.go | 2 -- pkg/i18n/japanese.go | 1 - pkg/i18n/korean.go | 1 - pkg/i18n/polish.go | 1 - pkg/i18n/russian.go | 1 - pkg/i18n/traditional_chinese.go | 1 - 7 files changed, 1 insertion(+), 8 deletions(-) (limited to 'pkg') diff --git a/pkg/gui/controllers/basic_commits_controller.go b/pkg/gui/controllers/basic_commits_controller.go index a589e3828..1fde39e8b 100644 --- a/pkg/gui/controllers/basic_commits_controller.go +++ b/pkg/gui/controllers/basic_commits_controller.go @@ -175,7 +175,7 @@ func (self *BasicCommitsController) copyCommitSHAToClipboard(commit *models.Comm return self.c.Error(err) } - self.c.Toast(self.c.Tr.CommitSHACopiedToClipboard) + self.c.Toast(fmt.Sprintf("'%s' %s", commit.Sha, self.c.Tr.CopiedToClipboard)) return nil } diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 1c976cb37..c191fa164 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -635,7 +635,6 @@ type TranslationSet struct { PushingTagStatus string PullRequestURLCopiedToClipboard string CommitDiffCopiedToClipboard string - CommitSHACopiedToClipboard string CommitURLCopiedToClipboard string CommitMessageCopiedToClipboard string CommitSubjectCopiedToClipboard string @@ -1599,7 +1598,6 @@ func EnglishTranslationSet() TranslationSet { PushingTagStatus: "Pushing tag", PullRequestURLCopiedToClipboard: "Pull request URL copied to clipboard", CommitDiffCopiedToClipboard: "Commit diff copied to clipboard", - CommitSHACopiedToClipboard: "Commit SHA copied to clipboard", CommitURLCopiedToClipboard: "Commit URL copied to clipboard", CommitMessageCopiedToClipboard: "Commit message copied to clipboard", CommitSubjectCopiedToClipboard: "Commit subject copied to clipboard", diff --git a/pkg/i18n/japanese.go b/pkg/i18n/japanese.go index 3b4a1076d..bb709bece 100644 --- a/pkg/i18n/japanese.go +++ b/pkg/i18n/japanese.go @@ -423,7 +423,6 @@ func japaneseTranslationSet() TranslationSet { // PushingTagStatus: "Pushing tag", PullRequestURLCopiedToClipboard: "Pull requestのURLがクリップボードにコピーされました", CommitDiffCopiedToClipboard: "コミットの差分がクリップボードにコピーされました", - CommitSHACopiedToClipboard: "コミットのSHAがクリップボードにコピーされました", CommitURLCopiedToClipboard: "コミットのURLがクリップボードにコピーされました", CommitMessageCopiedToClipboard: "コミットメッセージがクリップボードにコピーされました", CommitAuthorCopiedToClipboard: "コミットの作成者名がクリップボードにコピーされました", diff --git a/pkg/i18n/korean.go b/pkg/i18n/korean.go index e8a921b9a..dd9ba31c8 100644 --- a/pkg/i18n/korean.go +++ b/pkg/i18n/korean.go @@ -417,7 +417,6 @@ func koreanTranslationSet() TranslationSet { PushingTagStatus: "Pushing tag", PullRequestURLCopiedToClipboard: "풀 리퀘스트의 URL을 클립보드에 복사했습니다.", CommitDiffCopiedToClipboard: "커밋의 Diff를 클립보드에 복사했습니다.", - CommitSHACopiedToClipboard: "커밋의 SHA를 클립보드에 복사했습니다.", CommitURLCopiedToClipboard: "커밋의 URL를 클립보드에 복사했습니다.", CommitMessageCopiedToClipboard: "커밋 메시지를 클립보드에 복사했습니다.", CommitAuthorCopiedToClipboard: "커밋 작성자를 클립보드에 복사했습니다.", diff --git a/pkg/i18n/polish.go b/pkg/i18n/polish.go index f1e0a3e1c..ffcc8e27b 100644 --- a/pkg/i18n/polish.go +++ b/pkg/i18n/polish.go @@ -611,7 +611,6 @@ func polishTranslationSet() TranslationSet { PushingTagStatus: "Wysyłanie tagu", PullRequestURLCopiedToClipboard: "URL żądania ściągnięcia skopiowany do schowka", CommitDiffCopiedToClipboard: "Różnice commita skopiowane do schowka", - CommitSHACopiedToClipboard: "SHA commita skopiowany do schowka", CommitURLCopiedToClipboard: "URL commita skopiowany do schowka", CommitMessageCopiedToClipboard: "Wiadomość commita skopiowana do schowka", CommitSubjectCopiedToClipboard: "Temat commita skopiowany do schowka", diff --git a/pkg/i18n/russian.go b/pkg/i18n/russian.go index b48004e2e..0b4f2e618 100644 --- a/pkg/i18n/russian.go +++ b/pkg/i18n/russian.go @@ -480,7 +480,6 @@ func RussianTranslationSet() TranslationSet { PushingTagStatus: "Отправка тега", PullRequestURLCopiedToClipboard: "URL запроса на принятие изменений скопирован в буфер обмена", CommitDiffCopiedToClipboard: "Сравнения коммита скопированы в буфер обмена", - CommitSHACopiedToClipboard: "SHA коммита скопировано в буфер обмена", CommitURLCopiedToClipboard: "URL коммита скопирован в буфер обмена", CommitMessageCopiedToClipboard: "Сообщение коммита скопировано в буфер обмена", CommitSubjectCopiedToClipboard: "Тема коммита скопирована в буфер обмена", diff --git a/pkg/i18n/traditional_chinese.go b/pkg/i18n/traditional_chinese.go index a46509b24..54d283f00 100644 --- a/pkg/i18n/traditional_chinese.go +++ b/pkg/i18n/traditional_chinese.go @@ -511,7 +511,6 @@ func traditionalChineseTranslationSet() TranslationSet { PushingTagStatus: "正在推送標籤", PullRequestURLCopiedToClipboard: "複製拉取請求 URL 至剪貼簿", CommitDiffCopiedToClipboard: "已複製提交差異至剪貼簿", - CommitSHACopiedToClipboard: "已複製提交 SHA 至剪貼簿", CommitURLCopiedToClipboard: "已複製提交 URL 至剪貼簿", CommitMessageCopiedToClipboard: "已複製提交訊息至剪貼簿", CommitAuthorCopiedToClipboard: "已複製提交者至剪貼簿", -- cgit v1.2.3