mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-06-20 01:19:23 +02:00
Make arrows consistent (#2501)
This commit is contained in:
@@ -143,8 +143,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
|||||||
<pre>
|
<pre>
|
||||||
<kbd>e</kbd>: edit file
|
<kbd>e</kbd>: edit file
|
||||||
<kbd>o</kbd>: open file
|
<kbd>o</kbd>: open file
|
||||||
<kbd>◄</kbd>: select previous conflict
|
<kbd>◀</kbd>: select previous conflict
|
||||||
<kbd>►</kbd>: select next conflict
|
<kbd>▶</kbd>: select next conflict
|
||||||
<kbd>▲</kbd>: select previous hunk
|
<kbd>▲</kbd>: select previous hunk
|
||||||
<kbd>▼</kbd>: select next hunk
|
<kbd>▼</kbd>: select next hunk
|
||||||
<kbd>z</kbd>: undo
|
<kbd>z</kbd>: undo
|
||||||
@@ -164,8 +164,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
|||||||
## Main Panel (Patch Building)
|
## Main Panel (Patch Building)
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd>◄</kbd>: select previous hunk
|
<kbd>◀</kbd>: select previous hunk
|
||||||
<kbd>►</kbd>: select next hunk
|
<kbd>▶</kbd>: select next hunk
|
||||||
<kbd>v</kbd>: toggle drag select
|
<kbd>v</kbd>: toggle drag select
|
||||||
<kbd>V</kbd>: toggle drag select
|
<kbd>V</kbd>: toggle drag select
|
||||||
<kbd>a</kbd>: toggle select hunk
|
<kbd>a</kbd>: toggle select hunk
|
||||||
@@ -179,8 +179,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
|||||||
## Main Panel (Staging)
|
## Main Panel (Staging)
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd>◄</kbd>: select previous hunk
|
<kbd>◀</kbd>: select previous hunk
|
||||||
<kbd>►</kbd>: select next hunk
|
<kbd>▶</kbd>: select next hunk
|
||||||
<kbd>v</kbd>: toggle drag select
|
<kbd>v</kbd>: toggle drag select
|
||||||
<kbd>V</kbd>: toggle drag select
|
<kbd>V</kbd>: toggle drag select
|
||||||
<kbd>a</kbd>: toggle select hunk
|
<kbd>a</kbd>: toggle select hunk
|
||||||
|
|||||||
@@ -203,8 +203,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
|||||||
<pre>
|
<pre>
|
||||||
<kbd>e</kbd>: ファイルを編集
|
<kbd>e</kbd>: ファイルを編集
|
||||||
<kbd>o</kbd>: ファイルを開く
|
<kbd>o</kbd>: ファイルを開く
|
||||||
<kbd>◄</kbd>: 前のコンフリクトを選択
|
<kbd>◀</kbd>: 前のコンフリクトを選択
|
||||||
<kbd>►</kbd>: 次のコンフリクトを選択
|
<kbd>▶</kbd>: 次のコンフリクトを選択
|
||||||
<kbd>▲</kbd>: 前のhunkを選択
|
<kbd>▲</kbd>: 前のhunkを選択
|
||||||
<kbd>▼</kbd>: 次のhunkを選択
|
<kbd>▼</kbd>: 次のhunkを選択
|
||||||
<kbd>z</kbd>: アンドゥ
|
<kbd>z</kbd>: アンドゥ
|
||||||
@@ -224,8 +224,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
|||||||
## メインパネル (Patch Building)
|
## メインパネル (Patch Building)
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd>◄</kbd>: 前のhunkを選択
|
<kbd>◀</kbd>: 前のhunkを選択
|
||||||
<kbd>►</kbd>: 次のhunkを選択
|
<kbd>▶</kbd>: 次のhunkを選択
|
||||||
<kbd>v</kbd>: 範囲選択を切り替え
|
<kbd>v</kbd>: 範囲選択を切り替え
|
||||||
<kbd>V</kbd>: 範囲選択を切り替え
|
<kbd>V</kbd>: 範囲選択を切り替え
|
||||||
<kbd>a</kbd>: hunk選択を切り替え
|
<kbd>a</kbd>: hunk選択を切り替え
|
||||||
@@ -239,8 +239,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
|||||||
## メインパネル (Staging)
|
## メインパネル (Staging)
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd>◄</kbd>: 前のhunkを選択
|
<kbd>◀</kbd>: 前のhunkを選択
|
||||||
<kbd>►</kbd>: 次のhunkを選択
|
<kbd>▶</kbd>: 次のhunkを選択
|
||||||
<kbd>v</kbd>: 範囲選択を切り替え
|
<kbd>v</kbd>: 範囲選択を切り替え
|
||||||
<kbd>V</kbd>: 範囲選択を切り替え
|
<kbd>V</kbd>: 範囲選択を切り替え
|
||||||
<kbd>a</kbd>: hunk選択を切り替え
|
<kbd>a</kbd>: hunk選択を切り替え
|
||||||
|
|||||||
@@ -88,8 +88,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
|||||||
<pre>
|
<pre>
|
||||||
<kbd>e</kbd>: 파일 편집
|
<kbd>e</kbd>: 파일 편집
|
||||||
<kbd>o</kbd>: 파일 닫기
|
<kbd>o</kbd>: 파일 닫기
|
||||||
<kbd>◄</kbd>: 이전 충돌을 선택
|
<kbd>◀</kbd>: 이전 충돌을 선택
|
||||||
<kbd>►</kbd>: 다음 충돌을 선택
|
<kbd>▶</kbd>: 다음 충돌을 선택
|
||||||
<kbd>▲</kbd>: 이전 hunk를 선택
|
<kbd>▲</kbd>: 이전 hunk를 선택
|
||||||
<kbd>▼</kbd>: 다음 hunk를 선택
|
<kbd>▼</kbd>: 다음 hunk를 선택
|
||||||
<kbd>z</kbd>: 되돌리기
|
<kbd>z</kbd>: 되돌리기
|
||||||
@@ -109,8 +109,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
|||||||
## 메인 패널 (Patch Building)
|
## 메인 패널 (Patch Building)
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd>◄</kbd>: 이전 hunk를 선택
|
<kbd>◀</kbd>: 이전 hunk를 선택
|
||||||
<kbd>►</kbd>: 다음 hunk를 선택
|
<kbd>▶</kbd>: 다음 hunk를 선택
|
||||||
<kbd>v</kbd>: 드래그 선택 전환
|
<kbd>v</kbd>: 드래그 선택 전환
|
||||||
<kbd>V</kbd>: 드래그 선택 전환
|
<kbd>V</kbd>: 드래그 선택 전환
|
||||||
<kbd>a</kbd>: toggle select hunk
|
<kbd>a</kbd>: toggle select hunk
|
||||||
@@ -124,8 +124,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
|||||||
## 메인 패널 (Staging)
|
## 메인 패널 (Staging)
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd>◄</kbd>: 이전 hunk를 선택
|
<kbd>◀</kbd>: 이전 hunk를 선택
|
||||||
<kbd>►</kbd>: 다음 hunk를 선택
|
<kbd>▶</kbd>: 다음 hunk를 선택
|
||||||
<kbd>v</kbd>: 드래그 선택 전환
|
<kbd>v</kbd>: 드래그 선택 전환
|
||||||
<kbd>V</kbd>: 드래그 선택 전환
|
<kbd>V</kbd>: 드래그 선택 전환
|
||||||
<kbd>a</kbd>: toggle select hunk
|
<kbd>a</kbd>: toggle select hunk
|
||||||
|
|||||||
@@ -143,8 +143,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
|||||||
<pre>
|
<pre>
|
||||||
<kbd>e</kbd>: verander bestand
|
<kbd>e</kbd>: verander bestand
|
||||||
<kbd>o</kbd>: open bestand
|
<kbd>o</kbd>: open bestand
|
||||||
<kbd>◄</kbd>: selecteer voorgaand conflict
|
<kbd>◀</kbd>: selecteer voorgaand conflict
|
||||||
<kbd>►</kbd>: selecteer volgende conflict
|
<kbd>▶</kbd>: selecteer volgende conflict
|
||||||
<kbd>▲</kbd>: selecteer bovenste hunk
|
<kbd>▲</kbd>: selecteer bovenste hunk
|
||||||
<kbd>▼</kbd>: selecteer onderste hunk
|
<kbd>▼</kbd>: selecteer onderste hunk
|
||||||
<kbd>z</kbd>: ongedaan maken
|
<kbd>z</kbd>: ongedaan maken
|
||||||
@@ -164,8 +164,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
|||||||
## Patch Bouwen
|
## Patch Bouwen
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd>◄</kbd>: selecteer de vorige hunk
|
<kbd>◀</kbd>: selecteer de vorige hunk
|
||||||
<kbd>►</kbd>: selecteer de volgende hunk
|
<kbd>▶</kbd>: selecteer de volgende hunk
|
||||||
<kbd>v</kbd>: toggle drag selecteer
|
<kbd>v</kbd>: toggle drag selecteer
|
||||||
<kbd>V</kbd>: toggle drag selecteer
|
<kbd>V</kbd>: toggle drag selecteer
|
||||||
<kbd>a</kbd>: toggle selecteer hunk
|
<kbd>a</kbd>: toggle selecteer hunk
|
||||||
@@ -218,8 +218,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
|||||||
## Staging
|
## Staging
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd>◄</kbd>: selecteer de vorige hunk
|
<kbd>◀</kbd>: selecteer de vorige hunk
|
||||||
<kbd>►</kbd>: selecteer de volgende hunk
|
<kbd>▶</kbd>: selecteer de volgende hunk
|
||||||
<kbd>v</kbd>: toggle drag selecteer
|
<kbd>v</kbd>: toggle drag selecteer
|
||||||
<kbd>V</kbd>: toggle drag selecteer
|
<kbd>V</kbd>: toggle drag selecteer
|
||||||
<kbd>a</kbd>: toggle selecteer hunk
|
<kbd>a</kbd>: toggle selecteer hunk
|
||||||
|
|||||||
@@ -101,8 +101,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
|||||||
## Main Panel (Patch Building)
|
## Main Panel (Patch Building)
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd>◄</kbd>: poprzedni kawałek
|
<kbd>◀</kbd>: poprzedni kawałek
|
||||||
<kbd>►</kbd>: następny kawałek
|
<kbd>▶</kbd>: następny kawałek
|
||||||
<kbd>v</kbd>: toggle drag select
|
<kbd>v</kbd>: toggle drag select
|
||||||
<kbd>V</kbd>: toggle drag select
|
<kbd>V</kbd>: toggle drag select
|
||||||
<kbd>a</kbd>: toggle select hunk
|
<kbd>a</kbd>: toggle select hunk
|
||||||
@@ -156,8 +156,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
|||||||
## Poczekalnia
|
## Poczekalnia
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd>◄</kbd>: poprzedni kawałek
|
<kbd>◀</kbd>: poprzedni kawałek
|
||||||
<kbd>►</kbd>: następny kawałek
|
<kbd>▶</kbd>: następny kawałek
|
||||||
<kbd>v</kbd>: toggle drag select
|
<kbd>v</kbd>: toggle drag select
|
||||||
<kbd>V</kbd>: toggle drag select
|
<kbd>V</kbd>: toggle drag select
|
||||||
<kbd>a</kbd>: toggle select hunk
|
<kbd>a</kbd>: toggle select hunk
|
||||||
@@ -218,8 +218,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
|||||||
<pre>
|
<pre>
|
||||||
<kbd>e</kbd>: edytuj plik
|
<kbd>e</kbd>: edytuj plik
|
||||||
<kbd>o</kbd>: otwórz plik
|
<kbd>o</kbd>: otwórz plik
|
||||||
<kbd>◄</kbd>: poprzedni konflikt
|
<kbd>◀</kbd>: poprzedni konflikt
|
||||||
<kbd>►</kbd>: następny konflikt
|
<kbd>▶</kbd>: następny konflikt
|
||||||
<kbd>▲</kbd>: wybierz poprzedni kawałek
|
<kbd>▲</kbd>: wybierz poprzedni kawałek
|
||||||
<kbd>▼</kbd>: wybierz następny kawałek
|
<kbd>▼</kbd>: wybierz następny kawałek
|
||||||
<kbd>z</kbd>: cofnij
|
<kbd>z</kbd>: cofnij
|
||||||
|
|||||||
@@ -184,8 +184,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
|||||||
## 构建补丁中
|
## 构建补丁中
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd>◄</kbd>: 选择上一个区块
|
<kbd>◀</kbd>: 选择上一个区块
|
||||||
<kbd>►</kbd>: 选择下一个区块
|
<kbd>▶</kbd>: 选择下一个区块
|
||||||
<kbd>v</kbd>: 切换拖动选择
|
<kbd>v</kbd>: 切换拖动选择
|
||||||
<kbd>V</kbd>: 切换拖动选择
|
<kbd>V</kbd>: 切换拖动选择
|
||||||
<kbd>a</kbd>: 切换选择区块
|
<kbd>a</kbd>: 切换选择区块
|
||||||
@@ -212,8 +212,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
|||||||
<pre>
|
<pre>
|
||||||
<kbd>e</kbd>: 编辑文件
|
<kbd>e</kbd>: 编辑文件
|
||||||
<kbd>o</kbd>: 打开文件
|
<kbd>o</kbd>: 打开文件
|
||||||
<kbd>◄</kbd>: 选择上一个冲突
|
<kbd>◀</kbd>: 选择上一个冲突
|
||||||
<kbd>►</kbd>: 选择下一个冲突
|
<kbd>▶</kbd>: 选择下一个冲突
|
||||||
<kbd>▲</kbd>: 选择顶部块
|
<kbd>▲</kbd>: 选择顶部块
|
||||||
<kbd>▼</kbd>: 选择底部块
|
<kbd>▼</kbd>: 选择底部块
|
||||||
<kbd>z</kbd>: 撤销
|
<kbd>z</kbd>: 撤销
|
||||||
@@ -226,8 +226,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
|||||||
## 正在暂存
|
## 正在暂存
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd>◄</kbd>: 选择上一个区块
|
<kbd>◀</kbd>: 选择上一个区块
|
||||||
<kbd>►</kbd>: 选择下一个区块
|
<kbd>▶</kbd>: 选择下一个区块
|
||||||
<kbd>v</kbd>: 切换拖动选择
|
<kbd>v</kbd>: 切换拖动选择
|
||||||
<kbd>V</kbd>: 切换拖动选择
|
<kbd>V</kbd>: 切换拖动选择
|
||||||
<kbd>a</kbd>: 切换选择区块
|
<kbd>a</kbd>: 切换选择区块
|
||||||
|
|||||||
@@ -32,8 +32,8 @@ var keyMapReversed = map[gocui.Key]string{
|
|||||||
gocui.KeyPgdn: "pgdown",
|
gocui.KeyPgdn: "pgdown",
|
||||||
gocui.KeyArrowUp: "▲",
|
gocui.KeyArrowUp: "▲",
|
||||||
gocui.KeyArrowDown: "▼",
|
gocui.KeyArrowDown: "▼",
|
||||||
gocui.KeyArrowLeft: "◄",
|
gocui.KeyArrowLeft: "◀",
|
||||||
gocui.KeyArrowRight: "►",
|
gocui.KeyArrowRight: "▶",
|
||||||
gocui.KeyTab: "tab", // ctrl+i
|
gocui.KeyTab: "tab", // ctrl+i
|
||||||
gocui.KeyBacktab: "shift+tab",
|
gocui.KeyBacktab: "shift+tab",
|
||||||
gocui.KeyEnter: "enter", // ctrl+m
|
gocui.KeyEnter: "enter", // ctrl+m
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import (
|
|||||||
|
|
||||||
const (
|
const (
|
||||||
EXPANDED_ARROW = "▼"
|
EXPANDED_ARROW = "▼"
|
||||||
COLLAPSED_ARROW = "►"
|
COLLAPSED_ARROW = "▶"
|
||||||
)
|
)
|
||||||
|
|
||||||
// keeping these here as individual constants in case later on people want the old tree shape
|
// keeping these here as individual constants in case later on people want the old tree shape
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ func TestRenderFileTree(t *testing.T) {
|
|||||||
},
|
},
|
||||||
expected: toStringSlice(
|
expected: toStringSlice(
|
||||||
`
|
`
|
||||||
► dir1
|
▶ dir1
|
||||||
▼ dir2
|
▼ dir2
|
||||||
▼ dir2
|
▼ dir2
|
||||||
M file3
|
M file3
|
||||||
@@ -112,7 +112,7 @@ func TestRenderCommitFileTree(t *testing.T) {
|
|||||||
},
|
},
|
||||||
expected: toStringSlice(
|
expected: toStringSlice(
|
||||||
`
|
`
|
||||||
► dir1
|
▶ dir1
|
||||||
▼ dir2
|
▼ dir2
|
||||||
▼ dir2
|
▼ dir2
|
||||||
D file3
|
D file3
|
||||||
|
|||||||
Reference in New Issue
Block a user