Skip to content

Commit 95ea0a6

Browse files
committed
ux: Ignore Whitespace and EOL Changes should always be visible (#1260)
Signed-off-by: leo <[email protected]>
1 parent b9dc5a8 commit 95ea0a6

File tree

4 files changed

+3
-4
lines changed

4 files changed

+3
-4
lines changed

src/Resources/Locales/en_US.axaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@
253253
<x:String x:Key="Text.Diff.Copy" xml:space="preserve">Copy</x:String>
254254
<x:String x:Key="Text.Diff.FileModeChanged" xml:space="preserve">File Mode Changed</x:String>
255255
<x:String x:Key="Text.Diff.First" xml:space="preserve">First Difference</x:String>
256-
<x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">Ignore Whitespace Change and EOL</x:String>
256+
<x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">Ignore Whitespace &amp; EOL Changes</x:String>
257257
<x:String x:Key="Text.Diff.Last" xml:space="preserve">Last Difference</x:String>
258258
<x:String x:Key="Text.Diff.LFS" xml:space="preserve">LFS OBJECT CHANGE</x:String>
259259
<x:String x:Key="Text.Diff.Next" xml:space="preserve">Next Difference</x:String>

src/Resources/Locales/zh_CN.axaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@
257257
<x:String x:Key="Text.Diff.Copy" xml:space="preserve">复制</x:String>
258258
<x:String x:Key="Text.Diff.FileModeChanged" xml:space="preserve">文件权限已变化</x:String>
259259
<x:String x:Key="Text.Diff.First" xml:space="preserve">首个差异</x:String>
260-
<x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">忽略空白符号变化和EOL</x:String>
260+
<x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">忽略空白符号和EOL变化</x:String>
261261
<x:String x:Key="Text.Diff.Last" xml:space="preserve">最后一个差异</x:String>
262262
<x:String x:Key="Text.Diff.LFS" xml:space="preserve">LFS对象变更</x:String>
263263
<x:String x:Key="Text.Diff.Next" xml:space="preserve">下一个差异</x:String>

src/Resources/Locales/zh_TW.axaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@
257257
<x:String x:Key="Text.Diff.Copy" xml:space="preserve">複製</x:String>
258258
<x:String x:Key="Text.Diff.FileModeChanged" xml:space="preserve">檔案權限已變更</x:String>
259259
<x:String x:Key="Text.Diff.First" xml:space="preserve">第一個差異</x:String>
260-
<x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">忽略空白符號變化和 EOL</x:String>
260+
<x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">忽略空白符號和 EOL 變化</x:String>
261261
<x:String x:Key="Text.Diff.Last" xml:space="preserve">最後一個差異</x:String>
262262
<x:String x:Key="Text.Diff.LFS" xml:space="preserve">LFS 物件變更</x:String>
263263
<x:String x:Key="Text.Diff.Next" xml:space="preserve">下一個差異</x:String>

src/Views/DiffView.axaml

-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@
155155
<ToggleButton Classes="line_path"
156156
Width="28"
157157
IsChecked="{Binding IgnoreWhitespace, Mode=TwoWay}"
158-
IsVisible="{Binding IsTextDiff}"
159158
ToolTip.Tip="{DynamicResource Text.Diff.IgnoreWhitespace}">
160159
<Path Width="14" Height="14" Stretch="Uniform" Data="{StaticResource Icons.Whitespace}"/>
161160
</ToggleButton>

0 commit comments

Comments
 (0)