Skip to content

Commit eb41bd2

Browse files
stefanhallerstefanhaller
committed
Change the "toggle hunk selection" binding description to be dynamic
When the useHunkModeInStagingView config is on and you enter the staging view with hunk selection enabled, it is confusing to see "a: Select hunk" in the options view at the bottom.
1 parent 75afa09 commit eb41bd2

File tree

7 files changed

+25
-15
lines changed

7 files changed

+25
-15
lines changed

‎docs/keybindings/Keybindings_en.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
221221
| `` <left> `` | Go to previous hunk | |
222222
| `` <right> `` | Go to next hunk | |
223223
| `` v `` | Toggle range select | |
224-
| `` a `` | Select hunk | Toggle hunk selection mode. |
224+
| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
225225
| `` <c-o> `` | Copy selected text to clipboard | |
226226
| `` o `` | Open file | Open file in default application. |
227227
| `` e `` | Edit file | Open file in external editor. |
@@ -236,7 +236,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
236236
| `` <left> `` | Go to previous hunk | |
237237
| `` <right> `` | Go to next hunk | |
238238
| `` v `` | Toggle range select | |
239-
| `` a `` | Select hunk | Toggle hunk selection mode. |
239+
| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
240240
| `` <c-o> `` | Copy selected text to clipboard | |
241241
| `` <space> `` | Stage | Toggle selection staged / unstaged. |
242242
| `` d `` | Discard | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |

