Продолжение локализации

This commit is contained in:
2024-02-06 18:57:31 +03:00
parent 9562e56ffc
commit d8d20745e7
6 changed files with 38 additions and 17 deletions

View File

@@ -9,7 +9,7 @@
<RowDefinition Height="22"/> <RowDefinition Height="22"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="150"/> <ColumnDefinition Width="180"/>
<ColumnDefinition/> <ColumnDefinition/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Grid.Row="0" Text="{DynamicResource Width}"/> <TextBlock Grid.Row="0" Text="{DynamicResource Width}"/>
@@ -26,10 +26,10 @@
<RowDefinition Height="22"/> <RowDefinition Height="22"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="160"/>
<ColumnDefinition/> <ColumnDefinition/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Grid.Row="0" Text="Diameter"/> <TextBlock Grid.Row="0" Text="{DynamicResource Diameter}"/>
<TextBox Grid.Row="0" Grid.Column="1" Margin="1" Style="{StaticResource ValidatedError}" Text="{Binding Diameter, Converter={StaticResource LengthConverter}, ValidatesOnDataErrors=True}"/> <TextBox Grid.Row="0" Grid.Column="1" Margin="1" Style="{StaticResource ValidatedError}" Text="{Binding Diameter, Converter={StaticResource LengthConverter}, ValidatesOnDataErrors=True}"/>
</Grid> </Grid>
</DataTemplate> </DataTemplate>

View File

@@ -68,6 +68,16 @@
<system:String x:Key="Reinforced rectangle template">Reinforced rectangle template</system:String> <system:String x:Key="Reinforced rectangle template">Reinforced rectangle template</system:String>
<system:String x:Key="Width">Width</system:String> <system:String x:Key="Width">Width</system:String>
<system:String x:Key="Height">Height</system:String> <system:String x:Key="Height">Height</system:String>
<system:String x:Key="Cover gap">Cover gap</system:String>
<system:String x:Key="Top Diameter">Top Diameter</system:String>
<system:String x:Key="Bottom Diameter">Bottom Diameter</system:String>
<system:String x:Key="Width count">Width count</system:String>
<system:String x:Key="Height count">Height count</system:String>
<system:String x:Key="Diameter">Diameter</system:String>
<system:String x:Key="Rebar Diameter">Rebar Diameter</system:String>
<system:String x:Key="Rebar Count">Rebar Count</system:String>
<system:String x:Key="Reinforced circle template">Reinforced circle template</system:String>

View File

@@ -65,8 +65,19 @@
<system:String x:Key="Work plane width">Ширина рабочей плоскости</system:String> <system:String x:Key="Work plane width">Ширина рабочей плоскости</system:String>
<system:String x:Key="Work plane height">Высота рабочей плоскости</system:String> <system:String x:Key="Work plane height">Высота рабочей плоскости</system:String>
<system:String x:Key="Reinforced rectangle template">Шаблон армированного прямоугольника</system:String> <system:String x:Key="Reinforced rectangle template">Шаблон армирования прямоугольника</system:String>
<system:String x:Key="Width">Ширина</system:String> <system:String x:Key="Width">Ширина</system:String>
<system:String x:Key="Height">Высота</system:String> <system:String x:Key="Height">Высота</system:String>
<system:String x:Key="Cover gap">Защитный слой</system:String>
<system:String x:Key="Top Diameter">Диаметр верхней арматуры</system:String>
<system:String x:Key="Bottom Diameter">Диаметр нижней арматуры</system:String>
<system:String x:Key="Width count">Число стержней по ширине</system:String>
<system:String x:Key="Height count">Число стержней по высоте</system:String>
<system:String x:Key="Diameter">Диаметр окужности</system:String>
<system:String x:Key="Rebar Diameter">Диаметр арматуры</system:String>
<system:String x:Key="Rebar Count">Число стержней арматуры</system:String>
<system:String x:Key="Reinforced circle template">Шаблон армирования окружности</system:String>
<!-- All StringResources Goes Here --> <!-- All StringResources Goes Here -->
</ResourceDictionary> </ResourceDictionary>

View File

