Merge lp:~boiko/messaging-app/fix_timestamps into lp:messaging-app

[Gustavo Pichorim Boiko]

Make the time displaying consistent with dialer-app.

Make the time displaying consistent with dialer-app.

== Checklist ==
Are there any related MPs required for this MP to build/function as expected? Please list.
No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?
Yes

If you changed the UI, was the change specified/approved by design?
N/A

If you changed UI labels, did you update the pot file?
N/A

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:266
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/487/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6110
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4163
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/281
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5736
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7362
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7362/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14916
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3524
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4508
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4508/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/487/rebuild

review: Needs Fixing (continuous-integration)

[Arthur Mello (artmello)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/dialer-app) on device or emulator?
yes

Did CI run pass? If not, please explain why.
yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
yes

review: Approve

=== modified file 'src/qml/MessageBubble.qml'
--- src/qml/MessageBubble.qml	2014-10-07 16:57:03 +0000
+++ src/qml/MessageBubble.qml	2014-10-21 16:19:28 +0000
@@ -129,7 +129,7 @@
             if (messageTimeStamp === "")
                 return ""
 
-            var str = Qt.formatTime(messageTimeStamp).toLowerCase()
+            var str = Qt.formatTime(messageTimeStamp, Qt.DefaultLocaleShortDate)
             if (root.accountName.length === 0 || !root.messageIncoming) {
                 return str
             }

=== modified file 'src/qml/ThreadDelegate.qml'
--- src/qml/ThreadDelegate.qml	2014-09-09 02:19:45 +0000
+++ src/qml/ThreadDelegate.qml	2014-10-21 16:19:28 +0000
@@ -145,29 +145,16 @@
         text: groupChat ? groupChatLabel : unknownContact ? delegateHelper.phoneNumber : delegateHelper.alias
     }
 
-    Row {
+    Label {
         id: time
 
-        property string dateStr: Qt.formatTime(eventTimestamp)
-        property var dateParts: dateStr.split(' ')
-
         anchors {
             verticalCenter: contactName.verticalCenter
             right: parent.right
         }
-        Label {
-            fontSize: "x-small"
-            font.weight: Font.DemiBold
-            opacity: 0.70
-            text: time.dateParts[0]
-        }
-        Label {
-            fontSize: "x-small"
-            opacity: 0.70
-            text: time.dateParts.length > 1 ? " " + time.dateParts[1].toLowerCase() : ""
-            // do not display this if the date format is 24h
-            visible: time.dateParts.length > 1
-        }
+
+        text: Qt.formatTime(eventTimestamp, Qt.DefaultLocaleShortDate)
+        fontSize: "small"
     }
 
     UbuntuShape {