Change default format and the hour in 12hr formats

danielchalmers · Nov 28, 2023 · 233e0d7 · 233e0d7
1 parent 55a08bb
commit 233e0d7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/DesktopClock/DateFormatExample.cs b/DesktopClock/DateFormatExample.cs
@@ -15,7 +15,7 @@ private DateFormatExample(string format, string example)
     public string Format { get; }
     public string Example { get; }
 
-    public static DateFormatExample Tutorial => new("", "Create my own format...");
+    public static DateFormatExample Tutorial => new(string.Empty, "Create my own format...");
 
     /// <summary>
     /// Creates a <see cref="DateFormatExample" /> from the given format.
@@ -31,17 +31,17 @@ private DateFormatExample(string format, string example)
         "M",
         "dddd, MMMM dd",
         "dddd, MMMM dd, HH:mm",
-        "dddd, MMMM dd, hh:mm tt",
+        "dddd, MMMM dd, h:mm tt",
         "dddd, MMM dd, HH:mm",
-        "dddd, MMM dd, hh:mm tt",
+        "dddd, MMM dd, h:mm tt",
         "dddd, MMM dd, HH:mm:ss",
-        "dddd, MMM dd, hh:mm:ss tt",
+        "dddd, MMM dd, h:mm:ss tt",
         "ddd, MMM dd, HH:mm",
-        "ddd, MMM dd, hh:mm tt",
+        "ddd, MMM dd, h:mm tt",
         "ddd, MMM dd, HH:mm:ss",
-        "ddd, MMM dd, hh:mm:ss tt",
+        "ddd, MMM dd, h:mm:ss tt",
         "ddd, MMM dd, HH:mm K",
-        "ddd, MMM dd, hh:mm tt K",
+        "ddd, MMM dd, h:mm tt K",
         "d",
         "g",
         "G",

diff --git a/DesktopClock/Properties/Settings.cs b/DesktopClock/Properties/Settings.cs
@@ -52,7 +52,7 @@ private Settings()
 
     #region "Properties"
 
-    public string Format { get; set; } = "{dddd}, {MMM dd}, {HH:mm:ss}";
+    public string Format { get; set; } = "{ddd}, {MMM dd}, {h:mm:ss tt}";
     public string CountdownFormat { get; set; } = "";
     public DateTime? CountdownTo { get; set; } = default(DateTime);
     public string TimeZone { get; set; } = string.Empty;

diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 [![Release](https://img.shields.io/github/release/danielchalmers/DesktopClock?include_prereleases)](https://github.com/danielchalmers/DesktopClock/releases)
 [![License](https://img.shields.io/github/license/danielchalmers/DesktopClock)](LICENSE)
 
-![Animation](https://user-images.githubusercontent.com/7112040/183230803-332aa642-81ae-4dad-a530-d9e4080cd1f0.gif)
+![Animation](https://github.com/danielchalmers/DesktopClock/assets/7112040/6038fa47-3a29-4b74-8f4f-fffeb8af8d0a)
 
 ![Context menu](https://user-images.githubusercontent.com/7112040/201500304-fadedaeb-fc50-47b7-9de0-80c45346c35d.png)