diff --git a/docs/keybindings/Keybindings_en.md b/docs/keybindings/Keybindings_en.md index f0b2f78a8..43e586897 100644 --- a/docs/keybindings/Keybindings_en.md +++ b/docs/keybindings/Keybindings_en.md @@ -207,7 +207,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
ctrl+o: copy submodule name to clipboard enter: enter submodule - d: view reset and remove submodule options + d: remove submodule u: update submodule n: add new submodule e: update submodule URL diff --git a/docs/keybindings/Keybindings_nl.md b/docs/keybindings/Keybindings_nl.md index b0a9966cc..325f6b001 100644 --- a/docs/keybindings/Keybindings_nl.md +++ b/docs/keybindings/Keybindings_nl.md @@ -207,7 +207,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n directctrl+o: kopieer submodule naam naar klembord enter: enter submodule - d: bekijk reset en verwijder submodule opties + d: remove submodule u: update submodule n: voeg nieuwe submodule toe e: update submodule URL diff --git a/docs/keybindings/Keybindings_pl.md b/docs/keybindings/Keybindings_pl.md index 7384c97fa..95e713826 100644 --- a/docs/keybindings/Keybindings_pl.md +++ b/docs/keybindings/Keybindings_pl.md @@ -207,7 +207,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n directctrl+o: copy submodule name to clipboard enter: enter submodule - d: view reset and remove submodule options + d: remove submodule u: update submodule n: add new submodule e: update submodule URL diff --git a/docs/keybindings/Keybindings_zh.md b/docs/keybindings/Keybindings_zh.md index b482aaf40..42a4fd1c7 100644 --- a/docs/keybindings/Keybindings_zh.md +++ b/docs/keybindings/Keybindings_zh.md @@ -207,7 +207,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n directctrl+o: 将子模块名称复制到剪贴板 enter: 输入子模块 - d: 查看重置和删除子模块选项 + d: 删除子模块 u: 更新子模块 n: 添加新的子模块 e: 更新子模块 URL diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go index 464bb4f5d..fa2e0e49b 100644 --- a/pkg/gui/keybindings.go +++ b/pkg/gui/keybindings.go @@ -1724,8 +1724,8 @@ func (gui *Gui) GetInitialKeybindings() []*Binding { ViewName: "files", Contexts: []string{string(SUBMODULES_CONTEXT_KEY)}, Key: gui.getKey(config.Universal.Remove), - Handler: gui.forSubmodule(gui.handleResetRemoveSubmodule), - Description: gui.Tr.LcViewResetAndRemoveOptions, + Handler: gui.forSubmodule(gui.removeSubmodule), + Description: gui.Tr.LcRemoveSubmodule, OpensMenu: true, }, { diff --git a/pkg/gui/submodules_panel.go b/pkg/gui/submodules_panel.go index 96648b6ce..be0574356 100644 --- a/pkg/gui/submodules_panel.go +++ b/pkg/gui/submodules_panel.go @@ -193,25 +193,6 @@ func (gui *Gui) forSubmodule(callback func(*models.SubmoduleConfig) error) func( } } -func (gui *Gui) handleResetRemoveSubmodule(submodule *models.SubmoduleConfig) error { - menuItems := []*menuItem{ - { - displayString: gui.Tr.LcSubmoduleStashAndReset, - onPress: func() error { - return gui.resetSubmodule(submodule) - }, - }, - { - displayString: gui.Tr.LcRemoveSubmodule, - onPress: func() error { - return gui.removeSubmodule(submodule) - }, - }, - } - - return gui.createMenu(submodule.Name, menuItems, createMenuOptions{showCancel: true}) -} - func (gui *Gui) handleBulkSubmoduleActionsMenu() error { menuItems := []*menuItem{ { diff --git a/pkg/i18n/chinese.go b/pkg/i18n/chinese.go index 4843dc149..47263a36b 100644 --- a/pkg/i18n/chinese.go +++ b/pkg/i18n/chinese.go @@ -404,7 +404,6 @@ func chineseTranslationSet() TranslationSet { LcEditSubmoduleUrl: "更新子模块 URL", LcInitializingSubmoduleStatus: "正在初始化子模块", LcInitSubmodule: "初始化子模块", - LcViewResetAndRemoveOptions: "查看重置和删除子模块选项", LcSubmoduleUpdate: "更新子模块", LcUpdatingSubmoduleStatus: "正在更新子模块", LcBulkInitSubmodules: "批量初始化子模块", diff --git a/pkg/i18n/dutch.go b/pkg/i18n/dutch.go index 3e9989a6a..f3bf4d560 100644 --- a/pkg/i18n/dutch.go +++ b/pkg/i18n/dutch.go @@ -355,7 +355,6 @@ func dutchTranslationSet() TranslationSet { LcCreateNewBranchFromCommit: "creëer nieuwe branch van commit", LcCopySubmoduleNameToClipboard: "kopieer submodule naam naar klembord", LcEnterSubmodule: "enter submodule", - LcViewResetAndRemoveOptions: "bekijk reset en verwijder submodule opties", LcAddSubmodule: "voeg nieuwe submodule toe", LcInitSubmodule: "initialiseer submodule", LcViewBulkSubmoduleOptions: "bekijk bulk submodule opties", diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index db3cd112c..381baa57b 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -398,7 +398,6 @@ type TranslationSet struct { LcEditSubmoduleUrl string LcInitializingSubmoduleStatus string LcInitSubmodule string - LcViewResetAndRemoveOptions string LcSubmoduleUpdate string LcUpdatingSubmoduleStatus string LcBulkInitSubmodules string @@ -974,7 +973,6 @@ func EnglishTranslationSet() TranslationSet { LcEditSubmoduleUrl: "update submodule URL", LcInitializingSubmoduleStatus: "initializing submodule", LcInitSubmodule: "initialize submodule", - LcViewResetAndRemoveOptions: "view reset and remove submodule options", LcSubmoduleUpdate: "update submodule", LcUpdatingSubmoduleStatus: "updating submodule", LcBulkInitSubmodules: "bulk init submodules",