Merge pull request #9 from DN-Foundation/languages

Release 2023.2.1
branislavjuhas · Jul 19, 2023 · 4e6fdf0 · 4e6fdf0
2 parents 217eec0 + 9c08ab5
commit 4e6fdf0
Show file tree

Hide file tree

Showing 13 changed files with 68 additions and 29 deletions.
diff --git a/DN Henkel Vision/DN Henkel Vision (Package)/DN Henkel Vision (Package).wapproj b/DN Henkel Vision/DN Henkel Vision (Package)/DN Henkel Vision (Package).wapproj
@@ -40,33 +40,47 @@
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <AssetTargetFallback>net6.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
     <DefaultLanguage>en-US</DefaultLanguage>
-    <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
+    <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
     <EntryPointProjectUniqueName>..\DN Henkel Vision\DN Henkel Vision.csproj</EntryPointProjectUniqueName>
+    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
+    <PackageCertificateThumbprint>E70786B55C49D6CE24F614F6B90FFADE4699715B</PackageCertificateThumbprint>
+    <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
+    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
+    <GenerateTestArtifacts>True</GenerateTestArtifacts>
+    <AppxBundlePlatforms>x64</AppxBundlePlatforms>
+    <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
-    <DefaultLanguage>sk-SK</DefaultLanguage>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <AppxBundle>Always</AppxBundle>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
-    <DefaultLanguage>sk-SK</DefaultLanguage>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <AppxBundle>Always</AppxBundle>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
-    <DefaultLanguage>sk-SK</DefaultLanguage>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <AppxBundle>Always</AppxBundle>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <DefaultLanguage>sk-SK</DefaultLanguage>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <AppxBundle>Always</AppxBundle>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <DefaultLanguage>sk-SK</DefaultLanguage>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <AppxBundle>Always</AppxBundle>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
-    <DefaultLanguage>sk-SK</DefaultLanguage>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <AppxBundle>Always</AppxBundle>
   </PropertyGroup>
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest">
       <SubType>Designer</SubType>
     </AppxManifest>
   </ItemGroup>
   <ItemGroup>
+    <None Include="DN Henkel Vision %28Package%29_TemporaryKey.pfx" />
     <Content Include="Images\LargeTile.scale-100.png" />
     <Content Include="Images\LargeTile.scale-125.png" />
     <Content Include="Images\LargeTile.scale-150.png" />

diff --git a/DN Henkel Vision/DN Henkel Vision (Package)/Package.appxmanifest b/DN Henkel Vision/DN Henkel Vision (Package)/Package.appxmanifest
@@ -8,12 +8,12 @@
 
   <Identity
     Name="d61de81d-cd85-4388-bdcb-72407fecb779"
-    Publisher="CN=juhas"
-    Version="1.0.0.0" />
+    Publisher="CN=DN Foundation"
+    Version="2023.2.1.1407" />
 
   <Properties>
-    <DisplayName>DN Henkel Vision (Package)</DisplayName>
-    <PublisherDisplayName>juhas</PublisherDisplayName>
+    <DisplayName>DN Henkel Vision</DisplayName>
+    <PublisherDisplayName>DN Foundation</PublisherDisplayName>
     <Logo>Images\StoreLogo.png</Logo>
   </Properties>
 
@@ -23,16 +23,17 @@
   </Dependencies>
 
   <Resources>
-    <Resource Language="x-generate"/>
+    <Resource Language="en-US"/>
+    <Resource Language="sk-SK"/>
   </Resources>
 
   <Applications>
     <Application Id="App"
       Executable="$targetnametoken$.exe"
       EntryPoint="$targetentrypoint$">
       <uap:VisualElements
-        DisplayName="DN Henkel Vision Preview"
-        Description="DN Henkel Vision"
+        DisplayName="DN Henkel Vision"
+        Description="DN Henkel Vision is a cutting-edge application designed to simplify fault registration and accelerate classification using advanced AI technology. Streamline your workflow, save time, and boost productivity with this intuitive and efficient solution. Experience seamless fault management like never before with DN Henkel Vision."
         BackgroundColor="transparent"
         Square150x150Logo="Images\Square150x150Logo.png"
         Square44x44Logo="Images\Square44x44Logo.png">

