Merge lp:~martin-borho/ubuntu-weather-app/fix-1324578-optionselectors-xlated into lp:ubuntu-weather-app/obsolete.trunk

[Martin Borho]

Fill optionselectors in settings sheet dynamically, to achieve label localization, fixes Bug #1324578

Fill optionselectors in settings sheet dynamically, to achieve label localization, fixes Bug #1324578

[David Planella (dpm)]

Awesome, thanks Martin! Could you update the .pot file as part of this MP, so that it includes the new strings?

review: Needs Fixing

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

FAILED: Continuous integration, rev:262
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/201/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty-weather-app/121
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty-weather-app/121/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-trusty-amd64-ci/113/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-utopic-amd64-ci/8/console

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

review: Needs Fixing (continuous-integration)

[lp:~martin-borho/ubuntu-weather-app/fix-1324578-optionselectors-xlated]

263. By Martin Borho on 2014-06-02

updated the .pot file

[Martin Borho (martin-borho)]

David, I've updated the .pot file, from within QtCreator. It's ok?

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

FAILED: Continuous integration, rev:263
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/202/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty-weather-app/122
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty-weather-app/122/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-trusty-amd64-ci/114/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-utopic-amd64-ci/9/console

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

review: Needs Fixing (continuous-integration)

[lp:~martin-borho/ubuntu-weather-app/fix-1324578-optionselectors-xlated]

264. By Martin Borho on 2014-06-02

pep8 fixes

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

FAILED: Continuous integration, rev:264
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/203/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty-weather-app/123
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty-weather-app/123/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-trusty-amd64-ci/115/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-utopic-amd64-ci/10/console

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

review: Needs Fixing (continuous-integration)

[lp:~martin-borho/ubuntu-weather-app/fix-1324578-optionselectors-xlated]

265. By Martin Borho on 2014-06-02

pep8 again

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

PASSED: Continuous integration, rev:265
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/204/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty-weather-app/124
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty-weather-app/124/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-trusty-amd64-ci/116
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-utopic-amd64-ci/11

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

review: Approve (continuous-integration)

[David Planella (dpm)]

LGTM, thanks!

review: Approve

[David Planella (dpm)]

Oh, I was a bit too quick approving and hadn't noticed the fact that you mentioned that you'd updated the .pot file via Qt Creator.

The .pot update option in Qt Creator is not working too well and should probably be disabled. We should be updating the .pot file using the method described in the README.translations file. I'll set up a branch with a new update to the .pot file.

=== modified file 'components/SettingsSheet.qml'
--- components/SettingsSheet.qml	2014-02-22 15:38:15 +0000
+++ components/SettingsSheet.qml	2014-06-02 12:59:42 +0000
@@ -28,6 +28,38 @@
         contentsHeight: parent.height
         contentsWidth: parent.width
 
