diff --git a/docs/keybindings/Keybindings_en.md b/docs/keybindings/Keybindings_en.md index f6c622b07..867e7a884 100644 --- a/docs/keybindings/Keybindings_en.md +++ b/docs/keybindings/Keybindings_en.md @@ -190,7 +190,7 @@ Note that this disregards the selection, the new branch is always created either | `` 0 `` | Focus main view | | | `` `` | View commits | | | `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## Main panel (merging) @@ -261,7 +261,7 @@ Note that this disregards the selection, the new branch is always created either |-----|--------|-------------| | `` `` | Execute | | | `` `` | Close | | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## Reflog @@ -283,7 +283,7 @@ Note that this disregards the selection, the new branch is always created either | `` 0 `` | Focus main view | | | `` `` | View commits | | | `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## Remote branches @@ -302,7 +302,7 @@ Note that this disregards the selection, the new branch is always created either | `` 0 `` | Focus main view | | | `` `` | View commits | | | `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## Remotes @@ -313,7 +313,7 @@ Note that this disregards the selection, the new branch is always created either | `` d `` | Remove | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. | | `` e `` | Edit | Edit the selected remote's name or URL. | | `` f `` | Fetch | Fetch updates from the remote repository. This retrieves new commits and branches without merging them into your local branches. | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## Secondary @@ -335,7 +335,7 @@ Note that this disregards the selection, the new branch is always created either | `` 0 `` | Focus main view | | | `` `` | View files | | | `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## Status @@ -381,7 +381,7 @@ Note that this disregards the selection, the new branch is always created either | `` e `` | Update submodule URL | | | `` i `` | Initialize | Initialize the selected submodule to prepare for fetching. You probably want to follow this up by invoking the 'update' action to fetch the submodule. | | `` b `` | View bulk submodule options | | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## Tags @@ -397,7 +397,7 @@ Note that this disregards the selection, the new branch is always created either | `` 0 `` | Focus main view | | | `` `` | View commits | | | `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## Worktrees @@ -407,4 +407,4 @@ Note that this disregards the selection, the new branch is always created either | `` `` | Switch | Switch to the selected worktree. | | `` o `` | Open in editor | | | `` d `` | Remove | Remove the selected worktree. This will both delete the worktree's directory, as well as metadata about the worktree in the .git directory. | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | diff --git a/docs/keybindings/Keybindings_ja.md b/docs/keybindings/Keybindings_ja.md index 199825c9f..9a690d6af 100644 --- a/docs/keybindings/Keybindings_ja.md +++ b/docs/keybindings/Keybindings_ja.md @@ -71,7 +71,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | `` 0 `` | Focus main view | | | `` `` | View files | | | `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## Sub-commits @@ -103,7 +103,7 @@ Note that this disregards the selection, the new branch is always created either | `` `` | Switch | Switch to the selected worktree. | | `` o `` | Open in editor | | | `` d `` | Remove | Remove the selected worktree. This will both delete the worktree's directory, as well as metadata about the worktree in the .git directory. | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## コミット @@ -187,7 +187,7 @@ Note that this disregards the selection, the new branch is always created either | `` e `` | サブモジュールのURLを更新 | | | `` i `` | Initialize | サブモジュールを初期化 | | `` b `` | View bulk submodule options | | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## ステータス @@ -213,7 +213,7 @@ Note that this disregards the selection, the new branch is always created either | `` 0 `` | Focus main view | | | `` `` | コミットを閲覧 | | | `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## ファイル @@ -277,7 +277,7 @@ Note that this disregards the selection, the new branch is always created either | `` 0 `` | Focus main view | | | `` `` | コミットを閲覧 | | | `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## メインパネル (Merging) @@ -348,7 +348,7 @@ Note that this disregards the selection, the new branch is always created either |-----|--------|-------------| | `` `` | 実行 | | | `` `` | 閉じる | | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## リモート @@ -359,7 +359,7 @@ Note that this disregards the selection, the new branch is always created either | `` d `` | Remove | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. | | `` e `` | 編集 | リモートを編集 | | `` f `` | Fetch | リモートをfetch | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## リモートブランチ @@ -378,7 +378,7 @@ Note that this disregards the selection, the new branch is always created either | `` 0 `` | Focus main view | | | `` `` | コミットを閲覧 | | | `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## 参照ログ @@ -400,7 +400,7 @@ Note that this disregards the selection, the new branch is always created either | `` 0 `` | Focus main view | | | `` `` | コミットを閲覧 | | | `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## 確認パネル diff --git a/docs/keybindings/Keybindings_ko.md b/docs/keybindings/Keybindings_ko.md index f5c18a964..041d508da 100644 --- a/docs/keybindings/Keybindings_ko.md +++ b/docs/keybindings/Keybindings_ko.md @@ -71,7 +71,7 @@ Note that this disregards the selection, the new branch is always created either | `` 0 `` | Focus main view | | | `` `` | 커밋 보기 | | | `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## Secondary @@ -93,7 +93,7 @@ Note that this disregards the selection, the new branch is always created either | `` 0 `` | Focus main view | | | `` `` | View selected item's files | | | `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## Sub-commits @@ -125,7 +125,7 @@ Note that this disregards the selection, the new branch is always created either | `` `` | Switch | Switch to the selected worktree. | | `` o `` | Open in editor | | | `` d `` | Remove | Remove the selected worktree. This will both delete the worktree's directory, as well as metadata about the worktree in the .git directory. | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## 메뉴 @@ -133,7 +133,7 @@ Note that this disregards the selection, the new branch is always created either |-----|--------|-------------| | `` `` | 실행 | | | `` `` | 닫기 | | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## 메인 패널 (Merging) @@ -227,7 +227,7 @@ Note that this disregards the selection, the new branch is always created either | `` 0 `` | Focus main view | | | `` `` | 커밋 보기 | | | `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## 상태 @@ -251,7 +251,7 @@ Note that this disregards the selection, the new branch is always created either | `` e `` | 서브모듈의 URL을 수정 | | | `` i `` | Initialize | 서브모듈 초기화 | | `` b `` | View bulk submodule options | | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## 원격 @@ -262,7 +262,7 @@ Note that this disregards the selection, the new branch is always created either | `` d `` | Remove | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. | | `` e `` | Edit | Remote를 수정 | | `` f `` | Fetch | 원격을 업데이트 | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## 원격 브랜치 @@ -281,7 +281,7 @@ Note that this disregards the selection, the new branch is always created either | `` 0 `` | Focus main view | | | `` `` | 커밋 보기 | | | `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## 커밋 @@ -367,7 +367,7 @@ Note that this disregards the selection, the new branch is always created either | `` 0 `` | Focus main view | | | `` `` | 커밋 보기 | | | `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## 파일 diff --git a/docs/keybindings/Keybindings_nl.md b/docs/keybindings/Keybindings_nl.md index b0b23d254..08d02349d 100644 --- a/docs/keybindings/Keybindings_nl.md +++ b/docs/keybindings/Keybindings_nl.md @@ -120,7 +120,7 @@ Note that this disregards the selection, the new branch is always created either | `` 0 `` | Focus main view | | | `` `` | Bekijk commits | | | `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## Commit bericht @@ -198,7 +198,7 @@ Note that this disregards the selection, the new branch is always created either |-----|--------|-------------| | `` `` | Uitvoeren | | | `` `` | Sluiten | | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## Mergen @@ -261,7 +261,7 @@ Note that this disregards the selection, the new branch is always created either | `` 0 `` | Focus main view | | | `` `` | Bekijk commits | | | `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## Remote branches @@ -280,7 +280,7 @@ Note that this disregards the selection, the new branch is always created either | `` 0 `` | Focus main view | | | `` `` | Bekijk commits | | | `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## Remotes @@ -291,7 +291,7 @@ Note that this disregards the selection, the new branch is always created either | `` d `` | Remove | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. | | `` e `` | Edit | Wijzig remote | | `` f `` | Fetch | Fetch remote | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## Secondary @@ -335,7 +335,7 @@ Note that this disregards the selection, the new branch is always created either | `` 0 `` | Focus main view | | | `` `` | Bekijk gecommite bestanden | | | `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## Status @@ -381,7 +381,7 @@ Note that this disregards the selection, the new branch is always created either | `` e `` | Update submodule URL | | | `` i `` | Initialize | Initialiseer submodule | | `` b `` | Bekijk bulk submodule opties | | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## Tags @@ -397,7 +397,7 @@ Note that this disregards the selection, the new branch is always created either | `` 0 `` | Focus main view | | | `` `` | Bekijk commits | | | `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## Worktrees @@ -407,4 +407,4 @@ Note that this disregards the selection, the new branch is always created either | `` `` | Switch | Switch to the selected worktree. | | `` o `` | Open in editor | | | `` d `` | Remove | Remove the selected worktree. This will both delete the worktree's directory, as well as metadata about the worktree in the .git directory. | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | diff --git a/docs/keybindings/Keybindings_ru.md b/docs/keybindings/Keybindings_ru.md index 35ce45beb..bbfbdf888 100644 --- a/docs/keybindings/Keybindings_ru.md +++ b/docs/keybindings/Keybindings_ru.md @@ -59,7 +59,7 @@ _Связки клавиш_ | `` `` | Switch | Switch to the selected worktree. | | `` o `` | Open in editor | | | `` d `` | Remove | Remove the selected worktree. This will both delete the worktree's directory, as well as metadata about the worktree in the .git directory. | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## Вторичный @@ -152,7 +152,7 @@ Note that this disregards the selection, the new branch is always created either | `` 0 `` | Focus main view | | | `` `` | Просмотреть коммиты | | | `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## Коммиты @@ -226,7 +226,7 @@ Note that this disregards the selection, the new branch is always created either | `` 0 `` | Focus main view | | | `` `` | Просмотреть коммиты | | | `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## Меню @@ -234,7 +234,7 @@ Note that this disregards the selection, the new branch is always created either |-----|--------|-------------| | `` `` | Выполнить | | | `` `` | Закрыть | | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## Панель Подтверждения @@ -277,7 +277,7 @@ Note that this disregards the selection, the new branch is always created either | `` e `` | Обновить URL подмодуля | | | `` i `` | Initialize | Инициализировать подмодуль | | `` b `` | Просмотреть параметры массового подмодуля | | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## Сводка коммита @@ -330,7 +330,7 @@ Note that this disregards the selection, the new branch is always created either | `` 0 `` | Focus main view | | | `` `` | Просмотреть коммиты | | | `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## Удалённые ветки @@ -349,7 +349,7 @@ Note that this disregards the selection, the new branch is always created either | `` 0 `` | Focus main view | | | `` `` | Просмотреть коммиты | | | `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## Удалённые репозитории @@ -360,7 +360,7 @@ Note that this disregards the selection, the new branch is always created either | `` d `` | Remove | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. | | `` e `` | Edit | Редактировать удалённый репозитории | | `` f `` | Получить изменения | Получение изменения из удалённого репозитория | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | ## Файлы @@ -407,4 +407,4 @@ Note that this disregards the selection, the new branch is always created either | `` 0 `` | Focus main view | | | `` `` | Просмотреть файлы выбранного элемента | | | `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` / `` | Filter | | diff --git a/pkg/gui/controllers/filter_controller.go b/pkg/gui/controllers/filter_controller.go index 8b049b26c..635084e44 100644 --- a/pkg/gui/controllers/filter_controller.go +++ b/pkg/gui/controllers/filter_controller.go @@ -36,9 +36,10 @@ func (self *FilterController) Context() types.Context { func (self *FilterController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { return []*types.Binding{ { - Key: opts.GetKey(opts.Config.Universal.StartSearch), - Handler: self.OpenFilterPrompt, - Description: self.c.Tr.StartFilter, + Key: opts.GetKey(opts.Config.Universal.StartSearch), + Handler: self.OpenFilterPrompt, + Description: self.c.Tr.StartFilter, + DisplayOnScreen: true, }, } } diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index e7311e021..c777f412e 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -1685,7 +1685,7 @@ func EnglishTranslationSet() *TranslationSet { NextScreenMode: "Next screen mode (normal/half/fullscreen)", PrevScreenMode: "Prev screen mode", StartSearch: "Search the current view by text", - StartFilter: "Filter the current view by text", + StartFilter: "Filter", Panel: "Panel", KeybindingsLegend: "Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b", RenameBranch: "Rename branch",