Merge branch 'developer' into help

# Conflicts:
#	Breda-Tour/Breda-Tour.csproj
#	Breda-Tour/HelpScreen/HelpPage.xaml
#	Breda-Tour/SettingsScreen/SettingsPage.xaml
#	Breda-Tour/SettingsScreen/SettingsPage.xaml.cs

Breda-Tour/App.xaml.cs

@@ -22,6 +22,11 @@ namespace Breda_Tour
     /// </summary>
     sealed partial class App : Application
     {
+        /// <summary>
+        /// Global current language property
+        /// </summary>
+        public static string Language { get; set; }
+
         /// <summary>
         /// Initializes the singleton application object.  This is the first line of authored code
         /// executed, and as such is the logical equivalent of main() or WinMain().

Breda-Tour/Breda-Tour.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Breda_Tour</RootNamespace>
     <AssemblyName>Breda-Tour</AssemblyName>
-    <DefaultLanguage>en-US</DefaultLanguage>
+    <DefaultLanguage>nl-NL</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
     <TargetPlatformVersion>10.0.10240.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
@@ -89,11 +89,16 @@
     <Prefer32Bit>true</Prefer32Bit>
     <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
   </PropertyGroup>
+  <PropertyGroup Label="MultilingualAppToolkit">
+    <MultilingualAppToolkitVersion>4.0</MultilingualAppToolkitVersion>
+    <MultilingualFallbackLanguage>nl-NL</MultilingualFallbackLanguage>
+  </PropertyGroup>
   <ItemGroup>
     <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
     <Content Include="ApplicationInsights.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <PRIResource Include="en-US\Resources.resw" />
     <None Include="project.json" />
     <Content Include="Storage\helpimages\taal_1.jpg">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -107,6 +112,7 @@
     <Content Include="Storage\helpitems\helpitems.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <PRIResource Include="nl-NL\Resources.resw" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="App.xaml.cs">
@@ -196,10 +202,17 @@
     <Folder Include="Controller\" />
     <Folder Include="View\" />
   </ItemGroup>
+  <ItemGroup>
+    <XliffResource Include="MultilingualResources\Breda-Tour.en-US.xlf" />
+  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\Multilingual App Toolkit\Microsoft.Multilingual.PriResources.targets" Label="MultilingualAppToolkit" Condition="Exists('$(MSBuildExtensionsPath)\Microsoft\Multilingual App Toolkit\Microsoft.Multilingual.PriResources.targets')" />
+  <Target Name="MATPrerequisite" BeforeTargets="PrepareForBuild" Condition="!Exists('$(MSBuildExtensionsPath)\Microsoft\Multilingual App Toolkit\Microsoft.Multilingual.PriResources.targets')" Label="MultilingualAppToolkit">
+    <Warning Text="$(MSBuildProjectFile) is Multilingual build enabled, but the Multilingual App Toolkit is unavailable during the build. If building with Visual Studio, please check to ensure that toolkit is properly installed." />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

Breda-Tour/MultilingualResources/Breda-Tour.en-US.xlf

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="nl-NL" target-language="en-US" original="BREDA-TOUR/NL-NL/RESOURCES.RESW" tool-id="MultilingualAppToolkit" product-name="n/a" product-version="n/a" build-num="n/a">
+    <header>
+      <tool tool-id="MultilingualAppToolkit" tool-name="Multilingual App Toolkit" tool-version="4.0.1517.0" tool-company="Microsoft" />
+    </header>
+    <body>
+      <group id="BREDA-TOUR/NL-NL/RESOURCES.RESW" datatype="resx">
+        <trans-unit id="AppSettingstxtSettings.Header" translate="yes" xml:space="preserve">
+          <source>Instellingen</source>
+          <target state="translated" state-qualifier="tm-suggestion">Settings</target>
+        </trans-unit>
+        <trans-unit id="AppSettingstxtSetupLanguage.Text" translate="yes" xml:space="preserve">
+          <source>Taal instellen</source>
+          <target state="translated">Set up language</target>
+        </trans-unit>
+        <trans-unit id="AppSettingsHelp.Text" translate="yes" xml:space="preserve">
+          <source>Help</source>
+          <target state="translated" state-qualifier="tm-suggestion">Help</target>
+        </trans-unit>
+        <trans-unit id="AppSettingsLanguageSettings.Text" translate="yes" xml:space="preserve">
+          <source>Taal instellingen</source>
+          <target state="translated" state-qualifier="mt-suggestion">Language settings</target>
+        </trans-unit>
+        <trans-unit id="RouteSelectPagetxtSelectRoute.Header" translate="yes" xml:space="preserve">
+          <source>Route selecteren</source>
+          <target state="translated" state-qualifier="mt-suggestion">Select route</target>
+        </trans-unit>
+        <trans-unit id="HelpPagetxtBack.Text" translate="yes" xml:space="preserve">
+          <source>Vorige</source>
+          <target state="translated">Back</target>
+        </trans-unit>
+        <trans-unit id="HelpPagetxtNext.Text" translate="yes" xml:space="preserve">
+          <source>Volgende</source>
+          <target state="translated">Next</target>
+        </trans-unit>
+        <trans-unit id="AppSettingstxtLanguageString.Text" translate="yes" xml:space="preserve">
+          <source>Nederlands</source>
+          <target state="translated">English</target>
+        </trans-unit>
+      </group>
+    </body>
+  </file>
+</xliff>

Breda-Tour/RouteSelectScreen/RouteSelectPage.xaml

@@ -14,7 +14,7 @@
             <RowDefinition Height="50" />
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
-        <c:DefaultTopBar Header="Route Selecteren"/>
+        <c:DefaultTopBar x:Uid="RouteSelectPagetxtSelectRoute" Header="Route Selecteren"/>
         <c:DefaultPivotControl x:Name="DefaultPivot" Grid.Row="1"/>
         
     </Grid>

Breda-Tour/SettingsScreen/SettingsPage.xaml

@@ -14,19 +14,19 @@
             <RowDefinition Height="50"/>
             <RowDefinition Height="*" ScrollViewer.VerticalScrollMode="Enabled"/>
         </Grid.RowDefinitions>
-        <c:DefaultTopBar Header="Instellingen"/>
+        <c:DefaultTopBar Header="Instellingen" x:Uid="AppSettingstxtSettings"/>
         <c:DefaultPivotControl x:Name="DefaultPivot" Grid.Row="1"/>
         <ScrollViewer Grid.Row="2" VerticalScrollBarVisibility="Hidden">
             <StackPanel Orientation="Vertical" Background="White">
-                <TextBlock Style="{StaticResource SettingsHeaderStyle}" Foreground="{StaticResource BredaToursMainColorBrush}" Text="{StaticResource AppSettingsLanguageSettings}"></TextBlock>
-                <ListViewItem>
+                <TextBlock x:Uid="AppSettingsLanguageSettings"  Style="{StaticResource SettingsHeaderStyle}" Foreground="{StaticResource BredaToursMainColorBrush}" Text="{StaticResource AppSettingsLanguageSettings}"></TextBlock>
+                <ListViewItem Name="listViewItemSetupLanguage" Tapped="listViewItemSetupLanguage_Tapped">
                     <StackPanel Margin="8,0,0,0">
-                        <TextBlock FontSize="18" Text="Taal instellen"></TextBlock>
-                        <TextBlock Margin="0,-1,0,0" FontSize="12" Text="{StaticResource AppLanguageDutch}"></TextBlock>
+                        <TextBlock x:Uid="AppSettingstxtSetupLanguage" FontSize="18" Text="Taal instellen" Foreground="White"></TextBlock>
+                        <TextBlock x:Uid="AppSettingstxtLanguageString" Margin="0,-1,0,0" FontSize="12" Foreground="White" Text="Nederlands"></TextBlock>
                     </StackPanel>
                 </ListViewItem>
                 <Rectangle Margin="0,15,0,0" Fill="#99000000" Height="1" />
-                <TextBlock Style="{StaticResource SettingsHeaderStyle}" Foreground="{StaticResource BredaToursMainColorBrush}" Text="{StaticResource AppSettingsHelp}"></TextBlock>
+                <TextBlock x:Uid="AppSettingsHelp" Style="{StaticResource SettingsHeaderStyle}" Foreground="{StaticResource BredaToursMainColorBrush}" Text="{StaticResource AppSettingsHelp}"></TextBlock>
                 <ListView ItemsSource="{x:Bind HelpItems}" IsItemClickEnabled="True" ItemClick="ListView_ItemClick" >
                     <ListView.ItemTemplate >
                         <DataTemplate  x:DataType="data:HelpItem">

Breda-Tour/SettingsScreen/SettingsPage.xaml.cs

@@ -18,6 +18,7 @@ using Windows.UI.Xaml.Data;
 using Windows.UI.Xaml.Input;
 using Windows.UI.Xaml.Media;
 using Windows.UI.Xaml.Navigation;
+using Windows.Globalization;
 
 // The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
 
@@ -52,6 +53,24 @@ namespace Breda_Tours.SettingsScreen
         {
             HelpItem helpitem = (HelpItem)e.ClickedItem;
             MainPage.RootFrame.Navigate(typeof(HelpPage), helpitem);
+		}
+		
+        private void listViewItemSetupLanguage_Tapped(object sender, TappedRoutedEventArgs e)
+        {
+            if (App.Language == "nl-NL")
+            {
+                App.Language = "en-US";
+                ApplicationLanguages.PrimaryLanguageOverride = "en-US";
+                Debug.WriteLine("my language is:" + ApplicationLanguages.ManifestLanguages.First());
+                Frame.Navigate(typeof(MainPage));
+            }
+            else
+            {
+                App.Language = "nl-NL";
+                ApplicationLanguages.PrimaryLanguageOverride = "nl-NL";
+                Debug.WriteLine("my language is:" + ApplicationLanguages.ManifestLanguages.First());
+                Frame.Navigate(typeof(MainPage));
+            }
         }
     }
 }

