Skip to content

Commit f1f82b3

Browse files
committed
gnome-wall-clock.c: Update default date-time formats to adapt to
GDateTime change. The %l, %e and %k tokens now have additional leading space when rendering a single digit number. Currently: '%A %B %e, %l:%M %p' -> 'Wednesday May 8, 1:03 AM' With this commit: '%A %B %-e, %-l:%M %p' -> 'Wednesday May 8, 1:03 AM' ref: https://gitlab.gnome.org/GNOME/glib/-/commit/7074122f308b7b3402fba250f2010778fdad6eff https://gitlab.gnome.org/GNOME/glib/-/commit/7169f6e1e58a53e4b69e5d40f3fd192dd9cd8ed4
1 parent b554c49 commit f1f82b3

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

Diff for: libcinnamon-desktop/gnome-wall-clock.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -66,31 +66,31 @@ G_DEFINE_TYPE_WITH_PRIVATE (GnomeWallClock, gnome_wall_clock, G_TYPE_OBJECT);
6666

6767
/* Default date format (typically matching date portion of WITH_DATE_* defaults.)
6868
* Currently used by cinnamon-screensaver default clock */
69-
#define DATE_ONLY (_("%A, %B %e"))
69+
#define DATE_ONLY (_("%A, %B %-e"))
7070

7171
/* Default date/time format when show-date, show-seconds, use-24h are set */
72-
#define WITH_DATE_24H_SECONDS (_("%A %B %e, %R:%S"))
72+
#define WITH_DATE_24H_SECONDS (_("%A %B %-e, %R:%S"))
7373

7474
/* Default date/time format when show-date, show-seconds are set */
75-
#define WITH_DATE_12H_SECONDS (_("%A %B %e, %l:%M:%S %p"))
75+
#define WITH_DATE_12H_SECONDS (_("%A %B %-e, %-l:%M:%S %p"))
7676

7777
/* Default date/time format when show-date, use-24h are set */
78-
#define WITH_DATE_24H (_("%A %B %e, %R"))
78+
#define WITH_DATE_24H (_("%A %B %-e, %R"))
7979

8080
/* Default date/time format when just show-date is set */
81-
#define WITH_DATE_12H (_("%A %B %e, %l:%M %p"))
81+
#define WITH_DATE_12H (_("%A %B %-e, %-l:%M %p"))
8282

8383
/* Default date/time format when show-seconds, use-24h are set */
8484
#define NO_DATE_24H_SECONDS (_("%R:%S"))
8585

8686
/* Default date/time format when just show-seconds is set */
87-
#define NO_DATE_12H_SECONDS (_("%l:%M:%S %p"))
87+
#define NO_DATE_12H_SECONDS (_("%-l:%M:%S %p"))
8888

8989
/* Default date/time format when just use-24h is set */
9090
#define NO_DATE_24H (_("%R"))
9191

9292
/* Default date/time format with no options are set */
93-
#define NO_DATE_12H (_("%l:%M %p"))
93+
#define NO_DATE_12H (_("%-l:%M %p"))
9494

9595
#define NO_DATE ("")
9696

0 commit comments

Comments
 (0)