diff --git a/pkg/gui/controllers/branches_controller.go b/pkg/gui/controllers/branches_controller.go index 3c18b955c..faec08e65 100644 --- a/pkg/gui/controllers/branches_controller.go +++ b/pkg/gui/controllers/branches_controller.go @@ -544,7 +544,7 @@ func (self *BranchesController) fastForward(branch *models.Branch) error { }, ) - return self.c.WithLoaderPanel(message, func(task gocui.Task) error { + return self.c.WithWaitingStatus(message, func(task gocui.Task) error { worktree, ok := self.worktreeForBranch(branch) if ok { self.c.LogAction(action) diff --git a/pkg/gui/controllers/files_controller.go b/pkg/gui/controllers/files_controller.go index 2ecdc39e5..75fa52da4 100644 --- a/pkg/gui/controllers/files_controller.go +++ b/pkg/gui/controllers/files_controller.go @@ -800,7 +800,7 @@ func (self *FilesController) onClickSecondary(opts gocui.ViewMouseBindingOpts) e } func (self *FilesController) fetch() error { - return self.c.WithLoaderPanel(self.c.Tr.FetchWait, func(task gocui.Task) error { + return self.c.WithWaitingStatus(self.c.Tr.FetchingStatus, func(task gocui.Task) error { if err := self.fetchAux(task); err != nil { _ = self.c.Error(err) } diff --git a/pkg/gui/controllers/sync_controller.go b/pkg/gui/controllers/sync_controller.go index 2ec22b2a4..a77d047a6 100644 --- a/pkg/gui/controllers/sync_controller.go +++ b/pkg/gui/controllers/sync_controller.go @@ -140,7 +140,7 @@ type PullFilesOptions struct { } func (self *SyncController) PullAux(opts PullFilesOptions) error { - return self.c.WithLoaderPanel(self.c.Tr.PullWait, func(task gocui.Task) error { + return self.c.WithWaitingStatus(self.c.Tr.PullingStatus, func(task gocui.Task) error { return self.pullWithLock(task, opts) }) } @@ -168,7 +168,7 @@ type pushOpts struct { } func (self *SyncController) pushAux(opts pushOpts) error { - return self.c.WithLoaderPanel(self.c.Tr.PushWait, func(task gocui.Task) error { + return self.c.WithWaitingStatus(self.c.Tr.PushingStatus, func(task gocui.Task) error { self.c.LogAction(self.c.Tr.Actions.Push) err := self.c.Git().Sync.Push( task, diff --git a/pkg/i18n/chinese.go b/pkg/i18n/chinese.go index b7ec74811..920ada76b 100644 --- a/pkg/i18n/chinese.go +++ b/pkg/i18n/chinese.go @@ -72,9 +72,6 @@ func chineseTranslationSet() TranslationSet { MergeConflictsTitle: "合并冲突", Checkout: "检出", NoChangedFiles: "没有更改过文件", - PullWait: "正在拉取…", - PushWait: "正在推送…", - FetchWait: "正在抓取…", SoftReset: "软重置", AlreadyCheckedOutBranch: "您已经检出至此分支", SureForceCheckout: "您确定要强制检出吗？您将丢失所有本地更改", @@ -223,6 +220,9 @@ func chineseTranslationSet() TranslationSet { AmendCommitPrompt: "您确定要使用暂存文件来修改此提交吗？", DeleteCommitTitle: "删除提交", DeleteCommitPrompt: "您确定要删除此提交吗？", + PullingStatus: "正在拉取", + PushingStatus: "正在推送", + FetchingStatus: "正在抓取", SquashingStatus: "正在压缩", FixingStatus: "正在修正", DeletingStatus: "正在删除", diff --git a/pkg/i18n/dutch.go b/pkg/i18n/dutch.go index 284a81b60..cba5f1482 100644 --- a/pkg/i18n/dutch.go +++ b/pkg/i18n/dutch.go @@ -38,9 +38,6 @@ func dutchTranslationSet() TranslationSet { ResetFilter: "Reset commit file state filter", MergeConflictsTitle: "Merge conflicten", Checkout: "Uitchecken", - PullWait: "Pullen...", - PushWait: "Pushen...", - FetchWait: "Fetchen...", SoftReset: "Zacht reset", AlreadyCheckedOutBranch: "Je hebt deze branch al uitgecheckt", SureForceCheckout: "Weet je zeker dat je het uitchecken wil forceren? Al je lokale verandering zullen worden verwijdert", @@ -187,6 +184,9 @@ func dutchTranslationSet() TranslationSet { AmendCommitPrompt: "Weet je zeker dat je deze commit wil wijzigen met de vorige staged bestanden?", DeleteCommitTitle: "Verwijder commit", DeleteCommitPrompt: "Weet je zeker dat je deze commit wil verwijderen?", + PullingStatus: "Pullen", + PushingStatus: "Pushen", + FetchingStatus: "Fetchen", SquashingStatus: "Squashen", FixingStatus: "Fixing up", DeletingStatus: "Verwijderen", diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 0aa1baeb8..59a37055a 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -58,9 +58,6 @@ type TranslationSet struct { MergeConflictsTitle string Checkout string NoChangedFiles string - PullWait string - PushWait string - FetchWait string SoftReset string AlreadyCheckedOutBranch string SureForceCheckout string @@ -253,6 +250,9 @@ type TranslationSet struct { AmendCommitPrompt string DeleteCommitTitle string DeleteCommitPrompt string + PullingStatus string + PushingStatus string + FetchingStatus string SquashingStatus string FixingStatus string DeletingStatus string @@ -848,9 +848,6 @@ func EnglishTranslationSet() TranslationSet { FilterUnstagedFiles: "Show only unstaged files", ResetFilter: "Reset filter", NoChangedFiles: "No changed files", - PullWait: "Pulling...", - PushWait: "Pushing...", - FetchWait: "Fetching...", SoftReset: "Soft reset", AlreadyCheckedOutBranch: "You have already checked out this branch", SureForceCheckout: "Are you sure you want force checkout? You will lose all local changes", @@ -1049,6 +1046,9 @@ func EnglishTranslationSet() TranslationSet { AmendCommitPrompt: "Are you sure you want to amend this commit with your staged files?", DeleteCommitTitle: "Delete commit", DeleteCommitPrompt: "Are you sure you want to delete this commit?", + PullingStatus: "Pulling", + PushingStatus: "Pushing", + FetchingStatus: "Fetching", SquashingStatus: "Squashing", FixingStatus: "Fixing up", DeletingStatus: "Deleting", diff --git a/pkg/i18n/japanese.go b/pkg/i18n/japanese.go index 1b8c53065..03e4ff6f4 100644 --- a/pkg/i18n/japanese.go +++ b/pkg/i18n/japanese.go @@ -63,9 +63,6 @@ func japaneseTranslationSet() TranslationSet { FilterUnstagedFiles: "ステージされていないファイルのみを表示", ResetFilter: "フィルタをリセット", // NoChangedFiles: "No changed files", - PullWait: "Pull中...", - PushWait: "Push中...", - FetchWait: "Fetch中...", SoftReset: "Softリセット", AlreadyCheckedOutBranch: "ブランチはすでにチェックアウトされています。", // SureForceCheckout: "Are you sure you want force checkout? You will lose all local changes", @@ -227,6 +224,9 @@ func japaneseTranslationSet() TranslationSet { AmendCommitPrompt: "ステージされたファイルで現在のコミットをamendします。よろしいですか?", DeleteCommitTitle: "コミットを削除", DeleteCommitPrompt: "選択されたコミットを削除します。よろしいですか?", + PullingStatus: "Pull中", + PushingStatus: "Push中", + FetchingStatus: "Fetch中", // SquashingStatus: "Squashing", // FixingStatus: "Fixing up", // DeletingStatus: "Deleting", diff --git a/pkg/i18n/korean.go b/pkg/i18n/korean.go index 9c859ec60..e57215f90 100644 --- a/pkg/i18n/korean.go +++ b/pkg/i18n/korean.go @@ -62,9 +62,6 @@ func koreanTranslationSet() TranslationSet { FilterUnstagedFiles: "Stage되지 않은 파일만 표시", ResetFilter: "필터 리셋", NoChangedFiles: "변경된 파일이 없습니다.", - PullWait: "업데이트 중...", - PushWait: "푸시 중...", - FetchWait: "패치 중...", SoftReset: "소프트 리셋", AlreadyCheckedOutBranch: "브랜치가 이미 체크아웃 되었습니다", SureForceCheckout: "강제로 체크아웃하시겠습니까? 모든 로컬 변경 사항을 잃게 됩니다.", @@ -224,6 +221,9 @@ func koreanTranslationSet() TranslationSet { AmendCommitPrompt: "Are you sure you want to amend this commit with your staged files?", DeleteCommitTitle: "커밋 삭제", DeleteCommitPrompt: "정말로 선택한 커밋을 삭제하시겠습니까?", + PullingStatus: "업데이트 중", + PushingStatus: "푸시 중", + FetchingStatus: "패치 중", SquashingStatus: "Squashing", FixingStatus: "Fixing up", DeletingStatus: "Deleting", diff --git a/pkg/i18n/polish.go b/pkg/i18n/polish.go index 5ec7b9548..ecab04281 100644 --- a/pkg/i18n/polish.go +++ b/pkg/i18n/polish.go @@ -34,9 +34,6 @@ func polishTranslationSet() TranslationSet { ResetFilter: "Resetuj filtr commitów", Checkout: "Przełącz", NoChangedFiles: "Brak zmienionych plików", - PullWait: "Pobieranie zmian...", - PushWait: "Wysyłanie zmian...", - FetchWait: "Pobieram...", AlreadyCheckedOutBranch: "Już przęłączono na tą gałąź", SureForceCheckout: "Jesteś pewny, że chcesz wymusić przełączenie? Stracisz wszystkie lokalne zmiany", ForceCheckoutBranch: "Wymuś przełączenie gałęzi", @@ -153,6 +150,9 @@ func polishTranslationSet() TranslationSet { AmendCommitPrompt: "Czy na pewno chcesz poprawić ten commit plikami z poczekalni?", DeleteCommitTitle: "Usuń commit", DeleteCommitPrompt: "Czy na pewno usunąć ten commit?", + PullingStatus: "Pobieranie zmian", + PushingStatus: "Wysyłanie zmian", + FetchingStatus: "Pobieram", SquashingStatus: "Spłaszczanie", FixingStatus: "Naprawianie", DeletingStatus: "Usuwanie", diff --git a/pkg/i18n/russian.go b/pkg/i18n/russian.go index 967e91c12..d0f6ccb3b 100644 --- a/pkg/i18n/russian.go +++ b/pkg/i18n/russian.go @@ -81,9 +81,6 @@ func RussianTranslationSet() TranslationSet { FilterUnstagedFiles: "Показывать только непроиндексированные файлы", ResetFilter: "Сбросить фильтр", NoChangedFiles: "Нет изменённых файлов", - PullWait: "Получение и слияние изменении...", - PushWait: "Отправка изменении...", - FetchWait: "Получение изменении...", SoftReset: "Мягкий сброс", AlreadyCheckedOutBranch: "Вы уже переключились в эту ветку", SureForceCheckout: "Вы уверены, что хотите принудительная переключить? Вы потеряете все локальные изменения", @@ -268,6 +265,9 @@ func RussianTranslationSet() TranslationSet { AmendCommitPrompt: "Вы уверены, что хотите править этот коммит проиндексированными файлами?", DeleteCommitTitle: "Удалить коммит", DeleteCommitPrompt: "Вы уверены, что хотите удалить этот коммит?", + PullingStatus: "Получение и слияние изменении", + PushingStatus: "Отправка изменении", + FetchingStatus: "Получение изменении", SquashingStatus: "Объединение коммитов", FixingStatus: "Объединение коммитов, отбросив сообщение коммита", DeletingStatus: "Удаление", diff --git a/pkg/i18n/traditional_chinese.go b/pkg/i18n/traditional_chinese.go index 896441784..e3978ef05 100644 --- a/pkg/i18n/traditional_chinese.go +++ b/pkg/i18n/traditional_chinese.go @@ -114,9 +114,6 @@ func traditionalChineseTranslationSet() TranslationSet { FilterUnstagedFiles: "僅顯示未預存的檔案", ResetFilter: "重設篩選", NoChangedFiles: "沒有變更的檔案", - PullWait: "拉取...", - PushWait: "推送...", - FetchWait: "擷取...", SoftReset: "軟重設", AlreadyCheckedOutBranch: "你已經檢出這個分支了", SureForceCheckout: "你確定要強制檢出嗎？這將會使你失去本地的所有更改", @@ -299,6 +296,9 @@ func traditionalChineseTranslationSet() TranslationSet { AmendCommitPrompt: "你確定要使用預存的檔案修正此提交嗎？", DeleteCommitTitle: "刪除提交", DeleteCommitPrompt: "你確定要刪除此提交嗎？", + PullingStatus: "拉取", + PushingStatus: "推送", + FetchingStatus: "擷取", SquashingStatus: "壓縮中", FixingStatus: "修復中", DeletingStatus: "刪除中",