Skip to content
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

Jump to bottom

Add settings UI string localization #7833

Merged
9 commits merged into from
Oct 9, 2020
Merged

Add settings UI string localization #7833

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
445d1e9
Localize Settings UI Text
carlos-zamora Sep 30, 2020
03a0110
add resources for localization
cinnamon-msft Oct 5, 2020
e0e366e
Update src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml
cinnamon-msft Oct 5, 2020
9c6c71a
Update src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml
cinnamon-msft Oct 5, 2020
0372a84
fix largest to smallest
cinnamon-msft Oct 7, 2020
a3eaf7b
address feedback
cinnamon-msft Oct 7, 2020
9b11805
add rendering disclaimer
cinnamon-msft Oct 7, 2020
bc18dd8
Merge branch 'feature/settings-ui' into dev/cazamor/sui/localization
carlos-zamora Oct 9, 2020
868a297
code format
carlos-zamora Oct 9, 2020
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
38 changes: 19 additions & 19 deletions src/cascadia/TerminalSettingsEditor/ColorSchemes.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ the MIT License. See LICENSE in the project root for license information. -->
<ColumnDefinition Width="1*" />
<ColumnDefinition Width="1*" />
</Grid.ColumnDefinitions>
<TextBlock Text="Color schemes"
<TextBlock x:Uid="ColorScheme_ColorSchemes"
Style="{StaticResource SubheaderTextBlockStyle}"
Margin="0,0,0,20"
Grid.Row="0" />
Expand All @@ -46,7 +46,7 @@ the MIT License. See LICENSE in the project root for license information. -->
Grid.Column="0">
<StackPanel Orientation="Horizontal"
Margin="0,0,0,20">
<TextBox Header="Background"
<TextBox x:Uid="ColorScheme_Background"
Width="100"
FontSize="15"
Text="{x:Bind ColorSchemeModel.ColorScheme.BackgroundHexValue, Mode=TwoWay}" />
Expand All @@ -71,7 +71,7 @@ the MIT License. See LICENSE in the project root for license information. -->
</StackPanel>
<StackPanel Orientation="Horizontal"
Margin="0,0,0,20">
<TextBox Header="Black"
<TextBox x:Uid="ColorScheme_Black"
Width="100"
FontSize="15"
Text="{x:Bind ColorSchemeModel.ColorScheme.BlackHexValue, Mode=TwoWay}" />
Expand All @@ -96,7 +96,7 @@ the MIT License. See LICENSE in the project root for license information. -->
</StackPanel>
<StackPanel Orientation="Horizontal"
Margin="0,0,0,20">
<TextBox Header="Blue"
<TextBox x:Uid="ColorScheme_Blue"
Width="100"
FontSize="15"
Text="{x:Bind ColorSchemeModel.ColorScheme.BlueHexValue, Mode=TwoWay}" />
Expand All @@ -121,7 +121,7 @@ the MIT License. See LICENSE in the project root for license information. -->
</StackPanel>
<StackPanel Orientation="Horizontal"
Margin="0,0,0,20">
<TextBox Header="Cyan"
<TextBox x:Uid="ColorScheme_Cyan"
Width="100"
FontSize="15"
Text="{x:Bind ColorSchemeModel.ColorScheme.CyanHexValue, Mode=TwoWay}" />
Expand All @@ -146,7 +146,7 @@ the MIT License. See LICENSE in the project root for license information. -->
</StackPanel>
<StackPanel Orientation="Horizontal"
Margin="0,0,0,20">
<TextBox Header="Green"
<TextBox x:Uid="ColorScheme_Green"
Width="100"
FontSize="15"
Text="{x:Bind ColorSchemeModel.ColorScheme.GreenHexValue, Mode=TwoWay}" />
Expand All @@ -171,7 +171,7 @@ the MIT License. See LICENSE in the project root for license information. -->
</StackPanel>
<StackPanel Orientation="Horizontal"
Margin="0,0,0,20">
<TextBox Header="Purple"
<TextBox x:Uid="ColorScheme_Purple"
Width="100"
FontSize="15"
Text="{x:Bind ColorSchemeModel.ColorScheme.PurpleHexValue, Mode=TwoWay}" />
Expand All @@ -196,7 +196,7 @@ the MIT License. See LICENSE in the project root for license information. -->
</StackPanel>
<StackPanel Orientation="Horizontal"
Margin="0,0,0,20">
<TextBox Header="Red"
<TextBox x:Uid="ColorScheme_Red"
Width="100"
FontSize="15"
Text="{x:Bind ColorSchemeModel.ColorScheme.RedHexValue, Mode=TwoWay}" />
Expand All @@ -221,7 +221,7 @@ the MIT License. See LICENSE in the project root for license information. -->
</StackPanel>
<StackPanel Orientation="Horizontal"
Margin="0,0,0,20">
<TextBox Header="White"
<TextBox x:Uid="ColorScheme_White"
Width="100"
FontSize="15"
Text="{x:Bind ColorSchemeModel.ColorScheme.WhiteHexValue, Mode=TwoWay}" />
Expand All @@ -246,7 +246,7 @@ the MIT License. See LICENSE in the project root for license information. -->
</StackPanel>
<StackPanel Orientation="Horizontal"
Margin="0,0,0,20">
<TextBox Header="Yellow"
<TextBox x:Uid="ColorScheme_Yellow"
Width="100"
FontSize="15"
Text="{x:Bind ColorSchemeModel.ColorScheme.YellowHexValue, Mode=TwoWay}" />
Expand Down Expand Up @@ -274,7 +274,7 @@ the MIT License. See LICENSE in the project root for license information. -->
Grid.Column="1">
<StackPanel Orientation="Horizontal"
Margin="0,0,0,20">
<TextBox Header="Foreground"
<TextBox x:Uid="ColorScheme_Foreground"
Width="100"
FontSize="15"
Text="{x:Bind ColorSchemeModel.ColorScheme.ForegroundHexValue, Mode=TwoWay}" />
Expand All @@ -299,7 +299,7 @@ the MIT License. See LICENSE in the project root for license information. -->
</StackPanel>
<StackPanel Orientation="Horizontal"
Margin="0,0,0,20">
<TextBox Header="Bright Black"
<TextBox x:Uid="ColorScheme_BrightBlack"
Width="100"
FontSize="15"
Text="{x:Bind ColorSchemeModel.ColorScheme.BrightBlackHexValue, Mode=TwoWay}" />
Expand All @@ -324,7 +324,7 @@ the MIT License. See LICENSE in the project root for license information. -->
</StackPanel>
<StackPanel Orientation="Horizontal"
Margin="0,0,0,20">
<TextBox Header="Bright Blue"
<TextBox x:Uid="ColorScheme_BrightBlue"
Width="100"
FontSize="15"
Text="{x:Bind ColorSchemeModel.ColorScheme.BrightBlueHexValue, Mode=TwoWay}" />
Expand All @@ -349,7 +349,7 @@ the MIT License. See LICENSE in the project root for license information. -->
</StackPanel>
<StackPanel Orientation="Horizontal"
Margin="0,0,0,20">
<TextBox Header="Bright Cyan"
<TextBox x:Uid="ColorScheme_BrightCyan"
Width="100"
FontSize="15"
Text="{x:Bind ColorSchemeModel.ColorScheme.BrightCyanHexValue, Mode=TwoWay}" />
Expand All @@ -374,7 +374,7 @@ the MIT License. See LICENSE in the project root for license information. -->
</StackPanel>
<StackPanel Orientation="Horizontal"
Margin="0,0,0,20">
<TextBox Header="Bright Green"
<TextBox x:Uid="ColorScheme_BrightGreen"
Width="100"
FontSize="15"
Text="{x:Bind ColorSchemeModel.ColorScheme.BrightGreenHexValue, Mode=TwoWay}" />
Expand All @@ -399,7 +399,7 @@ the MIT License. See LICENSE in the project root for license information. -->
</StackPanel>
<StackPanel Orientation="Horizontal"
Margin="0,0,0,20">
<TextBox Header="Bright Purple"
<TextBox x:Uid="ColorScheme_BrightPurple"
Width="100"
FontSize="15"
Text="{x:Bind ColorSchemeModel.ColorScheme.BrightPurpleHexValue, Mode=TwoWay}" />
Expand All @@ -424,7 +424,7 @@ the MIT License. See LICENSE in the project root for license information. -->
</StackPanel>
<StackPanel Orientation="Horizontal"
Margin="0,0,0,20">
<TextBox Header="Bright Red"
<TextBox x:Uid="ColorScheme_BrightRed"
Width="100"
FontSize="15"
Text="{x:Bind ColorSchemeModel.ColorScheme.BrightRedHexValue, Mode=TwoWay}" />
Expand All @@ -449,7 +449,7 @@ the MIT License. See LICENSE in the project root for license information. -->
</StackPanel>
<StackPanel Orientation="Horizontal"
Margin="0,0,0,20">
<TextBox Header="Bright White"
<TextBox x:Uid="ColorScheme_BrightWhite"
Width="100"
FontSize="15"
Text="{x:Bind ColorSchemeModel.ColorScheme.BrightWhiteHexValue, Mode=TwoWay}" />
Expand All @@ -474,7 +474,7 @@ the MIT License. See LICENSE in the project root for license information. -->
</StackPanel>
<StackPanel Orientation="Horizontal"
Margin="0,0,0,20">
<TextBox Header="Bright Yellow"
<TextBox x:Uid="ColorScheme_BrightYellow"
Width="100"
FontSize="15"
Text="{x:Bind ColorSchemeModel.ColorScheme.BrightYellowHexValue, Mode=TwoWay}" />
Expand Down
26 changes: 13 additions & 13 deletions src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,24 @@ the MIT License. See LICENSE in the project root for license information. -->
<ColumnDefinition Width="1*" />
<ColumnDefinition Width="1*" />
</Grid.ColumnDefinitions>
<TextBlock Text="Global Appearance"
<TextBlock x:Uid="Globals_GlobalAppearance"
Style="{StaticResource SubheaderTextBlockStyle}"
Margin="0,0,0,20" />
<StackPanel Grid.Row="1" Grid.Column="0" Margin="0,0,100,0">
<Controls:RadioButtons Header="Theme" Margin="0,0,0,20" FontSize="15" ToolTipService.ToolTip="Sets the theme of the application. The value 'system' refers to the active Windows system theme." ToolTipService.Placement="Mouse">
<RadioButton x:Name="DefaultTheme" Content="Default"/>
<RadioButton x:Name="DarkTheme" Content="Dark"/>
<RadioButton x:Name="LightTheme" Content="Light"/>
<Controls:RadioButtons x:Uid="Globals_Theme" Margin="0,0,0,20" FontSize="15" ToolTipService.Placement="Mouse">
<RadioButton x:Uid="Globals_ThemeDefault" x:Name="DefaultTheme"/>
<RadioButton x:Uid="Globals_ThemeDark" x:Name="DarkTheme"/>
<RadioButton x:Uid="Globals_ThemeLight" x:Name="LightTheme"/>
</Controls:RadioButtons>
<CheckBox IsChecked="{x:Bind GlobalSettingsModel.GlobalSettings.ShowTitlebar, Mode=TwoWay}" Content="Show the title bar" Margin="0,0,0,20" FontSize="15" ToolTipService.ToolTip="When checked, the tabs are moved into the title bar and the title bar disappears. When unchecked, the title bar sits above the tabs." ToolTipService.Placement="Mouse" />
<CheckBox IsChecked="{x:Bind GlobalSettingsModel.GlobalSettings.ShowTitleInTitlebar, Mode=TwoWay}" Content="Show terminal title in title bar" Margin="0,0,0,20" FontSize="15" ToolTipService.ToolTip="When checked, the title bar displays the title of the selected tab. When unchecked, the title bar displays 'Windows Terminal'." ToolTipService.Placement="Mouse" />
<CheckBox IsChecked="{x:Bind GlobalSettingsModel.GlobalSettings.AlwaysShowTabs, Mode=TwoWay}" Content="Always show tabs" Margin="0,0,0,20" FontSize="15" ToolTipService.ToolTip="When checked, tabs are always displayed. When unchecked and 'show the title bar' is checked, tabs only appear after opening a new tab." ToolTipService.Placement="Mouse" />
<Controls:RadioButtons Header="Tab width mode" Margin="0,0,0,20" FontSize="15" ToolTipService.ToolTip="Sets the width of the tabs. 'Equal' sizes each tab to the same width. 'Title length' sizes each tab to the length of its title. 'Compact' sizes each tab to the length of its title when focused, and shrinks to the size of only the icon when the tab is unfocused." ToolTipService.Placement="Mouse">
<RadioButton x:Name="EqualTabWidthMode" Content="Equal"/>
<RadioButton x:Name="TitleLengthTabWidthMode" Content="Title length"/>
<RadioButton x:Name="CompactTabWidthMode" Content="Compact"/>
<CheckBox x:Uid="Globals_ShowTitlebar" IsChecked="{x:Bind GlobalSettingsModel.GlobalSettings.ShowTitlebar, Mode=TwoWay}" Margin="0,0,0,20" FontSize="15" ToolTipService.Placement="Mouse" />
<CheckBox x:Uid="Globals_ShowTitleInTitlebar" IsChecked="{x:Bind GlobalSettingsModel.GlobalSettings.ShowTitleInTitlebar, Mode=TwoWay}" Margin="0,0,0,20" FontSize="15" ToolTipService.Placement="Mouse" />
<CheckBox x:Uid="Globals_AlwaysShowTabs" IsChecked="{x:Bind GlobalSettingsModel.GlobalSettings.AlwaysShowTabs, Mode=TwoWay}" Margin="0,0,0,20" FontSize="15" ToolTipService.Placement="Mouse" />
<Controls:RadioButtons x:Uid="Globals_TabWidthMode" Margin="0,0,0,20" FontSize="15" ToolTipService.Placement="Mouse">
<RadioButton x:Uid="Globals_TabWidthModeEqual" x:Name="EqualTabWidthMode"/>
<RadioButton x:Uid="Globals_TabWidthModeTitleLength" x:Name="TitleLengthTabWidthMode"/>
<RadioButton x:Uid="Globals_TabWidthModeCompact" x:Name="CompactTabWidthMode"/>
</Controls:RadioButtons>
<CheckBox IsChecked="{x:Bind GlobalSettingsModel.GlobalSettings.ConfirmCloseAllTabs, Mode=TwoWay}" Content="Show close all tabs popup" Margin="0,0,0,20" FontSize="15" ToolTipService.ToolTip="When checked, closing a window with multiple tabs open will require confirmation. When unchecked, the confirmation dialog will not appear." ToolTipService.Placement="Mouse" />
<CheckBox x:Uid="Globals_ConfirmCloseAllTabs" IsChecked="{x:Bind GlobalSettingsModel.GlobalSettings.ConfirmCloseAllTabs, Mode=TwoWay}" Margin="0,0,0,20" FontSize="15" ToolTipService.Placement="Mouse" />
</StackPanel>
</Grid>
</Page>
10 changes: 5 additions & 5 deletions src/cascadia/TerminalSettingsEditor/Interaction.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ the MIT License. See LICENSE in the project root for license information. -->
<ColumnDefinition Width="1*" />
<ColumnDefinition Width="1*" />
</Grid.ColumnDefinitions>
<TextBlock Text="Interaction"
<TextBlock x:Uid="Globals_Interaction"
Style="{StaticResource SubheaderTextBlockStyle}"
Margin="0,0,0,20" />
<StackPanel Grid.Row="1" Grid.Column="0" Margin="0,0,100,0">
<CheckBox IsChecked="{x:Bind GlobalSettingsModel.GlobalSettings.CopyOnSelect, Mode=TwoWay}" Content="Copy after selection is made" Margin="0,0,0,20" FontSize="15" ToolTipService.ToolTip="When checked, a selection is immediately copied to your clipboard upon creation. When unchecked, the selection persists and awaits further action." ToolTipService.Placement="Mouse" />
<CheckBox IsChecked="{x:Bind GlobalSettingsModel.GlobalSettings.CopyFormatting, Mode=TwoWay}" Content="Copy formatting" Margin="0,0,0,20" FontSize="15" ToolTipService.ToolTip="When checked, the color and font formatting of selected text is also copied to your clipboard. When unchecked, only plain text is copied to your clipboard." ToolTipService.Placement="Mouse" />
<TextBox Header="Word delimiters" Text="{x:Bind GlobalSettingsModel.GlobalSettings.WordDelimiters, Mode=TwoWay}" Margin="0,0,0,20" FontSize="15" ToolTipService.ToolTip="Determines the delimiters used in a double click selection." ToolTipService.Placement="Mouse" />
<CheckBox IsChecked="{x:Bind GlobalSettingsModel.GlobalSettings.SnapToGridOnResize, Mode=TwoWay}" Content="Window resize behavior" Margin="0,0,0,20" FontSize="15" ToolTipService.ToolTip="When checked, the window will snap to the nearest character boundary on resize. When unchecked, the window will resize smoothly." ToolTipService.Placement="Mouse" />
<CheckBox x:Uid="Globals_CopyOnSelect" IsChecked="{x:Bind GlobalSettingsModel.GlobalSettings.CopyOnSelect, Mode=TwoWay}" Margin="0,0,0,20" FontSize="15" ToolTipService.Placement="Mouse" />
<CheckBox x:Uid="Globals_CopyFormatting" IsChecked="{x:Bind GlobalSettingsModel.GlobalSettings.CopyFormatting, Mode=TwoWay}" Margin="0,0,0,20" FontSize="15" ToolTipService.Placement="Mouse" />
<TextBox x:Uid="Globals_WordDelimiters" Text="{x:Bind GlobalSettingsModel.GlobalSettings.WordDelimiters, Mode=TwoWay}" Margin="0,0,0,20" FontSize="15" ToolTipService.Placement="Mouse" />
<CheckBox x:Uid="Globals_SnapToGridOnResize" IsChecked="{x:Bind GlobalSettingsModel.GlobalSettings.SnapToGridOnResize, Mode=TwoWay}" Margin="0,0,0,20" FontSize="15" ToolTipService.Placement="Mouse" />
</StackPanel>
</Grid>
</Page>
Loading