Breda-Tour/SplashScreen/SplashPage.xaml

@@ -45,11 +45,11 @@
             <Button Style="{StaticResource SplashScreenLanguageButtonStyle}"
                     Content="{StaticResource AppLanguageDutch}"
                     Margin="0,15,0,0"
-                    Click="Button_Click"/>
+                    Click="Button_Dutch_Click"/>
             <Button Style="{StaticResource SplashScreenLanguageButtonStyle}"
                     Content="{StaticResource AppLanguageEnglish}"
                     Margin="0,10,0,0"
-                    Click="Button_Click"/>
+                    Click="Button_English_Click"/>
         </StackPanel>
 
         <!--Language selection-->

Breda-Tour/SplashScreen/SplashPage.xaml.cs

@@ -13,6 +13,7 @@ using Windows.UI.Xaml.Data;
 using Windows.UI.Xaml.Input;
 using Windows.UI.Xaml.Media;
 using Windows.UI.Xaml.Navigation;
+using Windows.Globalization;
 
 // The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
 
@@ -37,6 +38,30 @@ namespace Breda_Tour.SplashScreen
         {
             f.Navigate(typeof(MainPage));
         }
-        
+
+        /// <summary>
+        /// <author>Bart Reedijk</author>
+        /// Go to MainPage with English as the language
+        /// </summary>
+        private void Button_English_Click(object sender, RoutedEventArgs e)
+        {
+            App.Language = "en-US";
+            ApplicationLanguages.PrimaryLanguageOverride = "en-US";
+            Debug.WriteLine("my language is:" + ApplicationLanguages.ManifestLanguages.First());
+            f.Navigate(typeof(MainPage));
+        }
+
+        /// <summary>
+        /// <author>Bart Reedijk</author>
+        /// Go to MainPage with Dutch as the language
+        /// </summary>
+        private void Button_Dutch_Click(object sender, RoutedEventArgs e)
+        {
+            App.Language = "nl-NL";
+            ApplicationLanguages.PrimaryLanguageOverride = "nl-NL";
+            Debug.WriteLine("my language is:" + ApplicationLanguages.ManifestLanguages.First());
+            f.Navigate(typeof(MainPage));
+        }
+
     }
 }

