mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-01-06 03:53:59 +02:00
IgnoreOrExclude should be a menu
This commit is contained in:
parent
c7f9d5801b
commit
0ff5b74d80
@ -102,7 +102,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
|||||||
<kbd>C</kbd>: commit changes using git editor
|
<kbd>C</kbd>: commit changes using git editor
|
||||||
<kbd>e</kbd>: edit file
|
<kbd>e</kbd>: edit file
|
||||||
<kbd>o</kbd>: open file
|
<kbd>o</kbd>: open file
|
||||||
<kbd>i</kbd>: Ignore or Exclude file
|
<kbd>i</kbd>: ignore or exclude file
|
||||||
<kbd>r</kbd>: refresh files
|
<kbd>r</kbd>: refresh files
|
||||||
<kbd>s</kbd>: stash all changes
|
<kbd>s</kbd>: stash all changes
|
||||||
<kbd>S</kbd>: view stash options
|
<kbd>S</kbd>: view stash options
|
||||||
|
@ -277,7 +277,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
|||||||
<kbd>C</kbd>: Git 편집기를 사용하여 변경 내용을 커밋합니다.
|
<kbd>C</kbd>: Git 편집기를 사용하여 변경 내용을 커밋합니다.
|
||||||
<kbd>e</kbd>: 파일 편집
|
<kbd>e</kbd>: 파일 편집
|
||||||
<kbd>o</kbd>: 파일 닫기
|
<kbd>o</kbd>: 파일 닫기
|
||||||
<kbd>i</kbd>: Ignore file
|
<kbd>i</kbd>: ignore file
|
||||||
<kbd>r</kbd>: 파일 새로고침
|
<kbd>r</kbd>: 파일 새로고침
|
||||||
<kbd>s</kbd>: 변경사항을 Stash
|
<kbd>s</kbd>: 변경사항을 Stash
|
||||||
<kbd>S</kbd>: Stash 옵션 보기
|
<kbd>S</kbd>: Stash 옵션 보기
|
||||||
|
@ -55,7 +55,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
|||||||
<kbd>C</kbd>: commit veranderingen met de git editor
|
<kbd>C</kbd>: commit veranderingen met de git editor
|
||||||
<kbd>e</kbd>: verander bestand
|
<kbd>e</kbd>: verander bestand
|
||||||
<kbd>o</kbd>: open bestand
|
<kbd>o</kbd>: open bestand
|
||||||
<kbd>i</kbd>: Ignore or Exclude file
|
<kbd>i</kbd>: ignore or exclude file
|
||||||
<kbd>r</kbd>: refresh bestanden
|
<kbd>r</kbd>: refresh bestanden
|
||||||
<kbd>s</kbd>: stash-bestanden
|
<kbd>s</kbd>: stash-bestanden
|
||||||
<kbd>S</kbd>: bekijk stash opties
|
<kbd>S</kbd>: bekijk stash opties
|
||||||
|
@ -125,7 +125,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
|||||||
<kbd>C</kbd>: Zatwierdź zmiany używając edytora
|
<kbd>C</kbd>: Zatwierdź zmiany używając edytora
|
||||||
<kbd>e</kbd>: edytuj plik
|
<kbd>e</kbd>: edytuj plik
|
||||||
<kbd>o</kbd>: otwórz plik
|
<kbd>o</kbd>: otwórz plik
|
||||||
<kbd>i</kbd>: Ignore or Exclude file
|
<kbd>i</kbd>: ignore or exclude file
|
||||||
<kbd>r</kbd>: odśwież pliki
|
<kbd>r</kbd>: odśwież pliki
|
||||||
<kbd>s</kbd>: przechowaj zmiany
|
<kbd>s</kbd>: przechowaj zmiany
|
||||||
<kbd>S</kbd>: wyświetl opcje schowka
|
<kbd>S</kbd>: wyświetl opcje schowka
|
||||||
|
@ -85,7 +85,8 @@ func (self *FilesController) GetKeybindings(opts types.KeybindingsOpts) []*types
|
|||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Files.IgnoreOrExcludeFile),
|
Key: opts.GetKey(opts.Config.Files.IgnoreOrExcludeFile),
|
||||||
Handler: self.checkSelectedFileNode(self.ignoreOrExcludeMenu),
|
Handler: self.checkSelectedFileNode(self.ignoreOrExcludeMenu),
|
||||||
Description: self.c.Tr.Actions.IgnoreExcludeFile,
|
Description: self.c.Tr.Actions.LcIgnoreExcludeFile,
|
||||||
|
OpensMenu: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Files.RefreshFiles),
|
Key: opts.GetKey(opts.Config.Files.RefreshFiles),
|
||||||
@ -501,7 +502,7 @@ func (self *FilesController) ignore(node *filetree.FileNode) error {
|
|||||||
if node.GetPath() == ".gitignore" {
|
if node.GetPath() == ".gitignore" {
|
||||||
return self.c.ErrorMsg(self.c.Tr.Actions.IgnoreFileErr)
|
return self.c.ErrorMsg(self.c.Tr.Actions.IgnoreFileErr)
|
||||||
}
|
}
|
||||||
err := self.ignoreOrExcludeFile(node, self.c.Tr.IgnoreTracked, self.c.Tr.IgnoreTrackedPrompt, self.c.Tr.Actions.IgnoreExcludeFile, self.git.WorkingTree.Ignore)
|
err := self.ignoreOrExcludeFile(node, self.c.Tr.IgnoreTracked, self.c.Tr.IgnoreTrackedPrompt, self.c.Tr.Actions.LcIgnoreExcludeFile, self.git.WorkingTree.Ignore)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -527,7 +528,7 @@ func (self *FilesController) exclude(node *filetree.FileNode) error {
|
|||||||
|
|
||||||
func (self *FilesController) ignoreOrExcludeMenu(node *filetree.FileNode) error {
|
func (self *FilesController) ignoreOrExcludeMenu(node *filetree.FileNode) error {
|
||||||
return self.c.Menu(types.CreateMenuOptions{
|
return self.c.Menu(types.CreateMenuOptions{
|
||||||
Title: self.c.Tr.Actions.IgnoreExcludeFile,
|
Title: self.c.Tr.Actions.LcIgnoreExcludeFile,
|
||||||
Items: []*types.MenuItem{
|
Items: []*types.MenuItem{
|
||||||
{
|
{
|
||||||
LabelColumns: []string{self.c.Tr.LcIgnoreFile},
|
LabelColumns: []string{self.c.Tr.LcIgnoreFile},
|
||||||
|
@ -507,7 +507,7 @@ func chineseTranslationSet() TranslationSet {
|
|||||||
UnstageFile: "取消暂存文件",
|
UnstageFile: "取消暂存文件",
|
||||||
UnstageAllFiles: "取消暂存所有文件",
|
UnstageAllFiles: "取消暂存所有文件",
|
||||||
StageAllFiles: "暂存所有文件",
|
StageAllFiles: "暂存所有文件",
|
||||||
IgnoreExcludeFile: "忽略文件",
|
LcIgnoreExcludeFile: "忽略文件",
|
||||||
Commit: "提交 (Commit)",
|
Commit: "提交 (Commit)",
|
||||||
EditFile: "编辑文件",
|
EditFile: "编辑文件",
|
||||||
Push: "推送 (Push)",
|
Push: "推送 (Push)",
|
||||||
|
@ -568,8 +568,7 @@ type Actions struct {
|
|||||||
UnstageFile string
|
UnstageFile string
|
||||||
UnstageAllFiles string
|
UnstageAllFiles string
|
||||||
StageAllFiles string
|
StageAllFiles string
|
||||||
IgnoreExcludeFile string
|
LcIgnoreExcludeFile string
|
||||||
IgnoreFile string
|
|
||||||
IgnoreFileErr string
|
IgnoreFileErr string
|
||||||
ExcludeFile string
|
ExcludeFile string
|
||||||
ExcludeFileErr string
|
ExcludeFileErr string
|
||||||
@ -1190,8 +1189,7 @@ func EnglishTranslationSet() TranslationSet {
|
|||||||
UnstageFile: "Unstage file",
|
UnstageFile: "Unstage file",
|
||||||
UnstageAllFiles: "Unstage all files",
|
UnstageAllFiles: "Unstage all files",
|
||||||
StageAllFiles: "Stage all files",
|
StageAllFiles: "Stage all files",
|
||||||
IgnoreExcludeFile: "Ignore or Exclude file",
|
LcIgnoreExcludeFile: "ignore or exclude file",
|
||||||
IgnoreFile: "Ignore or Exclude file",
|
|
||||||
IgnoreFileErr: "Cannot ignore .gitignore",
|
IgnoreFileErr: "Cannot ignore .gitignore",
|
||||||
ExcludeFile: "Exclude file",
|
ExcludeFile: "Exclude file",
|
||||||
ExcludeFileErr: "Cannot exclude .git/info/exclude",
|
ExcludeFileErr: "Cannot exclude .git/info/exclude",
|
||||||
|
@ -533,7 +533,7 @@ func japaneseTranslationSet() TranslationSet {
|
|||||||
UnstageFile: "ファイルをアンステージ",
|
UnstageFile: "ファイルをアンステージ",
|
||||||
UnstageAllFiles: "すべてのファイルをアンステージ",
|
UnstageAllFiles: "すべてのファイルをアンステージ",
|
||||||
StageAllFiles: "すべてのファイルをステージ",
|
StageAllFiles: "すべてのファイルをステージ",
|
||||||
IgnoreExcludeFile: "ファイルをignore",
|
LcIgnoreExcludeFile: "ファイルをignore",
|
||||||
Commit: "コミット",
|
Commit: "コミット",
|
||||||
EditFile: "ファイルを編集",
|
EditFile: "ファイルを編集",
|
||||||
Push: "Push",
|
Push: "Push",
|
||||||
|
@ -536,7 +536,7 @@ func koreanTranslationSet() TranslationSet {
|
|||||||
UnstageFile: "Unstage file",
|
UnstageFile: "Unstage file",
|
||||||
UnstageAllFiles: "Unstage all files",
|
UnstageAllFiles: "Unstage all files",
|
||||||
StageAllFiles: "Stage all files",
|
StageAllFiles: "Stage all files",
|
||||||
IgnoreExcludeFile: "Ignore file",
|
LcIgnoreExcludeFile: "ignore file",
|
||||||
Commit: "커밋",
|
Commit: "커밋",
|
||||||
EditFile: "파일 수정",
|
EditFile: "파일 수정",
|
||||||
Push: "푸시",
|
Push: "푸시",
|
||||||
|
Loading…
Reference in New Issue
Block a user