preparation for localisation

AntonyCorbett · Dec 25, 2018 · ab66b37 · ab66b37
1 parent ad8835c
commit ab66b37
Show file tree

Hide file tree

Showing 9 changed files with 493 additions and 54 deletions.
diff --git a/OnlyV/Pages/EditTextPage.xaml b/OnlyV/Pages/EditTextPage.xaml
@@ -67,7 +67,7 @@
                                 Margin="10,0,0,0"
                                 IsEnabled="{Binding IsFocused}"
                                 Focusable="False"
-                                ToolTip="Insert opening quotation mark"
+                                ToolTip="{x:Static resx:Resources.INSERT_OPENING_QUOTE}"
                                 HorizontalAlignment="Left" Click="OpeningQuoteButtonClick">
                             <materialDesign:PackIcon
                                 Kind="FormatQuoteOpen" 
@@ -77,7 +77,7 @@
                         <Button Style="{StaticResource QuoteButtonStyle}" 
                                 IsEnabled="{Binding IsFocused}"
                                 Focusable="False"
-                                ToolTip="Insert closing quotation mark"
+                                ToolTip="{x:Static resx:Resources.INSERT_CLOSING_QUOTE}"
                                 HorizontalAlignment="Right" Click="ClosingQuoteButtonClick">
                             <materialDesign:PackIcon
                                 Kind="FormatQuoteClose" 
@@ -92,8 +92,8 @@
                             IsEnabled="{Binding IsModified}"
                             Command="{Binding ResetCommand}"
                             Style="{StaticResource MaterialDesignRaisedLightButton}"
-                            ToolTip="Reset the verse text"
-                            Content="RESET" />
+                            ToolTip="{x:Static resx:Resources.RESET_VERSE_TEXT}"
+                            Content="{x:Static resx:Resources.RESET}" />
                     </Grid>
                 </Grid>
             </GroupBox>

diff --git a/OnlyV/Pages/PreviewPage.xaml b/OnlyV/Pages/PreviewPage.xaml
@@ -9,6 +9,7 @@
              DataContext="{Binding Source={StaticResource Locator}, Path=Preview}"
 
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:resx="clr-namespace:OnlyV.Properties"
              TextElement.Foreground="{DynamicResource MaterialDesignBody}"
              TextElement.FontWeight="Medium"
              TextElement.FontSize="14"
@@ -70,7 +71,7 @@
         <DockPanel Grid.Row="0" Margin="10,5">
             <Button Style="{StaticResource PreviewButtonStyle}" 
                     Command="{Binding SaveCommand}" 
-                    ToolTip="Save to images folder">
+                    ToolTip="{x:Static resx:Resources.SAVE_TO_IMAGES}">
                 <materialDesign:PackIcon
                     Kind="ContentSave" 
                     Height="32"
@@ -79,7 +80,7 @@
 
             <Button Style="{StaticResource PreviewButtonStyle}" 
                     Command="{Binding CopyToClipboardCommand}" 
-                    ToolTip="Copy image to clipboard">
+                    ToolTip="{x:Static resx:Resources.COPY_TO_CLIPBOARD}">
                 <materialDesign:PackIcon
                     Kind="ContentCopy" 
                     Height="32"
@@ -88,7 +89,7 @@
 
             <Button Style="{StaticResource PreviewNavButtonStyle}" 
                     Command="{Binding NextImageCommand}"
-                    ToolTip="Next image">
+                    ToolTip="{x:Static resx:Resources.NEXT_IMAGE}">
                 <materialDesign:PackIcon
                     Kind="ChevronRight" 
                     Height="32"
@@ -97,14 +98,13 @@
 
             <Button Style="{StaticResource PreviewNavButtonStyle}" 
                     Command="{Binding PreviousImageCommand}" 
-                    ToolTip="Previous image">
+                    ToolTip="{x:Static resx:Resources.PREV_IMAGE}">
                 <materialDesign:PackIcon
                     Kind="ChevronLeft" 
                     Height="32"
                     Width="32"/>
             </Button>
 
-
             <ToggleButton HorizontalAlignment="Right" 
                                       DockPanel.Dock="Right"
                                       Style="{StaticResource PreviewToggleButtonStyle}" 

