Skip to content

Use TranslationSet.Close for the Close keybind label in ConfirmationController #4808

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

Closed
wants to merge 2 commits into from
Closed

Use TranslationSet.Close for the Close keybind label in ConfirmationController #4808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f021d09
Use `TranslationSet.Close` for the `Close` keybind label in `Confirma…
kyu08 Aug 10, 2025
3859442
Run `go generate ./...`
kyu08 Aug 10, 2025
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
2 changes: 1 addition & 1 deletion docs/keybindings/Keybindings_en.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
| Key | Action | Info |
|-----|--------|-------------|
| `` <enter> `` | Confirm | |
| `` <esc> `` | Close/Cancel | |
| `` <esc> `` | Close | |

## Files

Expand Down
2 changes: 1 addition & 1 deletion docs/keybindings/Keybindings_ja.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,4 +400,4 @@ _凡例：`＜c-b＞` はctrl+b、`＜a-b＞` はalt+b、`B` はshift+bを意味
| Key | Action | Info |
|-----|--------|-------------|
| `` <enter> `` | 確認 | |
| `` <esc> `` | 閉じる/キャンセル | |
| `` <esc> `` | 閉じる | |
2 changes: 1 addition & 1 deletion docs/keybindings/Keybindings_ko.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,4 +400,4 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
| Key | Action | Info |
|-----|--------|-------------|
| `` <enter> `` | 확인 | |
| `` <esc> `` | 닫기/취소 | |
| `` <esc> `` | 닫기 | |
2 changes: 1 addition & 1 deletion docs/keybindings/Keybindings_pl.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ _Legenda: `<c-b>` oznacza ctrl+b, `<a-b>` oznacza alt+b, `B` oznacza shift+b_
| Key | Action | Info |
|-----|--------|-------------|
| `` <enter> `` | Potwierdź | |
| `` <esc> `` | Zamknij/Anuluj | |
| `` <esc> `` | Zamknij | |

## Pliki

Expand Down
2 changes: 1 addition & 1 deletion docs/keybindings/Keybindings_pt.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
| Key | Action | Info |
|-----|--------|-------------|
| `` <enter> `` | Confirmar | |
| `` <esc> `` | Fechar/Cancelar | |
| `` <esc> `` | Fechar | |

## Etiquetas

Expand Down
2 changes: 1 addition & 1 deletion docs/keybindings/Keybindings_ru.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ _Связки клавиш_
| Key | Action | Info |
|-----|--------|-------------|
| `` <enter> `` | Подтвердить | |
| `` <esc> `` | Закрыть/отменить | |
| `` <esc> `` | Закрыть | |

## Подкоммиты

Expand Down
2 changes: 1 addition & 1 deletion docs/keybindings/Keybindings_zh-TW.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ _說明：`<c-b>` 表示 Ctrl＋B、`<a-b>` 表示 Alt＋B，`B`表示 Shift＋B
| Key | Action | Info |
|-----|--------|-------------|
| `` <enter> `` | 確認 | |
| `` <esc> `` | 關閉/取消 | |
| `` <esc> `` | 關閉 | |

## 遠端

Expand Down
2 changes: 1 addition & 1 deletion pkg/gui/controllers/confirmation_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func (self *ConfirmationController) GetKeybindings(opts types.KeybindingsOpts) [
{
Key: opts.GetKey(opts.Config.Universal.Return),
Handler: func() error { return self.context().State.OnClose() },
Description: self.c.Tr.CloseCancel,
Description: self.c.Tr.Close,
DisplayOnScreen: true,
},
{
Expand Down
2 changes: 0 additions & 2 deletions pkg/i18n/english.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@ type TranslationSet struct {
NoBranchesThisRepo string
CommitWithoutMessageErr string
Close string
CloseCancel string
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I deleted this line because this field is no longer referenced.

Confirm string
Quit string
SquashTooltip string
Expand Down Expand Up @@ -1218,7 +1217,6 @@ func EnglishTranslationSet() *TranslationSet {
NoBranchesThisRepo: "No branches for this repo",
CommitWithoutMessageErr: "You cannot commit without a commit message",
Close: "Close",
CloseCancel: "Close/Cancel",
Confirm: "Confirm",
Quit: "Quit",
SquashTooltip: "Squash the selected commit into the commit below it. The selected commit's message will be appended to the commit below it.",
Expand Down
Loading