diff --git a/DN Henkel Vision/DN Henkel Vision/App.xaml.cs b/DN Henkel Vision/DN Henkel Vision/App.xaml.cs
@@ -1,4 +1,5 @@
-using Microsoft.UI.Xaml;
+using DN_Henkel_Vision.Memory;
+using Microsoft.UI.Xaml;
 using System;
 using System.Threading;
 
@@ -16,6 +17,8 @@ public partial class App
         /// </summary>
         public App()
         {
+            Windows.Globalization.ApplicationLanguages.PrimaryLanguageOverride = Drive.SafeLanguage();
+
             this.InitializeComponent();
             if (!mutex.WaitOne(TimeSpan.Zero, true))
             {

diff --git a/DN Henkel Vision/DN Henkel Vision/AssemblyInfo.cs b/DN Henkel Vision/DN Henkel Vision/AssemblyInfo.cs
@@ -5,6 +5,6 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("2023.1.2.1390")]
-[assembly: AssemblyFileVersion("2023.1.2.1390")]
-[assembly: AssemblyInformationalVersion("2023.1.2.1390")]
+[assembly: AssemblyVersion("2023.2.1.1406")]
+[assembly: AssemblyFileVersion("2023.2.1.1406")]
+[assembly: AssemblyInformationalVersion("2023.2.1.1406")]
diff --git a/DN Henkel Vision/DN Henkel Vision/AssemblyInfo.tt b/DN Henkel Vision/DN Henkel Vision/AssemblyInfo.tt
@@ -28,5 +28,5 @@ using System.Reflection;
     int Patch = 0;
 
     int Major = (int)DateTime.Now.Year;
-    int Minor = 1;
+    int Minor = 2;
 #>
diff --git a/DN Henkel Vision/DN Henkel Vision/DN Henkel Vision.csproj b/DN Henkel Vision/DN Henkel Vision/DN Henkel Vision.csproj
@@ -19,6 +19,7 @@
   </PropertyGroup>
   <PropertyGroup>
 	  <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+	  <IsPublishable>True</IsPublishable>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
     <Optimize>False</Optimize>

diff --git a/DN Henkel Vision/DN Henkel Vision/Interface/Environment.xaml b/DN Henkel Vision/DN Henkel Vision/Interface/Environment.xaml
@@ -81,7 +81,7 @@
                         Grid.Column="1"/>
                     <TextBlock
                         x:Name="ApplicationDevState" 
-                        Text="Preview"
+                        Text=""
                         Margin="3,15,0,0"
                         FontSize="12"
                         Foreground="{ThemeResource TextFillColorSecondary}"

diff --git a/DN Henkel Vision/DN Henkel Vision/Interface/Splash.xaml b/DN Henkel Vision/DN Henkel Vision/Interface/Splash.xaml
@@ -29,11 +29,12 @@
                     FontSize="12"
                     Grid.Column="1"/>
             <TextBlock
-                    x:Name="ApplicationDevState" Text="Preview"
-                    Margin="3,15,0,0"
-                    FontSize="12"
-                    Foreground="{ThemeResource TextFillColorSecondary}"
-                    Grid.Column="2"/>
+                x:Name="ApplicationDevState"
+                Text=""
+                Margin="3,15,0,0"
+                FontSize="12"
+                Foreground="{ThemeResource TextFillColorSecondary}"
+                Grid.Column="2"/>
         </Grid>
         <Image
             Source="ms-appx:///Assets/Tiles/StoreLogo.scale-400.png"

diff --git a/DN Henkel Vision/DN Henkel Vision/Interface/Splash.xaml.cs b/DN Henkel Vision/DN Henkel Vision/Interface/Splash.xaml.cs
@@ -5,6 +5,8 @@
 using WinRT.Interop;
 using DN_Henkel_Vision.Memory;
 using System.ComponentModel;
+using System.Globalization;
+using Microsoft.Windows.AppLifecycle;
 
 namespace DN_Henkel_Vision.Interface
 {
@@ -24,13 +26,13 @@ public sealed partial class Splash : Window
         /// Initializes a new instance of the <see cref="Splash"/> class.
         /// </summary>
         public Splash()
-        {           
+        {                      
             s_loader = this;
 
             IntPtr hWnd = WindowNative.GetWindowHandle(this);
 
             DisplayArea area = DisplayArea.GetFromWindowId(Win32Interop.GetWindowIdFromWindow(hWnd), DisplayAreaFallback.Nearest);
-
+            
             this.InitializeComponent();
             OverlappedPresenter presenter = GetAppWindowAndPresenter();
             presenter.IsMaximizable = false;

diff --git a/DN Henkel Vision/DN Henkel Vision/Interface/Welcome.xaml b/DN Henkel Vision/DN Henkel Vision/Interface/Welcome.xaml
@@ -22,7 +22,7 @@
             CornerRadius="0,0,0,4">
 
             <TextBlock
-                Text="Welcome"
+                x:Uid="T_Welcome"
                 FontSize="{ThemeResource TitleTextBlockFontSize}"
                 FontWeight="{ThemeResource InfoBarTitleFontWeight}"
                 Margin="32,82,0,0"/>

diff --git a/DN Henkel Vision/DN Henkel Vision/Memory/Drive.cs b/DN Henkel Vision/DN Henkel Vision/Memory/Drive.cs
@@ -5,6 +5,7 @@
 using Windows.Storage;
 using DN_Henkel_Vision.Interface;
 using Microsoft.UI.Xaml;
+using System.Globalization;
 
 namespace DN_Henkel_Vision.Memory
 {
@@ -24,7 +25,8 @@ internal class Drive
         internal static readonly string s_orders =      $"{Folder}\\Files\\Orders\\";
         internal static readonly string s_registry =    $"{Folder}\\Files\\Registry\\Registry.dntf";
         internal static readonly string s_exports =     $"{Folder}\\Files\\Registry\\Exports.dntf";
-        internal static readonly string s_trainees =     $"{Folder}\\Files\\Trainee\\";
+        internal static readonly string s_trainees =    $"{Folder}\\Files\\Trainee\\";
+        internal static readonly string s_language =    $"{Folder}\\Files\\Language.dnlf";
 
         #endregion
 
@@ -451,6 +453,13 @@ public static ElementTheme SafeTheme()
             }
         }
 
+        public static string SafeLanguage()
+        {
+            if (!File.Exists(s_language)) return CultureInfo.CurrentUICulture.Name;
+
+            return Read(s_language);
+        }
+
         public static void WriteTrainees()
         {
             string correct = string.Empty;

diff --git a/DN Henkel Vision/DN Henkel Vision/Strings/en-US/Resources.resw b/DN Henkel Vision/DN Henkel Vision/Strings/en-US/Resources.resw
@@ -325,4 +325,8 @@
     <value>Settings</value>
     <comment>Header Of The Settings Page</comment>
   </data>
+  <data name="T_Welcome.Text" xml:space="preserve">
+    <value>Welcome</value>
+    <comment>Header Of The Welcome Page</comment>
+  </data>
 </root>
diff --git a/DN Henkel Vision/DN Henkel Vision/Strings/sk-SK/Resources.resw b/DN Henkel Vision/DN Henkel Vision/Strings/sk-SK/Resources.resw
@@ -325,4 +325,8 @@
     <value>Nastavenia</value>
     <comment>Header Of The Settings Page</comment>
   </data>
+  <data name="T_Welcome.Text" xml:space="preserve">
+    <value>Vitajte</value>
+    <comment>Header Of The Welcome Page</comment>
+  </data>
 </root>