[gtk/gtk-4-4] calendar: Fix abbreviated day names
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/gtk-4-4] calendar: Fix abbreviated day names
- Date: Sun, 31 Oct 2021 21:52:14 +0000 (UTC)
commit 5a2f94b7efff673db06af1181c44d3bfa31dc34e
Author: Niels De Graef <nielsdegraef gmail com>
Date: Tue Oct 12 19:29:26 2021 +0200
calendar: Fix abbreviated day names
... if the current locale has a different starting day than Sunday.
This needed 2 fixes:
* We need to take into account `calendar->week_start` when
creating/adding the appropriate `day_name_labels` field
* we were only calculating `calendar->week_start` _after_ attaching the
`day_name_labels`, so it was still set to 0 (the default value).
Fixes https://gitlab.gnome.org/GNOME/gtk/-/issues/4338
gtk/gtkcalendar.c | 100 ++++++++++++++++++++++++++++--------------------------
1 file changed, 52 insertions(+), 48 deletions(-)
---
diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index 41f70e05f3..fe75e7beaf 100644
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -633,6 +633,53 @@ gtk_calendar_init (GtkCalendar *calendar)
calendar);
gtk_widget_add_controller (GTK_WIDGET (calendar), controller);
+#ifdef G_OS_WIN32
+ calendar->week_start = 0;
+ week_start = NULL;
+
+ if (GetLocaleInfoW (GetThreadLocale (), LOCALE_IFIRSTDAYOFWEEK,
+ wbuffer, G_N_ELEMENTS (wbuffer)))
+ week_start = g_utf16_to_utf8 (wbuffer, -1, NULL, NULL, NULL);
+
+ if (week_start != NULL)
+ {
+ calendar->week_start = (week_start[0] - '0' + 1) % 7;
+ g_free(week_start);
+ }
+#else
+#ifdef HAVE__NL_TIME_FIRST_WEEKDAY
+ langinfo.string = nl_langinfo (_NL_TIME_FIRST_WEEKDAY);
+ first_weekday = langinfo.string[0];
+ langinfo.string = nl_langinfo (_NL_TIME_WEEK_1STDAY);
+ week_origin = langinfo.word;
+ if (week_origin == 19971130) /* Sunday */
+ week_1stday = 0;
+ else if (week_origin == 19971201) /* Monday */
+ week_1stday = 1;
+ else
+ g_warning ("Unknown value of _NL_TIME_WEEK_1STDAY.");
+
+ calendar->week_start = (week_1stday + first_weekday - 1) % 7;
+#else
+ /* Translate to calendar:week_start:0 if you want Sunday to be the
+ * first day of the week to calendar:week_start:1 if you want Monday
+ * to be the first day of the week, and so on.
+ */
+ week_start = _("calendar:week_start:0");
+
+ if (strncmp (week_start, "calendar:week_start:", 20) == 0)
+ calendar->week_start = *(week_start + 20) - '0';
+ else
+ calendar->week_start = -1;
+
+ if (calendar->week_start < 0 || calendar->week_start > 6)
+ {
+ g_warning ("Whoever translated calendar:week_start:0 did so wrongly.");
+ calendar->week_start = 0;
+ }
+#endif
+#endif
+
if (!default_abbreviated_dayname[0])
for (i=0; i<7; i++)
{
@@ -692,7 +739,11 @@ gtk_calendar_init (GtkCalendar *calendar)
/* Day name labels */
for (i = 0; i < 7; i ++)
{
- GtkWidget *label = gtk_label_new (default_abbreviated_dayname[i]);
+ int day;
+ GtkWidget *label;
+
+ day = (i + calendar->week_start) % 7;
+ label = gtk_label_new (default_abbreviated_dayname[day]);
gtk_widget_set_hexpand (label, TRUE);
gtk_widget_set_vexpand (label, TRUE);
@@ -771,53 +822,6 @@ gtk_calendar_init (GtkCalendar *calendar)
else if (strcmp (year_before, "calendar:MY") != 0)
g_warning ("Whoever translated calendar:MY did so wrongly.");
-#ifdef G_OS_WIN32
- calendar->week_start = 0;
- week_start = NULL;
-
- if (GetLocaleInfoW (GetThreadLocale (), LOCALE_IFIRSTDAYOFWEEK,
- wbuffer, G_N_ELEMENTS (wbuffer)))
- week_start = g_utf16_to_utf8 (wbuffer, -1, NULL, NULL, NULL);
-
- if (week_start != NULL)
- {
- calendar->week_start = (week_start[0] - '0' + 1) % 7;
- g_free(week_start);
- }
-#else
-#ifdef HAVE__NL_TIME_FIRST_WEEKDAY
- langinfo.string = nl_langinfo (_NL_TIME_FIRST_WEEKDAY);
- first_weekday = langinfo.string[0];
- langinfo.string = nl_langinfo (_NL_TIME_WEEK_1STDAY);
- week_origin = langinfo.word;
- if (week_origin == 19971130) /* Sunday */
- week_1stday = 0;
- else if (week_origin == 19971201) /* Monday */
- week_1stday = 1;
- else
- g_warning ("Unknown value of _NL_TIME_WEEK_1STDAY.");
-
- calendar->week_start = (week_1stday + first_weekday - 1) % 7;
-#else
- /* Translate to calendar:week_start:0 if you want Sunday to be the
- * first day of the week to calendar:week_start:1 if you want Monday
- * to be the first day of the week, and so on.
- */
- week_start = _("calendar:week_start:0");
-
- if (strncmp (week_start, "calendar:week_start:", 20) == 0)
- calendar->week_start = *(week_start + 20) - '0';
- else
- calendar->week_start = -1;
-
- if (calendar->week_start < 0 || calendar->week_start > 6)
- {
- g_warning ("Whoever translated calendar:week_start:0 did so wrongly.");
- calendar->week_start = 0;
- }
-#endif
-#endif
-
gtk_orientable_set_orientation (GTK_ORIENTABLE (gtk_widget_get_layout_manager (GTK_WIDGET (calendar))),
GTK_ORIENTATION_VERTICAL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]