From 334f76b75270a0aff5006c7d8a30983ece5a6b4c Mon Sep 17 00:00:00 2001
From: Vanessa Gertman <vanessagertman@gmail.com>
Date: Wed, 26 Apr 2017 15:43:41 -0600
Subject: [PATCH] Move enrollment strings to the resource file

---
 src/Magpie/Magpie/Resources/Strings.xaml      |  4 ++++
 src/Magpie/Magpie/Views/EnrollmentWindow.xaml | 14 ++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/Magpie/Magpie/Resources/Strings.xaml b/src/Magpie/Magpie/Resources/Strings.xaml
index c94d95d..4fd81b1 100644
--- a/src/Magpie/Magpie/Resources/Strings.xaml
+++ b/src/Magpie/Magpie/Resources/Strings.xaml
@@ -5,4 +5,8 @@
     <system:String x:Key="_downloadNow">Download Now</system:String>
     <system:String x:Key="_skipVersion">Skip this Version</system:String>
     <system:String x:Key="_remindMeLater">Remind Me Later</system:String>
+    <system:String x:Key="_dontEnroll">I don't want to</system:String>
+    <system:String x:Key="_enroll">I don't want to</system:String>
+    <system:String x:Key="_enrollMsg">Please provide your email address to join the {0} Program</system:String>
+    <system:String x:Key="_eulaMsg" xml:space="preserve">By enrolling in this program you agree with our </system:String>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Magpie/Magpie/Views/EnrollmentWindow.xaml b/src/Magpie/Magpie/Views/EnrollmentWindow.xaml
index 3d085cd..42335f3 100644
--- a/src/Magpie/Magpie/Views/EnrollmentWindow.xaml
+++ b/src/Magpie/Magpie/Views/EnrollmentWindow.xaml
@@ -39,7 +39,7 @@
             <TextBlock Margin="5 10 10 10"
                        DockPanel.Dock="Right"
                        FontSize="15"
-                       Text="{Binding ChannelName, StringFormat={}Please provide your email address to join the {0} Program}"
+                       Text="{Binding ChannelName, StringFormat={StaticResource _enrollMsg}}"
                        TextWrapping="Wrap" />
         </DockPanel>
         <Grid Row="1">
@@ -50,8 +50,7 @@
                      FontSize="14"
                      Padding="32 4 4 6"
                      SnapsToDevicePixels="True"
-                     Text="{Binding EmailAddress,
-                                        UpdateSourceTrigger=PropertyChanged}" />
+                     Text="{Binding EmailAddress, UpdateSourceTrigger=PropertyChanged}" />
             <Image Width="26"
                    Margin="15 10 0 8"
                    HorizontalAlignment="Left"
@@ -61,10 +60,9 @@
         <TextBlock Grid.Row="2" Margin="10 5 10 10"
                    FontSize="13"
                    Foreground="#555"
-                   Text="By enrolling in this program you agree with our "
+                   Text="{DynamicResource _eulaMsg}"
                    TextWrapping="Wrap">
-            <Hyperlink NavigateUri="{Binding EnrollmentEulaUrl}"
-                       RequestNavigate="NavigateUri">
+            <Hyperlink NavigateUri="{Binding EnrollmentEulaUrl}" RequestNavigate="NavigateUri">
                 <Run Text="EULA"/>
             </Hyperlink>
         </TextBlock>
@@ -82,13 +80,13 @@
                     Orientation="Horizontal">
             <Button
                 MinWidth="120"
-                Content="I don't want to"
+                Content="{DynamicResource _dontEnroll}"
                 IsCancel="True"
                 Style="{StaticResource _magpieSecondaryBtn}" Click="CloseWindow" />
             <Button Margin="5,0,0,0"
                     Width="80"
                     Command="{Binding EnrollCommand}"
-                    Content="Enroll"
+                    Content="{DynamicResource _enroll}"
                     Click="CloseWindow"
                     Style="{StaticResource _magpiePrimaryBtn}" />