Skip to content

Commit

Permalink
Condition filter localisation
Browse files Browse the repository at this point in the history
  • Loading branch information
Yuubari committed Apr 13, 2016
1 parent c6a7595 commit 780daf9
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 4 deletions.
27 changes: 27 additions & 0 deletions source/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions source/Grabacr07.KanColleViewer/Properties/Resources.en.resx
Original file line number Diff line number Diff line change
Expand Up @@ -1423,4 +1423,13 @@ HTTP proxy settings are applied immediately. Settings for all other protocols ar
<data name="FleetWindow_Status_Organisation_Normal" xml:space="preserve">
<value>Fleet composition OK</value>
</data>
<data name="ShipCatalog_Filter_Misc_Condition" xml:space="preserve">
<value>Morale</value>
</data>
<data name="ShipCatalog_Filter_Misc_ConditionAbove50" xml:space="preserve">
<value>Above 50</value>
</data>
<data name="ShipCatalog_Filter_Misc_ConditionBelow50" xml:space="preserve">
<value>Below 50</value>
</data>
</root>
9 changes: 9 additions & 0 deletions source/Grabacr07.KanColleViewer/Properties/Resources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -1415,4 +1415,13 @@ HTTP プロトコルの通信は自動構成も含め「インターネット
<data name="FleetWindow_Status_Organisation_Normal" xml:space="preserve">
<value>艦隊編成は正常です</value>
</data>
<data name="ShipCatalog_Filter_Misc_Condition" xml:space="preserve">
<value>condition</value>
</data>
<data name="ShipCatalog_Filter_Misc_ConditionAbove50" xml:space="preserve">
<value>50 以上</value>
</data>
<data name="ShipCatalog_Filter_Misc_ConditionBelow50" xml:space="preserve">
<value>50 未満</value>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -437,15 +437,15 @@
</Grid.ColumnDefinitions>
<TextBlock Margin="0,2"
HorizontalAlignment="Right">
<Run Text="condition" />
<Run Text="{Binding Resources.ShipCatalog_Filter_Misc_Condition, Source={x:Static models:ResourceService.Current}, Mode=OneWay}" />
<Run Text=":" />
</TextBlock>
<WrapPanel Grid.Column="2">
<RadioButton Content="すべて"
<RadioButton Content="{Binding Resources.ShipCatalog_Filter_Misc_All, Source={x:Static models:ResourceService.Current}, Mode=OneWay}"
IsChecked="{Binding Both, Mode=TwoWay}" />
<RadioButton Content="50 以上"
<RadioButton Content="{Binding Resources.ShipCatalog_Filter_Misc_ConditionAbove50, Source={x:Static models:ResourceService.Current}, Mode=OneWay}"
IsChecked="{Binding Brilliant, Mode=TwoWay}" />
<RadioButton Content="50 未満"
<RadioButton Content="{Binding Resources.ShipCatalog_Filter_Misc_ConditionBelow50, Source={x:Static models:ResourceService.Current}, Mode=OneWay}"
IsChecked="{Binding Unbrilliant, Mode=TwoWay}" />
</WrapPanel>
</Grid>
Expand Down

0 comments on commit 780daf9

Please sign in to comment.