Merge lp:~macslow/indicator-datetime/fix-1236288 into lp:indicator-datetime/14.04

[Mirco Müller]

Use always a 24h-format for time-display.

Use always a 24h-format for time-display... fixes LP: #1236288

[lp:~macslow/indicator-datetime/fix-1236288]

279. By Mirco Müller on 2013-10-17

Don't forget to push the updated test too.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:278
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/118/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-saucy-amd64-ci/72/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-saucy-armhf-ci/73/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/indicator-datetime-ci/118/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:279
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/119/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-saucy-amd64-ci/73
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-saucy-armhf-ci/74
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-saucy-armhf-ci/74/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/indicator-datetime-ci/119/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

Comments on the bug about the design.

review: Needs Information

[Ted Gould (ted)]

Actually, I'm going to reject this. Because, if design wants to make a phone that is unsellable in the US they should do that by installing a dconf override for the 'time-format' key so that we don't break desktop.

[Ted Gould (ted)]

review: Disapprove

[Lars Karlitski (larsu)]

Ted, I very much agree with you here. This code doesn't look like it's using the time-format key, though.

[Charles Kerr (charlesk)]

I agree with both of you. This code isn't using the dconf keys right now (it's currently a hardcoded format on the phone) AND 12h is the clear default for end-user US devices.

From a coding standpoint, we may want to clone the existing desktop dconf keys so that both profiles can use the same code to generate time format strings. This /doesn't/ mean that they all the desktop options need to be exposed on the phone -- perhaps a 21h/24h toggle would be enough there?

Unmerged revisions

279. By Mirco Müller on 2013-10-17

Don't forget to push the updated test too.

278. By Mirco Müller on 2013-10-17

Use always a 24h-format for time-display. Fixes LP: #1236288

=== modified file 'src/utils.c'
--- src/utils.c	2013-10-03 21:16:24 +0000
+++ src/utils.c	2013-10-17 14:22:32 +0000
@@ -297,8 +297,8 @@
 const gchar*
 get_terse_header_time_format_string (void)
 {
-  /* a strftime(3) fmt string for a H:MM 12 hour time, eg "6:59 PM" */
-  return T_("%l:%M %p");
+  /* a strftime(3) fmt string for a H:MM 24 hour time, eg "17:59" */
+  return T_("%H:%M");
 }
 
 const gchar *

=== modified file 'tests/test-utils.cc'
--- tests/test-utils.cc	2013-10-03 14:36:25 +0000
+++ tests/test-utils.cc	2013-10-17 14:22:32 +0000
@@ -78,12 +78,12 @@
     GDateTime * time;
     const char * expected_format_string;
   } test_cases[] = {
-    { g_date_time_ref(arbitrary_day), g_date_time_ref(arbitrary_day), "%l:%M %p" }, /* identical time */
-    { g_date_time_ref(arbitrary_day), g_date_time_add_hours(arbitrary_day,1), "%l:%M %p" }, /* later today */
-    { g_date_time_ref(arbitrary_day), g_date_time_add_days(arbitrary_day,1), "Tomorrow" EM_SPACE "%l:%M %p" }, /* tomorrow */
-    { g_date_time_ref(arbitrary_day), g_date_time_add_days(arbitrary_day,2), "%a" EM_SPACE "%l:%M %p" },
-    { g_date_time_ref(arbitrary_day), g_date_time_add_days(arbitrary_day,6), "%a" EM_SPACE "%l:%M %p" },
-    { g_date_time_ref(arbitrary_day), g_date_time_add_days(arbitrary_day,7), "%d %b" EM_SPACE "%l:%M %p" }, /* over one week away */
+    { g_date_time_ref(arbitrary_day), g_date_time_ref(arbitrary_day), "%H:%M" }, /* identical time */
+    { g_date_time_ref(arbitrary_day), g_date_time_add_hours(arbitrary_day,1), "%H:%M" }, /* later today */
+    { g_date_time_ref(arbitrary_day), g_date_time_add_days(arbitrary_day,1), "Tomorrow" EM_SPACE "%H:%M" }, /* tomorrow */
+    { g_date_time_ref(arbitrary_day), g_date_time_add_days(arbitrary_day,2), "%a" EM_SPACE "%H:%M" },
+    { g_date_time_ref(arbitrary_day), g_date_time_add_days(arbitrary_day,6), "%a" EM_SPACE "%H:%M" },
+    { g_date_time_ref(arbitrary_day), g_date_time_add_days(arbitrary_day,7), "%d %b" EM_SPACE "%H:%M" }, /* over one week away */
 
     { g_date_time_ref(on_the_hour), g_date_time_ref(on_the_hour), "%l %p" }, /* identical time */
     { g_date_time_ref(on_the_hour), g_date_time_add_hours(on_the_hour,1), "%l %p" }, /* later today */