From 0f542c2e16899910f0320339e1cfd66e5ed8cc57 Mon Sep 17 00:00:00 2001
From: Carmen Bianca Bakker <carmen@carmenbianca.eu>
Date: Mon, 15 Oct 2018 16:50:02 +0200
Subject: [PATCH] Remove padding from date strings

The padding is removed by using %-d instead of %e or %d.

Examples:

"%B %d %Y"  -> "October 04 2018"

"%B %e %Y"  -> "October  4 2018"

"%B %-d %Y" -> "October 4 2018"

https://gitlab.gnome.org/GNOME/gnome-shell/issues/666
---
 js/misc/util.js   | 8 ++++----
 js/ui/calendar.js | 4 ++--
 js/ui/dateMenu.js | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/js/misc/util.js b/js/misc/util.js
index 38b67e891..4e1f5de55 100644
--- a/js/misc/util.js
+++ b/js/misc/util.js
@@ -243,13 +243,13 @@ function formatTime(time, params) {
              followed by a time string in 24h format.
              i.e. "May 25, 14:30" */
             // xgettext:no-c-format
-            format = N_("%B %d, %H\u2236%M");
+            format = N_("%B %-d, %H\u2236%M");
         else
             /* Translators: this is the month name, day number, year
              number followed by a time string in 24h format.
              i.e. "May 25 2012, 14:30" */
             // xgettext:no-c-format
-            format = N_("%B %d %Y, %H\u2236%M");
+            format = N_("%B %-d %Y, %H\u2236%M");
     } else {
         // Show only the time if date is on today
         if (daysAgo < 1 || params.timeOnly)
@@ -272,13 +272,13 @@ function formatTime(time, params) {
              followed by a time string in 12h format.
              i.e. "May 25, 2:30 pm" */
             // xgettext:no-c-format
-            format = N_("%B %d, %l\u2236%M %p");
+            format = N_("%B %-d, %l\u2236%M %p");
         else
             /* Translators: this is the month name, day number, year
              number followed by a time string in 12h format.
              i.e. "May 25 2012, 2:30 pm"*/
             // xgettext:no-c-format
-            format = N_("%B %d %Y, %l\u2236%M %p");
+            format = N_("%B %-d %Y, %l\u2236%M %p");
     }
 
     let formattedTime = date.format(Shell.util_translate_time_string(format));
diff --git a/js/ui/calendar.js b/js/ui/calendar.js
index 815c9f9c9..241a91db4 100644
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@@ -866,11 +866,11 @@ var EventsSection = new Lang.Class({
         if (sameYear(this._date, now))
             /* Translators: Shown on calendar heading when selected day occurs on current year */
             dayFormat = Shell.util_translate_time_string(NC_("calendar heading",
-                                                             "%A, %B %d"));
+                                                             "%A, %B %-d"));
         else
             /* Translators: Shown on calendar heading when selected day occurs on different year */
             dayFormat = Shell.util_translate_time_string(NC_("calendar heading",
-                                                             "%A, %B %d, %Y"));
+                                                             "%A, %B %-d, %Y"));
         this._title.label = this._date.toLocaleFormat(dayFormat);
     },
 
diff --git a/js/ui/dateMenu.js b/js/ui/dateMenu.js
index 0497d6eee..83967c9f4 100644
--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@@ -73,7 +73,7 @@ var TodayButton = new Lang.Class({
          * "Tue 9:29 AM").  The string itself should become a full date, e.g.,
          * "February 17 2015".
          */
-        let dateFormat = Shell.util_translate_time_string (N_("%B %e %Y"));
+        let dateFormat = Shell.util_translate_time_string (N_("%B %-d %Y"));
         this._dateLabel.set_text(date.toLocaleFormat(dateFormat));
 
         /* Translators: This is the accessible name of the date button shown