Merge branch 'master' into 'master'

week-view: display "12 PM" correctly See merge request GNOME/gnome-calendar!22
2018-01-10 16:08:08 +00:00
parent e72f7356c1 67efbd0f6c
commit f0a2a43438
1 changed files with 1 additions and 1 deletions
@@ -439,7 +439,7 @@ gcal_week_view_draw_hours (GcalWeekView *self,
        {
          hours = g_strdup_printf ("%d %s",
                                   i % 12 == 0 ? 12 : i % 12,
-                                   i > 12 ? _("PM") : _("AM"));
+                                   i >= 12 ? _("PM") : _("AM"));
        }

      pango_layout_set_text (layout, hours, -1);