Merge lp:~vthompson/ubuntu-weather-app/fix-1290492-weather into lp:ubuntu-weather-app/obsolete.trunk

[Victor Thompson]

* Fix po.pro file for desktop filename change
* Update translation strings

* Fix po.pro file for desktop filename change
* Update translation strings

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

PASSED: Continuous integration, rev:220
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/170/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty-weather-app/68
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/168
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/168
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-trusty-amd64-ci/82

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

review: Approve (continuous-integration)

[David Planella (dpm)]

Thanks Victor. Note that it's not necessary to use the po.pro file anymore after the migration to cmake. See the updated README.translations file.

However, when I did that I forgot to actually remove the po/po.pro file. Would you mind using this MP to do the po.pro file removal instead of fixing it?

review: Needs Fixing

[Victor Thompson (vthompson)]

I'll do so tonight

[lp:~vthompson/ubuntu-weather-app/fix-1290492-weather]

221. By Victor Thompson on 2014-03-12

Simplified translation instructions to use click-buddy and fixed the app name

222. By Victor Thompson on 2014-03-12

remove po.pro

[Victor Thompson (vthompson)]

However we decide to simplify the build for the weather app and its translations, we'll use the same pattern for lp:1290814 to update the other apps.

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

PASSED: Continuous integration, rev:222
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/171/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty-weather-app/69
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/169
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/169
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-trusty-amd64-ci/83

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

review: Approve (continuous-integration)

[David Planella (dpm)]

Thanks a lot for updating the documentation with an easier way to generate the .pot file with click-buddy.

Looking at the generated .pot file in the diff I've noticed an issue:

62 +#: .build/com.ubuntu.weather_weather.desktop.in.in:1
63 +msgid "tr("
64 +msgstr ""
65 +
66 +#: com.ubuntu.weather_weather.desktop.in.in:7
67 +msgid "Weather"
68 +msgstr ""

I wasn't expecting the "tr(" to be extracted from the .desktop.in.in file. However, after trying both build methods (the original one in the README.translations file using cmake directly, and the new one using click-buddy), I could not reproduce this. I.e. I always ended up with a correct .pot file with no "tr(" string in it.

review: Needs Fixing

[David Planella (dpm)]

Looking at the path on:

62 +#: .build/com.ubuntu.weather_weather.desktop.in.in:1

It seems this comes from files created from a previous build, so cleaning up the local directory and resubmitting the branch should fix it.

As an additional thought, perhaps the cmake rule to find translatable files is too generic and should be more restrictive in defining which exact files should be I18N_SRC_FILES, rather than globbing for anything underneath the source dir? Note that'd make us less flexible in adding new files without having to explicitly list them as I18N_SRC_FILES, though.