‎docs/keybindings/Keybindings_ko.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
164164
| `` <left> `` | 이전 hunk를 선택 | |
165165
| `` <right> `` | 다음 hunk를 선택 | |
166166
| `` v `` | 드래그 선택 전환 | |
167-
| `` a `` | Toggle select hunk | Toggle hunk selection mode. |
167+
| `` a `` | Toggle select hunk | Toggle line-by-line vs. hunk selection mode. |
168168
| `` <c-o> `` | 선택한 텍스트를 클립보드에 복사 | |
169169
| `` o `` | 파일 닫기 | Open file in default application. |
170170
| `` e `` | 파일 편집 | Open file in external editor. |
@@ -179,7 +179,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
179179
| `` <left> `` | 이전 hunk를 선택 | |
180180
| `` <right> `` | 다음 hunk를 선택 | |
181181
| `` v `` | 드래그 선택 전환 | |
182-
| `` a `` | Toggle select hunk | Toggle hunk selection mode. |
182+
| `` a `` | Toggle select hunk | Toggle line-by-line vs. hunk selection mode. |
183183
| `` <c-o> `` | 선택한 텍스트를 클립보드에 복사 | |
184184
| `` <space> `` | Staged 전환 | 선택한 행을 staged / unstaged |
185185
| `` d `` | 변경을 삭제 (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |

‎docs/keybindings/Keybindings_nl.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
229229
| `` <left> `` | Selecteer de vorige hunk | |
230230
| `` <right> `` | Selecteer de volgende hunk | |
231231
| `` v `` | Toggle drag selecteer | |
232-
| `` a `` | Toggle selecteer hunk | Toggle hunk selection mode. |
232+
| `` a `` | Toggle selecteer hunk | Toggle line-by-line vs. hunk selection mode. |
233233
| `` <c-o> `` | Copy selected text to clipboard | |
234234
| `` o `` | Open bestand | Open file in default application. |
235235
| `` e `` | Verander bestand | Open file in external editor. |
@@ -302,7 +302,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
302302
| `` <left> `` | Selecteer de vorige hunk | |
303303
| `` <right> `` | Selecteer de volgende hunk | |
304304
| `` v `` | Toggle drag selecteer | |
305-
| `` a `` | Toggle selecteer hunk | Toggle hunk selection mode. |
305+
| `` a `` | Toggle selecteer hunk | Toggle line-by-line vs. hunk selection mode. |
306306
| `` <c-o> `` | Copy selected text to clipboard | |
307307
| `` <space> `` | Toggle staged | Toggle lijnen staged / unstaged |
308308
| `` d `` | Verwijdert change (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |

‎docs/keybindings/Keybindings_ru.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ _Связки клавиш_
7676
| `` <left> `` | Выбрать предыдущую часть | |
7777
| `` <right> `` | Выбрать следующую часть | |
7878
| `` v `` | Переключить выборку перетаскивания | |
79-
| `` a `` | Переключить выборку частей | Toggle hunk selection mode. |
79+
| `` a `` | Переключить выборку частей | Toggle line-by-line vs. hunk selection mode. |
8080
| `` <c-o> `` | Скопировать выделенный текст в буфер обмена | |
8181
| `` <space> `` | Переключить индекс | Переключить строку в проиндексированные / непроиндексированные |
8282
| `` d `` | Отменить изменение (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
@@ -124,7 +124,7 @@ _Связки клавиш_
124124
| `` <left> `` | Выбрать предыдущую часть | |
125125
| `` <right> `` | Выбрать следующую часть | |
126126
| `` v `` | Переключить выборку перетаскивания | |
127-
| `` a `` | Переключить выборку частей | Toggle hunk selection mode. |
127+
| `` a `` | Переключить выборку частей | Toggle line-by-line vs. hunk selection mode. |
128128
| `` <c-o> `` | Скопировать выделенный текст в буфер обмена | |
129129
| `` o `` | Открыть файл | Open file in default application. |
130130
| `` e `` | Редактировать файл | Open file in external editor. |

‎docs/keybindings/Keybindings_zh-TW.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ _說明：`<c-b>` 表示 Ctrl＋B、`<a-b>` 表示 Alt＋B，`B`表示 Shift＋B
5858
| `` <left> `` | 選擇上一段 | |
5959
| `` <right> `` | 選擇下一段 | |
6060
| `` v `` | 切換拖曳選擇 | |
61-
| `` a `` | 切換選擇程式碼塊 | Toggle hunk selection mode. |
61+
| `` a `` | 切換選擇程式碼塊 | Toggle line-by-line vs. hunk selection mode. |
6262
| `` <c-o> `` | 複製所選文本至剪貼簿 | |
6363
| `` o `` | 開啟檔案 | 使用預設軟體開啟 |
6464
| `` e `` | 編輯檔案 | 使用外部編輯器開啟 |
@@ -99,7 +99,7 @@ _說明：`<c-b>` 表示 Ctrl＋B、`<a-b>` 表示 Alt＋B，`B`表示 Shift＋B
9999
| `` <left> `` | 選擇上一段 | |
100100
| `` <right> `` | 選擇下一段 | |
101101
| `` v `` | 切換拖曳選擇 | |
102-
| `` a `` | 切換選擇程式碼塊 | Toggle hunk selection mode. |
102+
| `` a `` | 切換選擇程式碼塊 | Toggle line-by-line vs. hunk selection mode. |
103103
| `` <c-o> `` | 複製所選文本至剪貼簿 | |
104104
| `` <space> `` | 切換預存 | 切換現有行的狀態 (已預存/未預存) |
105105
| `` d `` | 刪除變更 (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |

‎pkg/gui/controllers/patch_explorer_controller.go

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,15 @@ func (self *PatchExplorerController) GetKeybindings(opts types.KeybindingsOpts)
9595
Description: self.c.Tr.ToggleRangeSelect,
9696
},
9797
{
98-
Key: opts.GetKey(opts.Config.Main.ToggleSelectHunk),
99-
Handler: self.withRenderAndFocus(self.HandleToggleSelectHunk),
100-
Description: self.c.Tr.ToggleSelectHunk,
98+
Key: opts.GetKey(opts.Config.Main.ToggleSelectHunk),
99+
Handler: self.withRenderAndFocus(self.HandleToggleSelectHunk),
100+
Description: self.c.Tr.ToggleSelectHunk,
101+
DescriptionFunc: func() string {
102+
if state := self.context.GetState(); state != nil && state.SelectingHunk() {
103+
return self.c.Tr.SelectLineByLine
104+
}
105+
return self.c.Tr.SelectHunk
106+
},
101107
Tooltip: self.c.Tr.ToggleSelectHunkTooltip,
102108
DisplayOnScreen: true,
103109
},

‎pkg/i18n/english.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,8 @@ type TranslationSet struct {
289289
DiscardSelection string
290290
DiscardSelectionTooltip string
291291
ToggleSelectHunk string
292+
SelectHunk string
293+
SelectLineByLine string
292294
ToggleSelectHunkTooltip string
293295
ToggleSelectionForPatch string
294296
EditHunk string
@@ -1336,8 +1338,10 @@ func EnglishTranslationSet() *TranslationSet {
13361338
DiscardSelection: `Discard`,
13371339
DiscardSelectionTooltip: "When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change.",
13381340
ToggleRangeSelect: "Toggle range select",
1339-
ToggleSelectHunk: "Select hunk",
1340-
ToggleSelectHunkTooltip: "Toggle hunk selection mode.",
1341+
ToggleSelectHunk: "Toggle hunk selection",
1342+
SelectHunk: "Select hunks",
1343+
SelectLineByLine: "Select line-by-line",
1344+
ToggleSelectHunkTooltip: "Toggle line-by-line vs. hunk selection mode.",
13411345
ToggleSelectionForPatch: `Toggle lines in patch`,
13421346
EditHunk: `Edit hunk`,
13431347
EditHunkTooltip: "Edit selected hunk in external editor.",

0 commit comments

Comments
 (0)