Merge lp:~andrewsomething/ubuntu-weather-app/use_system_locales into lp:ubuntu-weather-app/obsolete.trunk

[Andrew Starr-Bochicchio]

Use the system locale to determine both the default units and the display of time.

Use the system locale to determine both the default units and the display of time.

[Martin Borho (martin-borho)]

Important fix, thanks a lot!

Unfortunately it fails to merge now with 2 conflicts, since last merge in trunk brought updates to the used dates and their internal representation. Sorry for that.

But should be easy to fix, though.

Cheers
Martin

review: Needs Fixing

[Andrew Starr-Bochicchio (andrewsomething)]

Hmm... The autopilot tests really don't like that the default settings are dynamic.

Is it possible to import PyQt in the autopilot test? If so we could check Qt.QLocale.MetricSystem from the tests.

[David Planella (dpm)]

9 + var dateTimeString = Qt.formatDateTime(dateTime, 'dddd, dd MMMM - ') + Qt.formatTime(dateTime);

While we are at it, it might be worth wrapping the date in i18n(), and adding a comment on top, so that translators can rearrange it if needed. E.g.

# TRANSLATORS: this is a date to which a time of the day will be appended
var dateTimeString = Qt.formatDateTime(dateTime, i18n.tr('dddd, dd MMMM - ')) + Qt.formatTime(dateTime);

Not sure about the question on PyQt, it might be worth asking Nick Skaggs (balloons on IRC) about it.

review: Needs Fixing

[David Planella (dpm)]

Even better if we can make it:

# TRANSLATORS: this is a date to which a time of the day will be appended
var dateTimeString = Qt.formatDateTime(dateTime, i18n.tr('dddd, dd MMMM')) + ' - ' + Qt.formatTime(dateTime);

Or use a standard time format, so that it can be used directly without the need for translation (but I'm not sure if there is one for this combination of date and time).

[Martin Borho (martin-borho)]

Hi Andrew,

Locale.MetricSystem and Locale.ImperialSystem are only constants and the Locale object may only be created via the Qt.locale() function, so the right conditions should be :

(Qt.locale().measurementSystem === Locale.MetricSystem)

But this leads to the same problem....

Perhaps, we can save the settings beforehand to the storage, like the test locations? See tests/autopilot/ubuntu_weather_app/tests/__init.py at the bottom.

Cheers
Martin

Docs:
http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-locale.html#measurementSystem-prop

[Andrew Starr-Bochicchio (andrewsomething)]

Alright, I think this is ready to land now.

review: Needs Resubmitting

[Martin Borho (martin-borho)]

Great, good stuff! Thanks!

review: Approve

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

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~andrewsomething/ubuntu-weather-app/use_system_locales/+merge/187301/+edit-commit-message

review: Needs Fixing (continuous-integration)

[Andrew Starr-Bochicchio (andrewsomething)]

review: Approve

[David Planella (dpm)]

Looks good to me now, thanks!

review: Approve

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

review: Approve (continuous-integration)

=== modified file 'components/CurrentWeather.qml'
--- components/CurrentWeather.qml	2013-09-20 16:48:23 +0000
+++ components/CurrentWeather.qml	2013-09-24 17:29:48 +0000
@@ -88,7 +88,8 @@
                                 adjustBackground(Math.round(temp));
                                 var dateData =  currentWeather.hourly.get(hourIndex).date;
                                 var dateTime = new Date(dateData.year, dateData.month, dateData.date, dateData.hours, dateData.minutes)
-                                var dateTimeString = Qt.formatDateTime(dateTime, 'dddd, dd MMMM - HH:mm');
+                                // TRANSLATORS: this is a date to which a time of the day will be appended
+                                var dateTimeString = Qt.formatDateTime(dateTime, i18n.tr('dddd, dd MMMM')) + ' - ' + Qt.formatTime(dateTime);
                                 dateComponent.dateString = dateTimeString;
                                 dateComponent.renderText();
                             }

=== modified file 'components/LastUpdatedComponent.qml'
--- components/LastUpdatedComponent.qml	2013-09-18 17:36:20 +0000
+++ components/LastUpdatedComponent.qml	2013-09-24 17:29:48 +0000
@@ -31,7 +31,7 @@
     onUpdateDateChanged: {
         var updatedLabel = i18n.tr("Updated: "),
             updated = new Date(parseInt(updateDate)),
-            updateTime = Qt.formatTime(updated, 'HH:mm');
+            updateTime = Qt.formatTime(updated);
         if(Qt.formatDateTime(updated, "yyyy-MM-dd") === Qt.formatDateTime(new Date(), "yyyy-MM-dd")) {
             updatedLabel += i18n.tr("Today, ")+updateTime;
         } else {

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/__init__.py'
--- tests/autopilot/ubuntu_weather_app/tests/__init__.py	2013-09-21 17:38:36 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/__init__.py	2013-09-24 17:29:48 +0000
@@ -141,3 +141,10 @@
             conn.commit()
         conn.close()
 
+    def save_units_to_storage(self):
+        path = self.find_db()
+        conn = sqlite3.connect(path)
+        cursor = conn.cursor()
+        cursor.execute("INSERT INTO settings(key, value) VALUES('units', 'metric'), ('wind_units', 'kmh')")
+        conn.commit()
+        conn.close()
\ No newline at end of file

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_settings.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_settings.py	2013-09-16 13:15:48 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_settings.py	2013-09-24 17:29:48 +0000
@@ -20,6 +20,7 @@
         self.clean_db()
         self.launch_and_quit_app()
         self.save_locations_to_storage(locations_data)
+        self.save_units_to_storage()
         super(TestSettings, self).setUp()
         self.assertThat(
             self.get_qml_view().visible, Eventually(Equals(True)))

=== modified file 'ubuntu-weather-app.qml'
--- ubuntu-weather-app.qml	2013-09-21 17:38:36 +0000
+++ ubuntu-weather-app.qml	2013-09-24 17:29:48 +0000
@@ -43,7 +43,10 @@
     property var locationsList: []
     property var tabsObject: null
     // set default values for settings here
-    property var settings: {"units":"metric", "wind_units": "kmh"}
+    property var settings: {
+        "units": Qt.locale().measurementSystem === Locale.MetricSystem ? "metric" : "imperial",
+        "wind_units": Qt.locale().measurementSystem === Locale.MetricSystem ? "kmh" : "mph"
+    }
 
     WorkerScript {
         id: locationDataWorker