file(GLOB_RECURSE I18N_SRC_FILES
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
     components/*.qml components/*.js ${DESKTOP_FILE}.in.in)
list(SORT I18N_SRC_FILES)

[lp:~vthompson/ubuntu-weather-app/fix-1290492-weather]

223. By Victor Thompson on 2014-03-12

Remove desktop file in .build from international files.

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

PASSED: Continuous integration, rev:223
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/172/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty-weather-app/70
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/170
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/170
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-trusty-amd64-ci/84

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

Please review again. The process update for the other apps [1] won't be done until this branch provides a framework.

[1] https://code.launchpad.net/bugs/1290814

[David Planella (dpm)]

Looks good to me now, thanks Victor!

One thing I've noticed, but this is not related to this change, is that xgettext does not honour the --package-name argument, so it is left at the default value. I've seen this happening in other software (non-QML, non-cmake), so I think it's rather an xgettext bug:

+ --package-name='${APP_HARDCODE}'

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-02-19 21:35:29 +0000
+++ CMakeLists.txt	2014-03-12 11:47:38 +0000
@@ -43,6 +43,7 @@
      RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
      components/*.qml components/*.js ${DESKTOP_FILE}.in.in)
 list(SORT I18N_SRC_FILES)
+list(REMOVE_ITEM I18N_SRC_FILES .build/${DESKTOP_FILE}.in.in)
 
 file(GLOB SRC_FILES
      RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}

=== modified file 'README.translations'
--- README.translations	2014-02-14 09:52:57 +0000
+++ README.translations	2014-03-12 11:47:38 +0000
@@ -10,12 +10,12 @@
 translatable messages to translators. So whenever you add new translatable
 messages in the code, make sure to follow these steps:
 
- 1. Create a build directory: `mkdir ../build && cd ../build`
- 2. Run the cmake config: `cmake ../<original-branch>`
- 3. Build the project to generate the updated .pot file: `make`
- 4. Copy the .pot file to your original sources: `cp po/*.pot ../<original-branch>`
- 5. Commit the generated .pot file: `bzr commit -m"Updated translation template"`
- 6. Push the branch and send a merge proposal as usual
+ 1. Run click-buddy retaining the build directory: `click-buddy --dir . --no-clean`
+ 2. Copy the .pot file from the <build dir> mentioned in the output to your original
+    source:
+    `cp <build dir>/po/*.pot po/`
+ 3. Commit the generated .pot file: `bzr commit -m"Updated translation template"`
+ 4. Push the branch and send a merge proposal as usual
 
 And that's it, once the branch lands Launchpad should take care of all the rest!
 

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2014-02-14 09:52:57 +0000
+++ po/CMakeLists.txt	2014-03-12 11:47:38 +0000
@@ -13,7 +13,7 @@
         --from-code=UTF-8
         --c++ --qt --add-comments=TRANSLATORS
         --keyword=tr --keyword=tr:1,2
-        --package-name='${PROJECT}'
+        --package-name='${APP_HARDCODE}'
         --copyright-holder='Canonical Ltd.'
         ${I18N_SRC_FILES})
 

=== modified file 'po/com.ubuntu.weather.pot'
--- po/com.ubuntu.weather.pot	2014-02-14 09:52:57 +0000
+++ po/com.ubuntu.weather.pot	2014-03-12 11:47:38 +0000
@@ -1,5 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Canonical Ltd. 
+# Copyright (C) YEAR Canonical Ltd.
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-weather-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-15 02:51+0330\n"
+"POT-Creation-Date: 2014-03-12 06:45-0500\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,129 +17,180 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../components/AddLocationSheet.qml:32
-#: ../components/LocationManagerSheet.qml:268
+#: com.ubuntu.weather_weather.desktop.in.in:7
+msgid "Weather"
+msgstr ""
+
+#: components/AddLocationSheet.qml:33 components/LocationManagerSheet.qml:300
 msgid "Add city"
 msgstr ""
 
-#: ../components/AddLocationSheet.qml:70
+#: components/AddLocationSheet.qml:76
 #, qt-format
 msgid "No location was found for %1"
 msgstr ""
 
-#: ../components/AddLocationSheet.qml:128
+#: components/AddLocationSheet.qml:139
 msgid "Enter a city name"
 msgstr ""
 
-#: ../components/CurrentWeather.qml:154
+#: components/CurrentWeather.qml:62 components/CurrentWeatherDetail.qml:32
+msgid "Chance of Snow"
+msgstr ""
+
+#: components/CurrentWeather.qml:62 components/CurrentWeatherDetail.qml:32
+msgid "Chance of Rain"
+msgstr ""
+
+#: components/CurrentWeather.qml:69 components/CurrentWeatherDetail.qml:39
+msgid "Low"
+msgstr ""
+
+#: components/CurrentWeather.qml:71 components/CurrentWeatherDetail.qml:41
+msgid "Moderate"
+msgstr ""
+
+#: components/CurrentWeather.qml:73 components/CurrentWeatherDetail.qml:43
+msgid "High"
+msgstr ""
+
+#: components/CurrentWeather.qml:75 components/CurrentWeatherDetail.qml:45
+msgid "Very high"
+msgstr ""
+
+#: components/CurrentWeather.qml:77 components/CurrentWeatherDetail.qml:47
+msgid "Extreme"
+msgstr ""
+
+#: components/CurrentWeatherDetail.qml:69
 msgid "Humidity"
 msgstr ""
 
-#: ../components/CurrentWeather.qml:170
+#: components/CurrentWeatherDetail.qml:85
 msgid "Wind speed"
 msgstr ""
 
-#: ../components/CurrentWeather.qml:195
+#: components/CurrentWeatherDetail.qml:100
 msgid "Pressure"
 msgstr ""
 
-#: ../components/CurrentWeather.qml:196
+#: components/CurrentWeatherDetail.qml:101
+msgid "Percent"
+msgstr ""
+
+#: components/CurrentWeatherDetail.qml:101
 msgid "mbar"
 msgstr ""
 
-#: ../components/CurrentWeather.qml:211
+#: components/CurrentWeatherDetail.qml:116
+msgid "UV index"
+msgstr ""
+
+#: components/CurrentWeatherDetail.qml:116
 msgid "Precipitation"
 msgstr ""
 
-#: ../components/LastUpdatedComponent.qml:33
+#: components/LastUpdatedComponent.qml:35
 msgid "Updated: "
 msgstr ""
 
-#: ../components/LastUpdatedComponent.qml:37
+#: components/LastUpdatedComponent.qml:39
 msgid "Today, "
 msgstr ""
 
-#: ../components/LoadingSpinnerComponent.qml:44
+#: components/LoadingSpinnerComponent.qml:44
 msgid "Loading..."
 msgstr ""
 
-#: ../components/LocationManagerSheet.qml:32
+#: components/LocationManagerSheet.qml:33
 msgid "Edit locations"
 msgstr ""
 
-#: ../components/LocationManagerSheet.qml:104
+#: components/LocationManagerSheet.qml:120
 msgid "Current location"
 msgstr ""
 
-#: ../components/LocationManagerSheet.qml:124
+#: 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:187
+#: components/LocationManagerSheet.qml:208
 msgid "Add"
 msgstr ""
 
-#: ../components/LocationManagerSheet.qml:204
+#: components/LocationManagerSheet.qml:228
 msgid "World"
 msgstr ""
 
-#: ../components/LocationManagerSheet.qml:286
+#: components/LocationManagerSheet.qml:318
 msgid "Location already added."
 msgstr ""
 
-#: ../components/LocationManagerSheet.qml:288
+#: components/LocationManagerSheet.qml:320
 msgid "OK"
 msgstr ""
 
-#: ../components/LocationManagerSheet.qml:345
+#: components/LocationManagerSheet.qml:370
 msgid "Couldn't specify your current location, please try later again!"
 msgstr ""
 
-#: ../components/LocationTab.qml:167
+#: 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:200
+#: components/LocationTab.qml:367
 msgid "Refresh"
 msgstr ""
 
-#: ../components/LocationTab.qml:213
+#: components/LocationTab.qml:380
 msgid "Edit"
 msgstr ""
 
-#: ../components/LocationTab.qml:225 ../components/SettingsSheet.qml:27
+#: components/LocationTab.qml:392 components/SettingsSheet.qml:27
 msgid "Settings"
 msgstr ""
 
-#: ../components/SettingsSheet.qml:51
+#: components/SettingsSheet.qml:52
 msgid "Temperature units"
 msgstr ""
 
-#: ../components/SettingsSheet.qml:66
+#: components/SettingsSheet.qml:67
 msgid "Wind speed units"
 msgstr ""
 
-#: ../components/SettingsSheet.qml:81
+#: components/SettingsSheet.qml:82
 msgid "Precipitation units"
 msgstr ""
 
-#: ../components/SplashComponent.qml:33
+#: 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 ""
+
+#: components/TabFooter.qml:120
+msgid "Hourly forecast"
+msgstr ""
+
 #. TRANSLATORS: this refers to the High (max) temperature forecasted for a day
-#: ../components/WeatherTemperatureComponent.qml:102
+#: components/WeatherTemperatureComponent.qml:233
 msgid "H:"
 msgstr ""
 
 #. TRANSLATORS: this refers to the Low (min) temperature forecasted for a day
-#: ../components/WeatherTemperatureComponent.qml:122
+#: components/WeatherTemperatureComponent.qml:253
 msgid "L:"
 msgstr ""
-
-#: ../.build/ubuntu-weather-app.desktop.js:1
-msgid "Weather"
-msgstr ""

=== removed file 'po/po.pro'
--- po/po.pro	2013-09-26 05:44:31 +0000
+++ po/po.pro	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-## This .pro file is used to create a Makefile with the necessary rules
-## to create an initial translations template and to update it whenever
-## there are new translatable strings in the project that are ready to be
-## exposed to translators
-##
-## See the ../README.translations file for more information
-
-TEMPLATE = subdirs
-
-PROJECTNAME = $$system(basename ../*.qmlproject)
-PROJECTNAME = $$replace(PROJECTNAME,.qmlproject,)
-
-DESKTOPFILE = ../$${PROJECTNAME}.desktop
-
-SOURCECODE = ../*.qml \
-             ../components/*.qml \
-             ../components/*.js
-
-BUILDDIR = ../.build
-DESKTOPFILETEMP = $${BUILDDIR}/$${PROJECTNAME}.desktop.js
-
-message("")
-message(" Project Name: $$PROJECTNAME ")
-message(" Source Code: $$SOURCECODE ")
-message("")
-message(" Run 'make pot' to generate the pot file from source code. ")
-message("")
-
-## Generate pot file 'make pot'
-potfile.target = pot
-potfile.commands = xgettext \
-                   -o $${PROJECTNAME}.pot \
-		   --copyright=\"Canonical Ltd. \" \
-		   --package-name $${PROJECTNAME} \
-		   --qt --c++ --add-comments=TRANSLATORS \
-		   --keyword=tr --keyword=tr:1,2 \
-		   $${SOURCECODE} $${DESKTOPFILETEMP}
-potfile.depends = desktopfile
-QMAKE_EXTRA_TARGETS += potfile
-
-## Do not use this rule directly. It's a dependency rule to
-## generate an intermediate .js file to extract translatable
-## strings from the .desktop file
-desktopfile.target = desktopfile
-desktopfile.commands = awk \'BEGIN { FS=\"=\" }; /Name/ {print \"var s = i18n.tr(\42\" \$$2 \"\42);\"}\' $${DESKTOPFILE} > $${DESKTOPFILETEMP}
-desktopfile.depends = makebuilddir
-QMAKE_EXTRA_TARGETS += desktopfile
-
-## Dependency rule to create the temporary build dir
-makebuilddir.target = makebuilddir
-makebuilddir.commands = mkdir -p $${BUILDDIR}
-QMAKE_EXTRA_TARGETS += makebuilddir
-
-## Rule to clean the products of the build
-clean.target = clean
-clean.commands = rm -Rf $${BUILDDIR}
-QMAKE_EXTRA_TARGETS += clean
-