+        function fillTempSelector() {
+            with(temperatureUnitsSelectorModel) {
+                append({ name: "celsiusOption", label: i18n.tr("Celsius")});
+                append({ name: "fahrenheitOption", label: i18n.tr("Fahrenheit")});
+            }
+            temperatureUnitsSelector.selectedIndex = (settings["units"] === "imperial") ? 1 : 0;
+        }
+
+        function fillWindSelector() {
+            with(windUnitsSelectorModel) {
+                append({ name: "kmhOption", label: i18n.tr("Kilometers per hour")});
+                append({ name: "mphOption", label: i18n.tr("Miles per hour")});
+            }
+            windUnitsSelector.selectedIndex = (settings["wind_units"] === "mph") ? 1 : 0;
+        }
+
+        function fillPrecipSelector() {
+            with(precipitationUnitsSelectorModel) {
+                append({ name: "millimetersOption", label: i18n.tr("Millimeters")});
+                append({ name: "inchesOption", label: i18n.tr("Inches")});
+            }
+            precipitationUnitsSelector.selectedIndex = (settings["precip_units"] === "in") ? 1 : 0;
+        }
+
+        Component.onCompleted: {
+            fillTempSelector();
+            fillWindSelector();
+            fillPrecipSelector();
+            mainView.shortCutsLimited = true;
+            Theme.palette.selected.backgroundText = "#656565"
+        }
+
         container: Column {
             anchors.left: parent.left
             anchors.right: parent.right
@@ -42,8 +74,6 @@
 
             ListModel {
                 id: temperatureUnitsSelectorModel
-                ListElement { name: "celsiusOption"; label: "Celsius";  }
-                ListElement { name: "fahrenheitOption"; label: "Fahrenheit";  }
             }
 
             OptionSelector {
@@ -52,13 +82,10 @@
                 text: i18n.tr("Temperature units")
                 delegate: unitsSelectorDelegate
                 model: temperatureUnitsSelectorModel
-                selectedIndex: (settings["units"] === "imperial") ? 1 : 0;
             }
 
             ListModel {
                 id: windUnitsSelectorModel
-                ListElement { name: "kmhOption"; label: "Kilometers per hour" }
-                ListElement { name: "mphOption"; label: "Miles per hour" }
             }
 
             OptionSelector {
@@ -67,13 +94,10 @@
                 text: i18n.tr("Wind speed units")
                 delegate: unitsSelectorDelegate
                 model: windUnitsSelectorModel
-                selectedIndex: (settings["wind_units"] === "mph") ? 1 : 0;
             }
 
             ListModel {
                 id: precipitationUnitsSelectorModel
-                ListElement { name: "millimetersOption"; label: "Millimeters" }
-                ListElement { name: "inchesOption"; label: "Inches" }
             }
 
             OptionSelector {
@@ -82,7 +106,6 @@
                 text: i18n.tr("Precipitation units")
                 delegate: unitsSelectorDelegate
                 model: precipitationUnitsSelectorModel
-                selectedIndex: (settings["precip_units"] === "in") ? 1 : 0;
                 // Precipitation units not available at TWC
                 visible: (serviceSelector.selectedIndex !== 0) ?  1 : 0
                 opacity: (serviceSelector.selectedIndex !== 0) ?  1 : 0
@@ -114,11 +137,6 @@
             }
         }
 