diff --git a/OnlyV/Pages/ScripturesPage.xaml b/OnlyV/Pages/ScripturesPage.xaml
@@ -9,6 +9,7 @@
              DataContext="{Binding Source={StaticResource Locator}, Path=Scriptures}"
 
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:resx="clr-namespace:OnlyV.Properties"
              TextElement.Foreground="{DynamicResource MaterialDesignBody}"
              TextElement.FontWeight="Medium"
              TextElement.FontSize="14"
@@ -17,7 +18,7 @@
              Background="{DynamicResource MaterialDesignPaper}"
              FontFamily="{DynamicResource MaterialDesignFont}"
 
-             d:DesignHeight="650" d:DesignWidth="900" Loaded="UserControl_Loaded">
+             d:DesignHeight="650" d:DesignWidth="900" Loaded="UserControlLoaded">
     <UserControl.Resources>
         <Style x:Key="PanelCardStyle" TargetType="{x:Type materialDesign:Card}">
             <Setter Property="VerticalAlignment" Value="Stretch"/>
@@ -132,7 +133,7 @@
 
                         <TextBlock Grid.Row="0" 
                                    Style="{StaticResource BibleSectionLabelStyle}" 
-                                   Text="BOOK"/>
+                                   Text="{x:Static resx:Resources.BOOK}"/>
 
                         <ScrollViewer Grid.Row="1" 
                                       Margin="4" 
@@ -165,7 +166,7 @@
                         </Grid.RowDefinitions>
 
                         <TextBlock Grid.Row="0" 
-                                   Text="CHAPTER"
+                                   Text="{x:Static resx:Resources.CHAPTER}"
                                    Style="{StaticResource BibleSectionLabelStyle}"/>
 
                         <ScrollViewer Grid.Row="1" Margin="4" VerticalScrollBarVisibility="Auto" PanningMode="VerticalOnly">
@@ -189,7 +190,7 @@
                         </Grid.RowDefinitions>
 
                         <TextBlock Grid.Row="0" 
-                                   Text="VERSES"
+                                   Text="{x:Static resx:Resources.VERSES}"
                                    Style="{StaticResource BibleSectionLabelStyle}"/>
 
                         <ScrollViewer Grid.Row="1" 

diff --git a/OnlyV/Pages/ScripturesPage.xaml.cs b/OnlyV/Pages/ScripturesPage.xaml.cs
@@ -14,7 +14,7 @@ public ScripturesPage()
             InitializeComponent();
         }
 
