ubuntu-touch-coreapps-reviewers team mailing list archive

[Nekhelesh Ramananthan <krnekhelesh@xxxxxxxxx>]

Nekhelesh Ramananthan has proposed merging lp:~nik90/ubuntu-clock-app/fix-1440732 into lp:ubuntu-clock-app.

Commit message:
Fixes the timezone difference label overflowing into the clock.

Requested reviews:
  Riccardo Padovani (rpadovani)
  Ubuntu Clock Developers (ubuntu-clock-dev)
Related bugs:
  Bug #1440732 in Ubuntu Clock App: "Text from differece is to long if using half hours"
  https://bugs.launchpad.net/ubuntu-clock-app/+bug/1440732

For more details, see:
https://code.launchpad.net/~nik90/ubuntu-clock-app/fix-1440732/+merge/255260

Fixes the timezone difference label overflowing into the clock.

To test, try opening the clock in german (by setting phone language).
-- 
Your team Ubuntu Clock Developers is requested to review the proposed merge of lp:~nik90/ubuntu-clock-app/fix-1440732 into lp:ubuntu-clock-app.

=== modified file 'app/worldclock/UserWorldCityDelegate.qml'
--- app/worldclock/UserWorldCityDelegate.qml	2014-09-10 18:52:50 +0000
+++ app/worldclock/UserWorldCityDelegate.qml	2015-04-06 13:37:20 +0000
@@ -129,10 +129,14 @@
             id: relativeTimeLabel
             objectName: "relativeTimeLabel" + index
 
+            anchors.left: localTimeVisual.right
             anchors.right: parent.right
             anchors.verticalCenter: parent.verticalCenter
 
             fontSize: "xx-small"
+            wrapMode: Text.WordWrap
+            maximumLineCount: 2
+            elide: Text.ElideRight
             horizontalAlignment: Text.AlignRight
             text: {
                 var day;

=== modified file 'debian/changelog'
--- debian/changelog	2015-03-17 22:35:16 +0000
+++ debian/changelog	2015-04-06 13:37:20 +0000
@@ -14,6 +14,7 @@
   * Fixed strings not following gettext-style plural forms. (LP: #1431446)
   * Renabled create alarm tests on device which were disabled due to upstream bug
     in autopilot. (LP: #1426108)
+  * Fixed timezone difference label overflowing into the clock (LP: #1440732)
 
   [Brendan Donegan]
   * Fixed AP failure by waiting for the bottom edge tip visible property to be true

=== modified file 'po/com.ubuntu.clock.pot'
--- po/com.ubuntu.clock.pot	2015-03-31 19:03:09 +0000
+++ po/com.ubuntu.clock.pot	2015-04-06 13:37:20 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-31 20:29+0200\n"
+"POT-Creation-Date: 2015-04-06 15:32+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -176,37 +176,37 @@
 
 #. 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:142
+#: ../app/worldclock/UserWorldCityDelegate.qml:146
 msgid "behind"
 msgstr ""
 
-#: ../app/worldclock/UserWorldCityDelegate.qml:143
+#: ../app/worldclock/UserWorldCityDelegate.qml:147
 msgid "ahead"
 msgstr ""
 
 #. TRANSLATORS: the first argument is hour, followed by
 #. minute, and the translation for either 'behind' or
 #. 'ahead'
-#: ../app/worldclock/UserWorldCityDelegate.qml:153
+#: ../app/worldclock/UserWorldCityDelegate.qml:157
 #, qt-format
 msgid "%1h %2m %3"
 msgstr ""
 
 #. TRANSLATORS: the first argument is hour, followed by the
 #. translation for either 'behind' or 'ahead'
-#: ../app/worldclock/UserWorldCityDelegate.qml:162
+#: ../app/worldclock/UserWorldCityDelegate.qml:166
 #, qt-format
 msgid "%1h %2"
 msgstr ""
 
 #. TRANSLATORS: the first argument is minute, followed by the
 #. translation for either 'behind' or 'ahead'
-#: ../app/worldclock/UserWorldCityDelegate.qml:170
+#: ../app/worldclock/UserWorldCityDelegate.qml:174
 #, qt-format
 msgid "%1m %2"
 msgstr ""
 
-#: ../app/worldclock/UserWorldCityDelegate.qml:176
+#: ../app/worldclock/UserWorldCityDelegate.qml:180
 msgid "Same time"
 msgstr ""