Merge lp:~vthompson/ubuntu-weather-app/reboot-time-of-day into lp:ubuntu-weather-app

[Victor Thompson]

Show am/pm text depending upon locale

Show am/pm text depending upon locale

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:53
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/113/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/83
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/113

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/113/rebuild

review: Approve (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

Added a small inline comment.

review: Needs Fixing

[lp:~vthompson/ubuntu-weather-app/reboot-time-of-day]

54. By Victor Thompson on 2015-06-21

modify text string

[Victor Thompson (vthompson)]

I've updated the formatting of the text string.

[Nekhelesh Ramananthan (nik90)]

lgtm!

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:54
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/118/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/88
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/118

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/118/rebuild

review: Approve (continuous-integration)

=== modified file 'app/components/HomeHourly.qml'
--- app/components/HomeHourly.qml	2015-06-18 01:42:03 +0000
+++ app/components/HomeHourly.qml	2015-06-21 16:11:15 +0000
@@ -28,6 +28,8 @@
     model: forecasts.length
     orientation: ListView.Horizontal
 
+    property string currentDate: Qt.formatTime(new Date())
+
     onVisibleChanged: {
         if(visible) {
             ListView.model = forecasts.length
@@ -60,7 +62,7 @@
                 anchors.horizontalCenter: parent.horizontalCenter
                 fontSize: "small"
                 font.weight: Font.Light
-                text: formatTimestamp(hourData.date, 'ddd')+" "+formatTime(hourData.date, 'h:mm')
+                text: currentDate.search(Qt.locale().amText) !== -1 || currentDate.search(Qt.locale().pmText) !== -1 ? "%1 %2".arg(formatTimestamp(hourData.date, 'ddd')).arg(formatTime(hourData.date, 'hap')) : "%1 %2".arg(formatTimestamp(hourData.date, 'ddd')).arg(formatTime(hourData.date, 'h:mm'))
             }
 
             Item {