-        Component.onCompleted: {
-            mainView.shortCutsLimited = true;
-            Theme.palette.selected.backgroundText = "#656565"
-        }
-
         signal cancelSheet()
         onCancelSheet: {
             Theme.palette.selected.backgroundText = "#f4f4e8";

=== modified file 'po/com.ubuntu.weather.pot'
--- po/com.ubuntu.weather.pot	2014-03-12 11:47:05 +0000
+++ po/com.ubuntu.weather.pot	2014-06-02 12:59:42 +0000
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Canonical Ltd.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ubuntu-weather-app\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-12 06:45-0500\n"
+"POT-Creation-Date: 2014-06-02 14:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,11 +17,15 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: com.ubuntu.weather_weather.desktop.in.in:7
-msgid "Weather"
-msgstr ""
-
-#: components/AddLocationSheet.qml:33 components/LocationManagerSheet.qml:300
+#: components/LastUpdatedComponent.qml:35
+msgid "Updated: "
+msgstr ""
+
+#: components/LastUpdatedComponent.qml:39
+msgid "Today, "
+msgstr ""
+
+#: components/AddLocationSheet.qml:33 components/LocationManagerSheet.qml:301
 msgid "Add city"
 msgstr ""
 
@@ -34,6 +38,109 @@
 msgid "Enter a city name"
 msgstr ""
 
+#: components/LocationTab.qml:183
+msgid "Forecast"
+msgstr ""
+
+#: components/LocationTab.qml:328
+msgid ""
+"No weather data available at the moment, please try to refresh later again!"
+msgstr ""
+
+#: components/LocationTab.qml:344
+msgid "Refresh"
+msgstr ""
+
+#: components/LocationTab.qml:357
+msgid "Edit"
+msgstr ""
+
+#: components/LocationTab.qml:369 components/SettingsSheet.qml:27
+msgid "Settings"
+msgstr ""
+
+#: components/SplashComponent.qml:35
+msgid "Couldn't load weather data, please try later again!"
+msgstr ""
+
+#: components/LocationManagerSheet.qml:33
+msgid "Edit locations"
+msgstr ""
+
+#: components/LocationManagerSheet.qml:121
+msgid "Current location"
+msgstr ""
+
+#: components/LocationManagerSheet.qml:144
+msgid "Scan for location"
+msgstr ""
+
+#. TRANSLATORS: this is the button to add a location (city) that has been
+#. detected to be the current position
+#: components/LocationManagerSheet.qml:209
+msgid "Add"
+msgstr ""
+
+#: components/LocationManagerSheet.qml:229
+msgid "World"
+msgstr ""
+
+#: components/LocationManagerSheet.qml:319
+msgid "Location already added."
+msgstr ""
+
+#: components/LocationManagerSheet.qml:321
+msgid "OK"
+msgstr ""
+
+#: components/LocationManagerSheet.qml:374
+msgid "Couldn't specify your current location, please try later again!"
+msgstr ""
+
+#: components/LoadingSpinnerComponent.qml:44
+msgid "Loading..."
+msgstr ""
+
+#: components/SettingsSheet.qml:33
+msgid "Celsius"
+msgstr ""
+
+#: components/SettingsSheet.qml:34
+msgid "Fahrenheit"
+msgstr ""
+
+#: components/SettingsSheet.qml:41
+msgid "Kilometers per hour"
+msgstr ""
+
+#: components/SettingsSheet.qml:42
+msgid "Miles per hour"
+msgstr ""
+
+#: components/SettingsSheet.qml:49
+msgid "Millimeters"
+msgstr ""
+
+#: components/SettingsSheet.qml:50
+msgid "Inches"
+msgstr ""
+
+#: components/SettingsSheet.qml:82
+msgid "Temperature units"
+msgstr ""
+
+#: components/SettingsSheet.qml:94
+msgid "Wind speed units"
+msgstr ""
+
+#: components/SettingsSheet.qml:106
+msgid "Precipitation units"
+msgstr ""
+
+#: components/SettingsSheet.qml:133
+msgid "Weather Service"
+msgstr ""
+
 #: components/CurrentWeather.qml:62 components/CurrentWeatherDetail.qml:32
 msgid "Chance of Snow"
 msgstr ""
@@ -62,6 +169,16 @@
 msgid "Extreme"
 msgstr ""
 
+#. TRANSLATORS: this refers to the High (max) temperature forecasted for a day
+#: components/WeatherTemperatureComponent.qml:113
+msgid "H:"
+msgstr ""
+
+#. TRANSLATORS: this refers to the Low (min) temperature forecasted for a day
+#: components/WeatherTemperatureComponent.qml:133
+msgid "L:"
+msgstr ""
+
 #: components/CurrentWeatherDetail.qml:69
 msgid "Humidity"
 msgstr ""
@@ -90,93 +207,6 @@
 msgid "Precipitation"
 msgstr ""
 
-#: components/LastUpdatedComponent.qml:35
-msgid "Updated: "
-msgstr ""
-
-#: components/LastUpdatedComponent.qml:39
-msgid "Today, "
-msgstr ""
-
-#: components/LoadingSpinnerComponent.qml:44
-msgid "Loading..."
-msgstr ""
-
-#: components/LocationManagerSheet.qml:33
-msgid "Edit locations"
-msgstr ""
-
-#: components/LocationManagerSheet.qml:120
-msgid "Current location"
-msgstr ""
-
-#: components/LocationManagerSheet.qml:143
-msgid "Scan for location"
-msgstr ""
-
-#. TRANSLATORS: this is the button to add a location (city) that has been
-#. detected to be the current position
-#: components/LocationManagerSheet.qml:208
-msgid "Add"
-msgstr ""
-
-#: components/LocationManagerSheet.qml:228
-msgid "World"
-msgstr ""
-
-#: components/LocationManagerSheet.qml:318
-msgid "Location already added."
-msgstr ""
-
-#: components/LocationManagerSheet.qml:320
-msgid "OK"
-msgstr ""
-
-#: components/LocationManagerSheet.qml:370
-msgid "Couldn't specify your current location, please try later again!"
-msgstr ""
-
-#: components/LocationTab.qml:182
-msgid "Forecast"
-msgstr ""
-
-#: components/LocationTab.qml:351
-msgid ""
-"No weather data available at the moment, please try to refresh later again!"
-msgstr ""
-
-#: components/LocationTab.qml:367
-msgid "Refresh"
-msgstr ""
-
-#: components/LocationTab.qml:380
-msgid "Edit"
-msgstr ""
-
-#: components/LocationTab.qml:392 components/SettingsSheet.qml:27
-msgid "Settings"
-msgstr ""
-
-#: components/SettingsSheet.qml:52
-msgid "Temperature units"
-msgstr ""
-
-#: components/SettingsSheet.qml:67
-msgid "Wind speed units"
-msgstr ""
-
-#: components/SettingsSheet.qml:82
-msgid "Precipitation units"
-msgstr ""
-
-#: components/SettingsSheet.qml:110
-msgid "Weather Service"
-msgstr ""
-
-#: components/SplashComponent.qml:35
-msgid "Couldn't load weather data, please try later again!"
-msgstr ""
-
 #: components/TabFooter.qml:98
 msgid "10 days forecast"
 msgstr ""
@@ -184,13 +214,3 @@
 #: components/TabFooter.qml:120
 msgid "Hourly forecast"
 msgstr ""
-
-#. TRANSLATORS: this refers to the High (max) temperature forecasted for a day
-#: components/WeatherTemperatureComponent.qml:233
-msgid "H:"
-msgstr ""
-
-#. TRANSLATORS: this refers to the Low (min) temperature forecasted for a day
-#: components/WeatherTemperatureComponent.qml:253
-msgid "L:"
-msgstr ""

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/__init__.py'
--- tests/autopilot/ubuntu_weather_app/tests/__init__.py	2014-05-19 16:05:56 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/__init__.py	2014-06-02 12:59:42 +0000
@@ -134,7 +134,8 @@
     db_file = "34e1e542f2f083ff18f537b07a380071.sqlite"
     db_path = os.path.join(db_dir, db_file)
 
-    json_path =  os.path.abspath(os.path.join(os.path.dirname(__file__),'..', 'files'))
+    json_path = os.path.abspath(os.path.join(os.path.dirname(__file__),
+                                             '..', 'files'))
 
     def _execute_sql(self, statement):
         conn = sqlite3.connect(self.db_path)
@@ -178,7 +179,7 @@
 
     def get_locations_data(self):
         result = []
-        json_files = [self.json_path+'/1.json', self.json_path+'/2.json']
+        json_files = [self.json_path + '/1.json', self.json_path + '/2.json']
         for path in json_files:
             with open(path) as fh:
                 json_str = fh.read()
@@ -194,7 +195,7 @@
         for loc_data in locations:
             db_exec = "INSERT INTO Locations(date, data) VALUES('{}', '{}')"
             cursor.execute(db_exec.format(
-                int(time.time()*1000), loc_data))
+                int(time.time() * 1000), loc_data))
             conn.commit()
         conn.close()
 

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py	2014-05-19 16:05:56 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py	2014-06-02 12:59:42 +0000
@@ -72,9 +72,9 @@
         x, y, w, h = first_location.globalRect
         tx = x + (w / 8)
         ty = y + (h / 2)
-        self.pointing_device.drag(tx, ty, tx + w/4*3, ty)
+        self.pointing_device.drag(tx, ty, tx + w / 4 * 3, ty)
         self.assertThat(self._get_number_of_locations,
-                        Eventually(Equals(number_of_locations-1)))
+                        Eventually(Equals(number_of_locations - 1)))
 
     def _get_number_of_locations(self):
         qqlw = self.app.wait_select_single("ComposerSheet").wait_select_single(
@@ -274,7 +274,7 @@
         # back to locations, only one is left
         self.main_view.wait_for_activity_to_finish()
         tabObjects = lambda: len(self.main_view.select_many('LocationTab'))
-        self.assertThat(tabObjects, Eventually(Equals(tabsSumStart-1)))
+        self.assertThat(tabObjects, Eventually(Equals(tabsSumStart - 1)))
 
     def test_cancel_remove_location(self):
         """Cancels removing of location"""