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

[Gustavo Pichorim Boiko]

Format timestamps according to the locale.

Format timestamps according to the locale.

== 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

[lp:~boiko/dialer-app/fix_timestamps]

303. By Gustavo Pichorim Boiko on 2014-10-21

Fix the timestamp also in the call history details.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:303
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/484/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-i386-ci/255
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6104
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4159
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5730
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7356
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7356/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14910
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3520
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4504
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4504/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/484/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/HistoryPage/HistoryDelegate.qml'
--- src/qml/HistoryPage/HistoryDelegate.qml	2014-09-24 17:55:17 +0000
+++ src/qml/HistoryPage/HistoryDelegate.qml	2014-10-21 14:29:03 +0000
@@ -227,7 +227,7 @@
         // TRANSLATORS: this string is the time a call has happenend. It represents the format to be used, according to:
         // http://qt-project.org/doc/qt-5/qml-qtqml-qt.html#formatDate-method
         // please change according to your language
-        text: Qt.formatTime(model.timestamp, i18n.tr("hh:mm ap"))
+        text: Qt.formatTime(model.timestamp, Qt.DefaultLocaleShortDate)
     }
 
     Label {
 
=== modified file 'src/qml/HistoryPage/HistoryDetailsPage.qml'
--- src/qml/HistoryPage/HistoryDetailsPage.qml	2014-09-19 13:55:32 +0000
+++ src/qml/HistoryPage/HistoryDetailsPage.qml	2014-10-21 14:29:03 +0000
@@ -258,7 +258,7 @@
                 id: timeLabel
                 // TRANSLATORS: HH:mm is the time format, translate it according to:
                 // http://qt-project.org/doc/qt-5/qml-qtqml-qt.html#formatDate-method
-                text: Qt.formatTime(modelData.timestamp, i18n.tr("hh:mm ap"))
+                text: Qt.formatTime(modelData.timestamp, Qt.DefaultLocaleShortDate)
                 anchors {
                     left: parent.left
                     verticalCenter: parent.verticalCenter