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

[Gustavo Pichorim Boiko]

Format timestamps according to the locale.

Format timestamps according to the locale.

=== 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-12-16 01:41:36 +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-12-16 01:41:36 +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