Merge pull request #33 from DSaladinCH/develop

Fix update app release date format
DSaladinCH · Mar 3, 2024 · a3801c3 · a3801c3
2 parents 5d3061d + 62f8949
commit a3801c3
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 24 deletions.
diff --git a/speed-time/Dialogs/UpdateApp.xaml.cs b/speed-time/Dialogs/UpdateApp.xaml.cs
@@ -62,10 +62,8 @@ public UpdateApp(Version version, DateTime releaseDate)
 
             Version = string.Join('.', components.Take(nonZeroIndex + 1));
 
-            if (releaseDate.Year == DateTime.Now.Year)
-                ReleaseDate = ((App)Application.Current).FormatDate(releaseDate, "M");
-            else
-                ReleaseDate = ((App)Application.Current).FormatDate(releaseDate, "D");
+            ReleaseDate = ((App)Application.Current).FormatDate(releaseDate,
+                SpeedTime.Language.SpeedTime.ResourceManager.GetString("full-date-format", ((App)Application.Current).CurrentDateLanguage)!);
 
             DenyCommand = new((_) => Close(false));
             DownloadCommand = new((_) => Close(true));

diff --git a/speed-time/Language/SpeedTime.Designer.cs b/speed-time/Language/SpeedTime.Designer.cs
diff --git a/speed-time/Language/SpeedTime.de-CH.resx b/speed-time/Language/SpeedTime.de-CH.resx
@@ -123,6 +123,9 @@
   <data name="Cancel" xml:space="preserve">
     <value>Abbrechen</value>
   </data>
+  <data name="full-date-format" xml:space="preserve">
+    <value>dd. MMM yyyy</value>
+  </data>
   <data name="gap-text" xml:space="preserve">
     <value>Lücke von {0} Std.</value>
   </data>
@@ -222,9 +225,6 @@
   <data name="timeeditor.title" xml:space="preserve">
     <value>Zeit Editor</value>
   </data>
-  <data name="times.current-date-format" xml:space="preserve">
-    <value>dd. MMM yyyy</value>
-  </data>
   <data name="times.current.hours" xml:space="preserve">
     <value>Zeit: {0:N2}h</value>
   </data>

diff --git a/speed-time/Language/SpeedTime.es-ES.resx b/speed-time/Language/SpeedTime.es-ES.resx
@@ -123,6 +123,9 @@
   <data name="Cancel" xml:space="preserve">
     <value>Cancelar</value>
   </data>
+  <data name="full-date-format" xml:space="preserve">
+    <value>dd MMM yyyy</value>
+  </data>
   <data name="gap-text" xml:space="preserve">
     <value>Hueco de {0} hora</value>
   </data>
@@ -222,9 +225,6 @@
   <data name="timeeditor.title" xml:space="preserve">
     <value>Editor de tiempo</value>
   </data>
-  <data name="times.current-date-format" xml:space="preserve">
-    <value>dd MMM yyyy</value>
-  </data>
   <data name="times.current.hours" xml:space="preserve">
     <value>Hora: {0:N2}h</value>
   </data>

diff --git a/speed-time/Language/SpeedTime.resx b/speed-time/Language/SpeedTime.resx
@@ -123,6 +123,9 @@
   <data name="Cancel" xml:space="preserve">
     <value>Cancel</value>
   </data>
+  <data name="full-date-format" xml:space="preserve">
+    <value>MMM dd, yyyy</value>
+  </data>
   <data name="gap-text" xml:space="preserve">
     <value>Gap of {0}h</value>
   </data>
@@ -222,9 +225,6 @@
   <data name="timeeditor.title" xml:space="preserve">
     <value>Time Editor</value>
   </data>
-  <data name="times.current-date-format" xml:space="preserve">
-    <value>MMM dd, yyyy</value>
-  </data>
   <data name="times.current.hours" xml:space="preserve">
     <value>Time: {0:N2}h</value>
   </data>

diff --git a/speed-time/ViewModel/MainWindowViewModel.cs b/speed-time/ViewModel/MainWindowViewModel.cs
@@ -84,7 +84,7 @@ public DateTime CurrentDateTime
 
         public string CurrentDateTimeFormat
         {
-            get => ((App)Application.Current).FormatDate(CurrentDateTime, Language.SpeedTime.ResourceManager.GetString("times.current-date-format", ((App)Application.Current).CurrentDateLanguage)!);
+            get => ((App)Application.Current).FormatDate(CurrentDateTime, Language.SpeedTime.ResourceManager.GetString("full-date-format", ((App)Application.Current).CurrentDateLanguage)!);
         }
 
         public bool IsCurrentlyTracking { get => CurrentTime != null; }

diff --git a/speed-time/speed-time.csproj b/speed-time/speed-time.csproj
@@ -19,7 +19,7 @@
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <ApplicationIcon>Icon.ico</ApplicationIcon>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
-    <Version>0.15</Version>
+    <Version>0.15.1</Version>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile></AssemblyOriginatorKeyFile>
   </PropertyGroup>