@@ -5,8 +5,8 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:StructureHelper.Windows.PrimitiveTemplates.RCs.Beams" xmlns:local="clr-namespace:StructureHelper.Windows.PrimitiveTemplates.RCs.Beams"
mc:Ignorable="d" mc:Ignorable="d"
Title="Reinforced circle template" Height="220" Width="300" SizeToContent="Height" WindowStartupLocation="CenterScreen" ResizeMode="NoResize"> Title="{DynamicResource Reinforced circle template}" Height="220" Width="300" SizeToContent="Height" WindowStartupLocation="CenterScreen" ResizeMode="NoResize">
<Grid> <Grid Margin="5">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition/> <RowDefinition/>
<RowDefinition Height="35"/> <RowDefinition Height="35"/>
@@ -22,12 +22,12 @@
<RowDefinition Height="22"/> <RowDefinition Height="22"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="160"/>
<ColumnDefinition/> <ColumnDefinition/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Grid.Row="0" Text="Cover gap"/> <TextBlock Grid.Row="0" Text="{DynamicResource Cover gap}"/>
<TextBlock Grid.Row="1" Text="Rebar Diameter"/> <TextBlock Grid.Row="1" Text="{DynamicResource Rebar Diameter}"/>
<TextBlock Grid.Row="2" Text="Rebar Count"/> <TextBlock Grid.Row="2" Text="{DynamicResource Rebar Count}"/>
<TextBox Grid.Row="0" Grid.Column="1" Margin="1" Style="{StaticResource ValidatedError}" Text="{Binding CoverGap, Converter={StaticResource LengthConverter}, ValidatesOnExceptions=True}"/> <TextBox Grid.Row="0" Grid.Column="1" Margin="1" Style="{StaticResource ValidatedError}" Text="{Binding CoverGap, Converter={StaticResource LengthConverter}, ValidatesOnExceptions=True}"/>
<TextBox Grid.Row="1" Grid.Column="1" Margin="1" Style="{StaticResource ValidatedError}" Text="{Binding BarDiameter, Converter={StaticResource LengthConverter}, ValidatesOnExceptions=True}"/> <TextBox Grid.Row="1" Grid.Column="1" Margin="1" Style="{StaticResource ValidatedError}" Text="{Binding BarDiameter, Converter={StaticResource LengthConverter}, ValidatesOnExceptions=True}"/>
<TextBox Grid.Row="2" Grid.Column="1" Margin="1" Style="{StaticResource ValidatedError}" Text="{Binding BarCount, ValidatesOnExceptions=True}"/> <TextBox Grid.Row="2" Grid.Column="1" Margin="1" Style="{StaticResource ValidatedError}" Text="{Binding BarCount, ValidatesOnExceptions=True}"/>

View File

@@ -27,14 +27,14 @@
<RowDefinition Height="22"/> <RowDefinition Height="22"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="150"/> <ColumnDefinition Width="180"/>
<ColumnDefinition/> <ColumnDefinition/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Grid.Row="0" Text="Cover gap"/> <TextBlock Grid.Row="0" Text="{DynamicResource Cover gap}"/>
<TextBlock Grid.Row="1" Text="Top Diameter"/> <TextBlock Grid.Row="1" Text="{DynamicResource Top Diameter}"/>
<TextBlock Grid.Row="2" Text="Bottom Diameter"/> <TextBlock Grid.Row="2" Text="{DynamicResource Bottom Diameter}"/>
<TextBlock Grid.Row="3" Text="Width count"/> <TextBlock Grid.Row="3" Text="{DynamicResource Width count}"/>
<TextBlock Grid.Row="4" Text="Height count"/> <TextBlock Grid.Row="4" Text="{DynamicResource Height count}"/>
<TextBox Grid.Row="0" Grid.Column="1" Margin="1" Style="{StaticResource ValidatedError}" Text="{Binding CoverGap, Converter={StaticResource LengthConverter}, ValidatesOnExceptions=True}"/> <TextBox Grid.Row="0" Grid.Column="1" Margin="1" Style="{StaticResource ValidatedError}" Text="{Binding CoverGap, Converter={StaticResource LengthConverter}, ValidatesOnExceptions=True}"/>
<TextBox Grid.Row="1" Grid.Column="1" Margin="1" Style="{StaticResource ValidatedError}" Text="{Binding TopDiameter, Converter={StaticResource LengthConverter}, ValidatesOnExceptions=True}"/> <TextBox Grid.Row="1" Grid.Column="1" Margin="1" Style="{StaticResource ValidatedError}" Text="{Binding TopDiameter, Converter={StaticResource LengthConverter}, ValidatesOnExceptions=True}"/>
<TextBox Grid.Row="2" Grid.Column="1" Margin="1" Style="{StaticResource ValidatedError}" Text="{Binding BottomDiameter, Converter={StaticResource LengthConverter}, ValidatesOnExceptions=True}"/> <TextBox Grid.Row="2" Grid.Column="1" Margin="1" Style="{StaticResource ValidatedError}" Text="{Binding BottomDiameter, Converter={StaticResource LengthConverter}, ValidatesOnExceptions=True}"/>