brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove padding from date strings

Browse Source 
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
This commit is contained in:
Carmen Bianca Bakker 2018-10-15 16:50:02 +02:00 committed by Florian Müllner
parent cff9eaf5aa
commit 0f542c2e16
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/misc/util.js
View File

@ -243,13 +243,13 @@ function formatTime(time, params) {
followed by a time string in 24h format. followed by a time string in 24h format.
i.e. "May 25, 14:30" */ i.e. "May 25, 14:30" */
// xgettext:no-c-format // xgettext:no-c-format
format = N_("%B %d, %H\u2236%M"); format = N_("%B %-d, %H\u2236%M");
else else
/* Translators: this is the month name, day number, year /* Translators: this is the month name, day number, year
number followed by a time string in 24h format. number followed by a time string in 24h format.
i.e. "May 25 2012, 14:30" */ i.e. "May 25 2012, 14:30" */
// xgettext:no-c-format // xgettext:no-c-format
format = N_("%B %d %Y, %H\u2236%M"); format = N_("%B %-d %Y, %H\u2236%M");
} else { } else {
// Show only the time if date is on today // Show only the time if date is on today
if (daysAgo < 1 || params.timeOnly) if (daysAgo < 1 || params.timeOnly)
@ -272,13 +272,13 @@ function formatTime(time, params) {
followed by a time string in 12h format. followed by a time string in 12h format.
i.e. "May 25, 2:30 pm" */ i.e. "May 25, 2:30 pm" */
// xgettext:no-c-format // xgettext:no-c-format
format = N_("%B %d, %l\u2236%M %p"); format = N_("%B %-d, %l\u2236%M %p");
else else
/* Translators: this is the month name, day number, year /* Translators: this is the month name, day number, year
number followed by a time string in 12h format. number followed by a time string in 12h format.
i.e. "May 25 2012, 2:30 pm"*/ i.e. "May 25 2012, 2:30 pm"*/
// xgettext:no-c-format // 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)); let formattedTime = date.format(Shell.util_translate_time_string(format));

4
js/ui/calendar.js
View File

@ -866,11 +866,11 @@ var EventsSection = new Lang.Class({
if (sameYear(this._date, now)) if (sameYear(this._date, now))
/* Translators: Shown on calendar heading when selected day occurs on current year */ /* Translators: Shown on calendar heading when selected day occurs on current year */
dayFormat = Shell.util_translate_time_string(NC_("calendar heading", dayFormat = Shell.util_translate_time_string(NC_("calendar heading",
"%A, %B %d")); "%A, %B %-d"));
else else
/* Translators: Shown on calendar heading when selected day occurs on different year */ /* Translators: Shown on calendar heading when selected day occurs on different year */
dayFormat = Shell.util_translate_time_string(NC_("calendar heading", dayFormat = Shell.util_translate_time_string(NC_("calendar heading",
"%A, %B %d, %Y")); "%A, %B %-d, %Y"));
this._title.label = this._date.toLocaleFormat(dayFormat); this._title.label = this._date.toLocaleFormat(dayFormat);
}, },

2
js/ui/dateMenu.js
View File

@ -73,7 +73,7 @@ var TodayButton = new Lang.Class({
* "Tue 9:29 AM"). The string itself should become a full date, e.g., * "Tue 9:29 AM"). The string itself should become a full date, e.g.,
* "February 17 2015". * "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)); this._dateLabel.set_text(date.toLocaleFormat(dateFormat));
/* Translators: This is the accessible name of the date button shown /* Translators: This is the accessible name of the date button shown