-        private void UserControl_Loaded(object sender, System.Windows.RoutedEventArgs e)
+        private void UserControlLoaded(object sender, System.Windows.RoutedEventArgs e)
         {
             if (!BringButtonIntoView(HebrewBooksControl))
             {

diff --git a/OnlyV/Pages/SettingsPage.xaml b/OnlyV/Pages/SettingsPage.xaml
@@ -9,6 +9,7 @@
              DataContext="{Binding Source={StaticResource Locator}, Path=Settings}"
 
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:resx="clr-namespace:OnlyV.Properties"
              TextElement.Foreground="{DynamicResource MaterialDesignBody}"
              TextElement.FontWeight="Medium"
              TextElement.FontSize="14"
@@ -60,7 +61,8 @@
                   HorizontalScrollBarVisibility="Hidden"
                   PanningMode="VerticalOnly">
     <StackPanel Orientation="Vertical" Margin="5">
-        <GroupBox Header="Bibles" Style="{StaticResource SettingsGroupBoxStyle}">
+            <GroupBox Header="{x:Static resx:Resources.HEADER_BIBLES}" 
+                      Style="{StaticResource SettingsGroupBoxStyle}">
             <StackPanel Orientation="Vertical">
 
                 <Grid
@@ -83,15 +85,15 @@
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         TextWrapping="Wrap"
-                        Text="Download Bible epub files from jw.org and drag and drop here."
+                        Text="{x:Static resx:Resources.DROP_BIBLE_INSTRUCTIONS}"
                         Foreground="{StaticResource PrimaryHueDarkBrush}"/>
 
                 </Grid>
 
                 <ComboBox ItemsSource="{Binding BibleEpubFiles}"
                           Style="{StaticResource SettingsComboBoxStyle}" 
                           materialDesign:HintAssist.IsFloating="True"
-                          materialDesign:HintAssist.Hint="Bible epub file"
+                          materialDesign:HintAssist.Hint="{x:Static resx:Resources.BIBLE_EPUB_FILE}"
                           SelectedValuePath="Path" 
                           DisplayMemberPath="Name"
                           materialDesign:ComboBoxAssist.ClassicMode="true"
@@ -101,28 +103,34 @@
             </StackPanel>
         </GroupBox>
 
-        <GroupBox Header="Display" Style="{StaticResource SettingsGroupBoxStyle}">
-            <StackPanel Orientation="Vertical">
-
-                <ComboBox ItemsSource="{Binding Monitors}"
-                          Style="{StaticResource SettingsComboBoxStyle}" 
-                          materialDesign:HintAssist.IsFloating="True"
-                          materialDesign:HintAssist.Hint="Media Monitor"
-                          SelectedValuePath="MonitorId" 
-                          DisplayMemberPath="FriendlyName"
-                          materialDesign:ComboBoxAssist.ClassicMode="true"
-                          SelectedValue="{Binding MonitorId, Mode=TwoWay}">
-                </ComboBox>
-
-                <CheckBox IsChecked="{Binding JwLibraryCompatibilityMode, Mode=TwoWay}"
-                          Content="JW Library compatibility mode"
-                          Style="{StaticResource SettingsCheckBoxStyle}"/>
-
-            </StackPanel>
-        </GroupBox>
-
-
-        <GroupBox Header="Image Style" Style="{StaticResource SettingsGroupBoxStyle}">
+            <GroupBox Header="{x:Static resx:Resources.HEADER_DISPLAY}" 
+                      Style="{StaticResource SettingsGroupBoxStyle}">
+                <StackPanel Orientation="Vertical">
+
+                    <ComboBox ItemsSource="{Binding Monitors}"
+                              Style="{StaticResource SettingsComboBoxStyle}" 
+                              materialDesign:HintAssist.IsFloating="True"
+                              materialDesign:HintAssist.Hint="{x:Static resx:Resources.MEDIA_MONITOR}"
+                              SelectedValuePath="MonitorId" 
+                              DisplayMemberPath="FriendlyName"
+                              materialDesign:ComboBoxAssist.ClassicMode="true"
+                              SelectedValue="{Binding MonitorId, Mode=TwoWay}"/>
+
+                    <CheckBox IsChecked="{Binding JwLibraryCompatibilityMode, Mode=TwoWay}"
+                              Content="{x:Static resx:Resources.JW_COMPAT_MODE}"
+                              Style="{StaticResource SettingsCheckBoxStyle}"/>
+
+                    <TextBlock FontSize="12" 
+                               Width="420"
+                               Margin="0,10,0,0"
+                               HorizontalAlignment="Left"
+                               TextWrapping="Wrap"
+                               Text="{x:Static resx:Resources.JWL_TRADEMARK}" />
+                </StackPanel>
+            </GroupBox>
+
+
+            <GroupBox Header="{x:Static resx:Resources.HEADER_IMAGE_STYLE}" Style="{StaticResource SettingsGroupBoxStyle}">
             <StackPanel Orientation="Vertical">
 
                 <ComboBox ItemsSource="{Binding ThemeFiles}"
@@ -135,7 +143,7 @@
                           SelectedValue="{Binding CurrentThemePath, Mode=TwoWay}">
                 </ComboBox>
 
-                <Label Margin="-5,0,0,0">Text scaling:</Label>
+                    <Label Margin="-5,0,0,0" Content="{x:Static resx:Resources.TEXT_SCALING}"/>
                 <Slider Width="420"
                         Margin="0,0,0,10"
                         Minimum="50"
@@ -146,37 +154,38 @@
                         HorizontalAlignment="Left" />
 
                 <CheckBox IsChecked="{Binding UseBackgroundImage, Mode=TwoWay}"
-                          Content="Use background image"
+                          Content="{x:Static resx:Resources.USE_BACKGROUND_IMAGE}"
                           Style="{StaticResource SettingsCheckBoxStyle}"/>
 
                 <CheckBox IsChecked="{Binding AutoFit, Mode=TwoWay}"
-                          Content="Auto fit"
+                          Content="{x:Static resx:Resources.AUTO_FIT}"
                           Style="{StaticResource SettingsCheckBoxStyle}"/>
 
                 <CheckBox IsChecked="{Binding ShowVerseBreaks, Mode=TwoWay}"
-                          Content="Use ellipses to indicate non-contiguous verses"
+                          Content="{x:Static resx:Resources.USE_ELLIPSES}"
                           Style="{StaticResource SettingsCheckBoxStyle}"/>
 
                 <CheckBox IsChecked="{Binding UseTildeMarker, Mode=TwoWay}"
-                          Content="Show a tilde between paragraphs in a single verse"
+                          Content="{x:Static resx:Resources.USE_TILDE}"
                           Style="{StaticResource SettingsCheckBoxStyle}"/>
 
                 <CheckBox IsChecked="{Binding TrimPunctuation, Mode=TwoWay}"
-                          Content="Trim punctuation"
+                          Content="{x:Static resx:Resources.TRIM_PUNCTUATION}"
                           Style="{StaticResource SettingsCheckBoxStyle}"/>
 
                 <CheckBox IsChecked="{Binding TrimQuotes, Mode=TwoWay}"
-                          Content="Trim quotation marks"
+                          Content="{x:Static resx:Resources.TRIM_QUOTES}"
                           Style="{StaticResource SettingsCheckBoxStyle}"/>
 
                 <CheckBox IsChecked="{Binding ShowVerseNos, Mode=TwoWay}"
-                          Content="Show verse numbers"
+                          Content="{x:Static resx:Resources.SHOW_VERSE_NOS}"
                           Style="{StaticResource SettingsCheckBoxStyle}"/>
             </StackPanel>
         </GroupBox>
 
 
-        <GroupBox Header="Miscellaneous" Style="{StaticResource SettingsGroupBoxStyle}">
+            <GroupBox Header="{x:Static resx:Resources.HEADER_MISC}" 
+                      Style="{StaticResource SettingsGroupBoxStyle}">
             <StackPanel Orientation="Vertical">
 
                 <TextBlock Text="{Binding AppVersionStr}" 
@@ -185,11 +194,11 @@
                            Foreground="{StaticResource MaterialDesignBodyLight}" />
 
                 <CheckBox IsChecked="{Binding AlwaysOnTop, Mode=TwoWay}"
-                          Content="Main window always on top"
+                          Content="{x:Static resx:Resources.ALWAYS_ON_TOP}"
                           Style="{StaticResource SettingsCheckBoxStyle}"/>
 
                 <CheckBox IsChecked="{Binding AllowVerseEditing, Mode=TwoWay}"
-                          Content="Allow verse editing"
+                          Content="{x:Static resx:Resources.ALLOW_VERSE_EDITING}"
                           Style="{StaticResource SettingsCheckBoxStyle}"/>
 
                 <DockPanel LastChildFill="True" Width="420" HorizontalAlignment="Left">
@@ -202,15 +211,14 @@
                         Style="{StaticResource SelectFolderStyle}"
                         DockPanel.Dock="Left" 
                         Margin="0,10,0,10"
-                        materialDesign:HintAssist.Hint="Images folder"
+                        materialDesign:HintAssist.Hint="{x:Static resx:Resources.IMAGES_FOLDER}"
                         Text="{Binding DestinationFolder, Mode=TwoWay}" />
                 </DockPanel>
 
-
                 <ComboBox ItemsSource="{Binding LoggingLevels}"
                           Style="{StaticResource SettingsComboBoxStyle}" 
                           materialDesign:HintAssist.IsFloating="True"
-                          materialDesign:HintAssist.Hint="Logging Level"
+                          materialDesign:HintAssist.Hint="{x:Static resx:Resources.LOGGING_LEVEL}"
                           SelectedValuePath="Level" 
                           DisplayMemberPath="Name"
                           materialDesign:ComboBoxAssist.ClassicMode="true"

diff --git a/OnlyV/Pages/StartupPage.xaml b/OnlyV/Pages/StartupPage.xaml
@@ -9,6 +9,7 @@
              DataContext="{Binding Source={StaticResource Locator}, Path=Startup}"
 
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:resx="clr-namespace:OnlyV.Properties"
              TextElement.Foreground="{DynamicResource MaterialDesignBody}"
              TextElement.FontWeight="Medium"
              TextElement.FontSize="14"
@@ -36,7 +37,7 @@
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
                 TextWrapping="Wrap"
-                Text="To get started, download a Bible epub file from jw.org and then drag and drop it here."
+                Text="{x:Static resx:Resources.GET_STARTED_INSTRUCTIONS}"
                 Foreground="{StaticResource PrimaryHueDarkBrush}"/>
 
         </Grid>