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

dateMenu: Replace ellipsis with full sentences

Browse Source 
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2108>
This commit is contained in:
Björn Daase 2022-02-07 12:24:51 +01:00
parent a1dd1b25d8
commit 528ee01fef
1 changed files with 52 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
js/ui/dateMenu.js
View File

@ -17,7 +17,7 @@ const NC_ = (context, str) => `${context}\u0004${str}`;
const T_ = Shell.util_translate_time_string; const T_ = Shell.util_translate_time_string;
const MAX_FORECASTS = 5; const MAX_FORECASTS = 5;
const ELLIPSIS_CHAR = '\u2026'; const EN_CHAR = '\u2013';
const ClocksIntegrationIface = loadInterfaceXML('org.gnome.Shell.ClocksIntegration'); const ClocksIntegrationIface = loadInterfaceXML('org.gnome.Shell.ClocksIntegration');
const ClocksProxy = Gio.DBusProxy.makeProxyWrapper(ClocksIntegrationIface); const ClocksProxy = Gio.DBusProxy.makeProxyWrapper(ClocksIntegrationIface);
@ -169,9 +169,24 @@ class EventsSection extends St.Button {
this._title.text = this._startDate.toLocaleFormat(otherYearFormat); this._title.text = this._startDate.toLocaleFormat(otherYearFormat);
} }
_isAtMidnight(eventTime) {
return eventTime.getHours() === 0 && eventTime.getMinutes() === 0 && eventTime.getSeconds() === 0;
}
_formatEventTime(event) { _formatEventTime(event) {
const eventStart = event.date;
const eventEnd = event.end;
const allDay = const allDay =
event.date <= this._startDate && event.end >= this._endDate; eventStart.getTime() === this._startDate.getTime() && eventEnd.getTime() === this._endDate.getTime();
const startsBeforeToday = eventStart < this._startDate;
const endsAfterToday = eventEnd > this._endDate;
const startTimeOnly = Util.formatTime(eventStart, { timeOnly: true });
const endTimeOnly = Util.formatTime(eventEnd, { timeOnly: true });
const rtl = Clutter.get_default_text_direction() === Clutter.TextDirection.RTL;
let title; let title;
if (allDay) { if (allDay) {
@ -179,24 +194,44 @@ class EventsSection extends St.Button {
* Keep it short, best if you can use less then 10 characters * Keep it short, best if you can use less then 10 characters
*/ */
title = C_('event list time', 'All Day'); title = C_('event list time', 'All Day');
} else if (startsBeforeToday || endsAfterToday) {
const now = new Date();
const thisYear = now.getFullYear();
const startsAtMidnight = this._isAtMidnight(eventStart);
const endsAtMidnight = this._isAtMidnight(eventEnd);
const startYear = eventStart.getFullYear();
if (endsAtMidnight)
eventEnd.setDate(eventEnd.getDate() - 1);
const endYear = eventEnd.getFullYear();
let format;
if (startYear === thisYear && thisYear === endYear)
/* Translators: Shown in calendar event list as the start/end of events
* that only show day and month
*/
format = T_('%m/%d');
else
format = '%x';
const startDateOnly = eventStart.toLocaleFormat(format);
const endDateOnly = eventEnd.toLocaleFormat(format);
if (startsAtMidnight && endsAtMidnight)
title = `${rtl ? endDateOnly : startDateOnly} ${EN_CHAR} ${rtl ? startDateOnly : endDateOnly}`;
else if (rtl)
title = `${endTimeOnly} ${endDateOnly} ${EN_CHAR} ${startTimeOnly} ${startDateOnly}`;
else
title = `${startDateOnly} ${startTimeOnly} ${EN_CHAR} ${endDateOnly} ${endTimeOnly}`;
} else if (eventStart === eventEnd) {
title = startTimeOnly;
} else { } else {
let date = event.date >= this._startDate ? event.date : event.end; title = `${rtl ? endTimeOnly : startTimeOnly} ${EN_CHAR} ${rtl ? startTimeOnly : endTimeOnly}`;
title = Util.formatTime(date, { timeOnly: true });
} }
const rtl = Clutter.get_default_text_direction() === Clutter.TextDirection.RTL;
if (event.date < this._startDate) {
if (rtl)
title = `${title}${ELLIPSIS_CHAR}`;
else
title = `${ELLIPSIS_CHAR}${title}`;
}
if (event.end > this._endDate) {
if (rtl)
title = `${ELLIPSIS_CHAR}${title}`;
else
title = `${title}${ELLIPSIS_CHAR}`;
}
return title; return title;
} }