Merge lp:~nick-dedekind/ubuntu-settings-components/lp1378821.time-translation into lp:~registry/ubuntu-settings-components/trunk

[Nick Dedekind]

Fixed problem with message time text alignment.

Fixed problem with message time text alignment.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:84
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/96/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-qmltests-vivid/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-armhf-ci/3/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-settings-components-ci/96/rebuild

review: Approve (continuous-integration)

[Lukáš Tinkl (lukas-kde)]

LGTM, approving

review: Approve

[Andrea Cimitan (cimi)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
y
 * Did CI run pass? If not, please explain why.
y

review: Approve

=== modified file 'Ubuntu/Settings/Components/MessageHeader.qml'
--- Ubuntu/Settings/Components/MessageHeader.qml	2014-09-15 17:18:27 +0000
+++ Ubuntu/Settings/Components/MessageHeader.qml	2015-01-12 17:28:06 +0000
@@ -104,10 +104,10 @@
         Label {
             id: timeText
             objectName: "time"
-            elide: Text.ElideRight
+            anchors.right: parent.right
+
             fontSize: "x-small"
             maximumLineCount: 1
-            horizontalAlignment: Text.AlignRight
         }
         spacing: units.gu(0.5)