Merge lp:~rpadovani/ubuntu-clock-app/1362093 into lp:ubuntu-clock-app

[Riccardo Padovani]

Changed design for world clock - fixed bug #1362093

Changed design for world clock - fixed bug #1362093

[lp:~rpadovani/ubuntu-clock-app/1362093]

77. By Riccardo Padovani on 2014-09-02

Updated debian/changelog

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:77
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/422/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/140/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/140/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/69

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/422/rebuild

review: Needs Fixing (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

I sent a screenshot of this MP to the designers who proposed the following change,

- Change the time string to "3h 20m ahead" instead of "3 h 20 m ahead"
- It would be nice to make the "h" and "m" to be FontWeight Medium instead of light.

Otherwise it looks good.

review: Needs Fixing

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:77
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/425/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/72

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/425/rebuild

review: Needs Fixing (continuous-integration)

[lp:~rpadovani/ubuntu-clock-app/1362093]

78. By Riccardo Padovani on 2014-09-04

modified hours formattation

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:78
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/443/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/171/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/90/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/443/rebuild

review: Needs Fixing (continuous-integration)

[lp:~rpadovani/ubuntu-clock-app/1362093]

79. By Riccardo Padovani on 2014-09-04

merged from trunk and resolved conflicts

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:79
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/444/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/174
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/174/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/91

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/444/rebuild

review: Approve (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

lgtm!

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'README.translations'
--- README.translations	2014-08-13 05:07:39 +0000
+++ README.translations	2014-09-04 21:13:06 +0000
@@ -1,6 +1,6 @@
 # Updating translations
 
-Translations for the Music app happen in [Launchpad Translations][] and
+Translations for the Clock app happen in [Launchpad Translations][] and
 are automatically committed daily on the trunk branch in the po/ folder.
 
 They are then built and installed as part of the package build, so that

=== modified file 'app/worldclock/UserWorldCityDelegate.qml'
--- app/worldclock/UserWorldCityDelegate.qml	2014-08-24 12:47:50 +0000
+++ app/worldclock/UserWorldCityDelegate.qml	2014-09-04 21:13:06 +0000
@@ -135,18 +135,6 @@
             text: {
                 var day;
 
-                if(model.daysTo === 0) {
-                    day = i18n.tr("Today")
-                }
-
-                else if(model.daysTo === 1) {
-                    day = i18n.tr("Tomorrow")
-                }
-
-                else if(model.daysTo === -1) {
-                    day = i18n.tr("Yesterday")
-                }
-
                 // TRANSLATORS: this indicates if the time in a world clock
                 // is behind or ahead of the time at the current location
                 var isBehind = model.timeTo > 0 ? i18n.tr("behind")
@@ -157,35 +145,33 @@
                 var hour = timediff[0]
 
                 if(hour > 0 &&  minute > 0) {
-                    // TRANSLATORS: the first argument is a day, followed by hour, minute and the
-                    // translation for either 'behind' or 'ahead'
-                    return (i18n.tr("%1\n%2 h %3 m %4"))
-                    .arg(day)
+                    // TRANSLATORS: the first argument is hour, followed by
+                    // minute, and the translation for either 'behind' or
+                    // 'ahead'
+                    return (i18n.tr("%1h %2m %3"))
                     .arg(hour)
                     .arg(minute)
                     .arg(isBehind)
                 }
 
                 else if(hour > 0 && minute === 0) {
-                    // TRANSLATORS: the first argument is a day, followed by hour and the
+                    // TRANSLATORS: the first argument is hour, followed by the
                     // translation for either 'behind' or 'ahead'
-                    return (i18n.tr("%1\n%2 h %3"))
-                    .arg(day)
+                    return (i18n.tr("%1h %2"))
                     .arg(hour)
                     .arg(isBehind)
                 }
 
                 else if(hour === 0 && minute > 0) {
-                    // TRANSLATORS: the first argument is a day, followed by minute and the
+                    // TRANSLATORS: the first argument is minute, followed by the
                     // translation for either 'behind' or 'ahead'
-                    return ("%1\n%2 m %3")
-                    .arg(day)
+                    return (i18n.tr("%1m %2"))
                     .arg(minute)
                     .arg(isBehind)
                 }
 
                 else {
-                    return i18n.tr("No Time Difference")
+                    return i18n.tr("Same time")
                 }
             }
         }

=== modified file 'backend/modules/Timezone/timezonemodel.cpp'
--- backend/modules/Timezone/timezonemodel.cpp	2014-08-16 12:46:46 +0000
+++ backend/modules/Timezone/timezonemodel.cpp	2014-09-04 21:13:06 +0000
@@ -86,8 +86,6 @@
          is fixed, we will have to return a string.
         */
         return worldCityTime.toString("hh:mm");
-    case RoleDaysTo:
-        return currentDateTime.daysTo(worldCityTime);
     case RoleTimeTo:
         /*
          FIXME: Workaround for currentDateTime.secsTo(worldCityTime) which returns
@@ -110,7 +108,6 @@
     roles.insert(RoleCountryName, "country");
     roles.insert(RoleTimeZoneId, "timezoneID");
     roles.insert(RoleTimeString, "localTime");
-    roles.insert(RoleDaysTo, "daysTo");
     roles.insert(RoleTimeTo, "timeTo");
     return roles;
 }
@@ -148,7 +145,7 @@
     QModelIndex startIndex = index(0);
     QModelIndex endIndex = index(m_timeZones.count() - 1);
     QVector<int> roles;
-    roles << RoleTimeString << RoleDaysTo << RoleTimeTo;
+    roles << RoleTimeString << RoleTimeTo;
     emit dataChanged(startIndex, endIndex, roles);
 }
 

=== modified file 'backend/modules/Timezone/timezonemodel.h'
--- backend/modules/Timezone/timezonemodel.h	2014-08-16 12:46:46 +0000
+++ backend/modules/Timezone/timezonemodel.h	2014-09-04 21:13:06 +0000
@@ -53,7 +53,6 @@
         RoleCountryName,
         RoleTimeZoneId,
         RoleTimeString,
-        RoleDaysTo,
         RoleTimeTo,
     };
 

=== modified file 'debian/changelog'
--- debian/changelog	2014-09-04 20:21:00 +0000
+++ debian/changelog	2014-09-04 21:13:06 +0000
@@ -34,6 +34,10 @@
   [David Planella]
   * Added internationalization support (LP: #1354522)
 
+  [Riccardo Padovani]
+  * Removed 'Today/Tomorow/Yesterday' text string from world clock, replaced
+    'No time difference' with 'Same time' (LP: #1362093)
+
  -- Nekhelesh Ramananthan <[e-mail]>  Wed, 13 Aug 2014 15:46:12 +0200
 
 ubuntu-clock-app (3.0-0ubuntu1) utopic; urgency=medium

=== modified file 'po/com.ubuntu.clock.pot'
--- po/com.ubuntu.clock.pot	2014-09-02 15:13:45 +0000
+++ po/com.ubuntu.clock.pot	2014-09-04 21:13:06 +0000
@@ -125,48 +125,40 @@
 msgid "City"
 msgstr ""
 
-#: ../app/worldclock/UserWorldCityDelegate.qml:139
-msgid "Today"
-msgstr ""
-
-#: ../app/worldclock/UserWorldCityDelegate.qml:143
-msgid "Tomorrow"
-msgstr ""
-
-#: ../app/worldclock/UserWorldCityDelegate.qml:147
-msgid "Yesterday"
-msgstr ""
-
 #. TRANSLATORS: this indicates if the time in a world clock
 #. is behind or ahead of the time at the current location
-#: ../app/worldclock/UserWorldCityDelegate.qml:152
+#: ../app/worldclock/UserWorldCityDelegate.qml:140
 msgid "behind"
 msgstr ""
 
-#: ../app/worldclock/UserWorldCityDelegate.qml:153
+#: ../app/worldclock/UserWorldCityDelegate.qml:141
 msgid "ahead"
 msgstr ""
 
-#. TRANSLATORS: the first argument is a day, followed by hour, minute and the
-#. translation for either 'behind' or 'ahead'
-#: ../app/worldclock/UserWorldCityDelegate.qml:162
-#, qt-format
-msgid ""
-"%1\n"
-"%2 h %3 m %4"
-msgstr ""
-
-#. TRANSLATORS: the first argument is a day, followed by hour and the
-#. translation for either 'behind' or 'ahead'
-#: ../app/worldclock/UserWorldCityDelegate.qml:172
-#, qt-format
-msgid ""
-"%1\n"
-"%2 h %3"
-msgstr ""
-
-#: ../app/worldclock/UserWorldCityDelegate.qml:188
-msgid "No Time Difference"
+#. TRANSLATORS: the first argument is hour, followed by
+#. minute, and the translation for either 'behind' or
+#. 'ahead'
+#: ../app/worldclock/UserWorldCityDelegate.qml:151
+#, qt-format
+msgid "%1 h %2 m %3"
+msgstr ""
+
+#. TRANSLATORS: the first argument is hour, followed by the
+#. translation for either 'behind' or 'ahead'
+#: ../app/worldclock/UserWorldCityDelegate.qml:160
+#, qt-format
+msgid "%1 h %2"
+msgstr ""
+
+#. TRANSLATORS: the first argument is minute, followed by the
+#. translation for either 'behind' or 'ahead'
+#: ../app/worldclock/UserWorldCityDelegate.qml:168
+#, qt-format
+msgid "%1 m %2"
+msgstr ""
+
+#: ../app/worldclock/UserWorldCityDelegate.qml:174
+msgid "Same time"
 msgstr ""
 
 #: ../app/worldclock/WorldCityList.qml:40