Breda-Tour/en-US/Resources.resw

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AppSettingstxtSettings.Header" xml:space="preserve">
+    <value>Settings</value>
+  </data>
+  <data name="AppSettingstxtSetupLanguage.Text" xml:space="preserve">
+    <value>Set up language</value>
+  </data>
+  <data name="AppSettingsHelp.Text" xml:space="preserve">
+    <value>Help</value>
+  </data>
+  <data name="AppSettingsLanguageSettings.Text" xml:space="preserve">
+    <value>Language settings</value>
+  </data>
+  <data name="RouteSelectPagetxtSelectRoute.Header" xml:space="preserve">
+    <value>Select route</value>
+  </data>
+  <data name="HelpPagetxtBack.Text" xml:space="preserve">
+    <value>Back</value>
+  </data>
+  <data name="HelpPagetxtNext.Text" xml:space="preserve">
+    <value>Next</value>
+  </data>
+  <data name="AppSettingstxtLanguageString.Text" xml:space="preserve">
+    <value>English</value>
+  </data>
+</root>

Breda-Tour/nl-NL/Resources.resw

@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AppSettingsHelp.Text" xml:space="preserve">
+    <value>Help</value>
+  </data>
+  <data name="AppSettingsLanguageSettings.Text" xml:space="preserve">
+    <value>Taal instellingen</value>
+  </data>
+  <data name="AppSettingstxtLanguageString.Text" xml:space="preserve">
+    <value>Nederlands</value>
+  </data>
+  <data name="AppSettingstxtSettings.Header" xml:space="preserve">
+    <value>Instellingen</value>
+  </data>
+  <data name="AppSettingstxtSetupLanguage.Text" xml:space="preserve">
+    <value>Taal instellen</value>
+  </data>
+  <data name="HelpPagetxtBack.Text" xml:space="preserve">
+    <value>Vorige</value>
+  </data>
+  <data name="HelpPagetxtNext.Text" xml:space="preserve">
+    <value>Volgende</value>
+  </data>
+  <data name="RouteSelectPagetxtSelectRoute.Header" xml:space="preserve">
+    <value>Route selecteren</value>
+  </data>
+</root>