Merge lp:~dpm/ubuntu-calendar-app/rename into lp:ubuntu-calendar-app

[David Planella]

Rename the project and add a build rule to generate and install compiled translations.

This merge proposal updates the qmake rule for creating the translation template (.pot file) and include translations from the .desktop file.

At the same time, it renames the project to calendar-app to follow the same naming convention as the system apps such as camera-app. The reason it's been done here is because parts of the project were already renamed, so I decided to go ahead and rename the rest to make the qmake rule for .desktop file translations work.

[lp:~dpm/ubuntu-calendar-app/rename]

38. By David Planella on 2013-06-12

Merged from trunk, renamed autopilot tests to follow the same calendar-app naming convention

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

PASSED: Continuous integration, rev:37
http://91.189.93.125:8080/job/ubuntu-calendar-app-ci/21/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-calendar-app-quantal-amd64-ci/6
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-calendar-app-raring-amd64-ci/21

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/ubuntu-calendar-app-ci/21/rebuild

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:38
http://91.189.93.125:8080/job/ubuntu-calendar-app-ci/22/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-calendar-app-quantal-amd64-ci/7
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-calendar-app-raring-amd64-ci/22

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/ubuntu-calendar-app-ci/22/rebuild

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

I’d rather have two separate merge requests: those changes are unrelated one with the other. Could you split this MR into two, one for the renaming, and one for the translations?

[Olivier Tilloy (osomon)]

You might want to pass the -D flag to xgettext to ensure the paths in the pot file are relative to the root of the source tree.

[Olivier Tilloy (osomon)]

So if I understand your code correctly, you’re injecting the "i18n.tr()" calls into a temporary copy of the desktop file. To mimick closer what we’re doing for the core apps using cmake, what about doing the reverse, i.e. having the calls to i18n.tr() already in a desktop.in file, and generating the desktop file from there by removing the calls to i18n.tr()? This would make for a more flexible solution, if in the future we need to translate more strings in the desktop file.

[David Planella (dpm)]

Al 12/06/13 18:36, En/na Olivier Tilloy ha escrit:
> I’d rather have two separate merge requests: those changes are unrelated one with the other. Could you split this MR into two, one for the renaming, and one for the translations?
I would have preferred to do it this way as well, but the fact that the
calendar app is already a bit different in terms of naming conventions
than the rest of the apps made it more difficult.

To give some background, we're intending to rename all community core
apps to $APPNAME-app at some point, to bring them inline with the naming
convention of the apps you guys are developing. That means we'll be
dropping the 'ubuntu-' prefix from the apps.

While we haven't started doing this, it seems that the calendar app has
already some files where the 'ubuntu-' prefix was dropped, which brings
some inconsistency and makes the po/po.pro rules fail (e.g. it is
expected that the .desktop file is named the same as the project file)

I see LP lets specify a branch for a MP as being dependent from another.
I'll see if I can separate them.

[David Planella (dpm)]

Al 12/06/13 18:43, En/na Olivier Tilloy ha escrit:
> You might want to pass the -D flag to xgettext to ensure the paths in the pot file are relative to the root of the source tree.
The current practice in gettext-based apps is to have the paths in the
.pot file be relative to the po/ folder instead of the root of the
source tree. I'd prefer sticking to that, which is what translators are
used to.

[David Planella (dpm)]

Al 12/06/13 18:49, En/na Olivier Tilloy ha escrit:
> So if I understand your code correctly, you’re injecting the "i18n.tr()" calls into a temporary copy of the desktop file.
Yeah, more or less. I'm extracting the translatable strings from the
.desktop file and putting them into a temporary .js file, which I then
feed to xgettext. I'm essentially mimicking the behaviour of intltool
when dealing with .desktop files: it extracts the strings, puts them in
a temporary .h file and then adds this file to the list of files for
xgettext to process.

The only difference is that I've made this temp file a valid .js file
instead of a C .h file.

> To mimick closer what we’re doing for the core apps using cmake, what about doing the reverse, i.e. having the calls to i18n.tr() already in a desktop.in file, and generating the desktop file from there by removing the calls to i18n.tr()? This would make for a more flexible solution, if in the future we need to translate more strings in the desktop file.
The difference in the community core apps is that essentially we're not
using a build system. I've simply added a .pro file so that we can
execute qmake to update the .pot file, but the rest of the files don't
need any build step.

If I modify the .desktop file to include i18n.tr() calls, I'll be adding
a step whereby before running any of the apps, they will need to be
built to generate the .desktop file from the .desktop.in file. Which
will probably need to have another .pro file at the top of the source tree.

I wanted to make the change as unintrusive as possible, and keep the
.desktop file untouched. In this way:

- Apps are run as before and don't need a build step
- To update the .pot file one can just run 'qmake && make pot' from the
po/ folder

At some point, we'll probably need to standardize on the same build
system across all apps, which I guess will be CMake. At that point,
we'll also be standardizing on the way we extract .desktop translations,
and the qmake rules will need to be changed in any way. But we're not
there yet, and to me (for the qmake-based apps), .desktop file
generation would bring drawbacks at this point.

I hope that makes sense.

[lp:~dpm/ubuntu-calendar-app/rename]

39. By David Planella on 2013-06-12

Reverted .desktop file translation changes, to be submitted in a separate branch

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

PASSED: Continuous integration, rev:39
http://91.189.93.125:8080/job/ubuntu-calendar-app-ci/23/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-calendar-app-quantal-amd64-ci/8
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-calendar-app-raring-amd64-ci/23

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/ubuntu-calendar-app-ci/23/rebuild

review: Approve (continuous-integration)

[David Planella (dpm)]

Updated the merge request to be separated in two as requested:

- MP for the renaming: this one
- MP for .desktop file support: https://code.launchpad.net/~dpm/ubuntu-calendar-app/desktop-file-i18n/+merge/169029

[Olivier Tilloy (osomon)]

> Al 12/06/13 18:43, En/na Olivier Tilloy ha escrit:
> > You might want to pass the -D flag to xgettext to ensure the paths in the
> pot file are relative to the root of the source tree.
> The current practice in gettext-based apps is to have the paths in the
> .pot file be relative to the po/ folder instead of the root of the
> source tree. I'd prefer sticking to that, which is what translators are
> used to.

Ok, that makes sense. I wasn’t aware of this practice. Thanks for explaining.

[Olivier Tilloy (osomon)]

> Al 12/06/13 18:49, En/na Olivier Tilloy ha escrit:
> > So if I understand your code correctly, you’re injecting the "i18n.tr()"
> calls into a temporary copy of the desktop file.
> Yeah, more or less. I'm extracting the translatable strings from the
> .desktop file and putting them into a temporary .js file, which I then
> feed to xgettext. I'm essentially mimicking the behaviour of intltool
> when dealing with .desktop files: it extracts the strings, puts them in
> a temporary .h file and then adds this file to the list of files for
> xgettext to process.
>
> The only difference is that I've made this temp file a valid .js file
> instead of a C .h file.
>
> > To mimick closer what we’re doing for the core apps using cmake, what about
> doing the reverse, i.e. having the calls to i18n.tr() already in a desktop.in
> file, and generating the desktop file from there by removing the calls to
> i18n.tr()? This would make for a more flexible solution, if in the future we
> need to translate more strings in the desktop file.
> The difference in the community core apps is that essentially we're not
> using a build system. I've simply added a .pro file so that we can
> execute qmake to update the .pot file, but the rest of the files don't
> need any build step.
>
> If I modify the .desktop file to include i18n.tr() calls, I'll be adding
> a step whereby before running any of the apps, they will need to be
> built to generate the .desktop file from the .desktop.in file. Which
> will probably need to have another .pro file at the top of the source tree.
>
> I wanted to make the change as unintrusive as possible, and keep the
> .desktop file untouched. In this way:
>
> - Apps are run as before and don't need a build step
> - To update the .pot file one can just run 'qmake && make pot' from the
> po/ folder
>
> At some point, we'll probably need to standardize on the same build
> system across all apps, which I guess will be CMake. At that point,
> we'll also be standardizing on the way we extract .desktop translations,
> and the qmake rules will need to be changed in any way. But we're not
> there yet, and to me (for the qmake-based apps), .desktop file
> generation would bring drawbacks at this point.
>
> I hope that makes sense.

That makes complete sense, thanks for the detailed explanation. If this is the way intltool does it, then it’s definitely the way to go. And not requiring any additional step for running the app is a must-have too.

[Olivier Tilloy (osomon)]

Project-Id-Version in po/calendar-app.pot needs to be updated too.

review: Needs Fixing

[Olivier Tilloy (osomon)]

72 +ubuntu-calendar-app (0.3) raring; urgency=low
73 +
74 + * Updated packaging to install translations
75 +
76 + -- David Planella <email address hidden> Tue, 28 May 2013 13:53:10 +0200

Is this changelog entry really meant to be added?

[Olivier Tilloy (osomon)]

> 72 +ubuntu-calendar-app (0.3) raring; urgency=low
> 73 +
> 74 + * Updated packaging to install translations
> 75 +
> 76 + -- David Planella <email address hidden> Tue, 28 May 2013
> 13:53:10 +0200
>
> Is this changelog entry really meant to be added?

Ah, ok, just saw that you’re adding the rules to generate and install the mo files. I think the two changelog entries could be merged into one.

[lp:~dpm/ubuntu-calendar-app/rename]

40. By David Planella on 2013-06-17

Added required packaging changes for the rename

41. By David Planella on 2013-06-17

Merged from previous packaging translation changes branch

42. By David Planella on 2013-06-17

Merged from trunk

43. By David Planella on 2013-06-17

Found out a better way to replace a package

Unmerged revisions

=== renamed file 'ubuntu-calendar-app' => 'calendar-app'
--- ubuntu-calendar-app	2013-02-12 16:27:52 +0000
+++ calendar-app	2013-06-12 18:16:24 +0000
@@ -1,2 +1,2 @@
 #!/bin/bash
-qmlscene /usr/share/ubuntu-calendar-app/calendar.qml
+qmlscene /usr/share/calendar-app/calendar.qml

=== renamed file 'ubuntu-calendar-app.desktop' => 'calendar-app.desktop'
--- ubuntu-calendar-app.desktop	2013-05-15 09:23:44 +0000
+++ calendar-app.desktop	2013-06-12 18:16:24 +0000
@@ -3,9 +3,9 @@
 Version=1.0
 Type=Application
 Terminal=false
-Exec=qmlscene /usr/share/ubuntu-calendar-app/calendar.qml
-Icon=/usr/share/ubuntu-calendar-app/calendar64.png
+Exec=qmlscene /usr/share/calendar-app/calendar.qml
+Icon=/usr/share/calendar-app/calendar64.png
 Name=Calendar
 X-Ubuntu-Touch=true
 X-Ubuntu-StageHint=SideStage
-X-Ubuntu-Gettext-Domain=ubuntu-calendar-app
+X-Ubuntu-Gettext-Domain=calendar-app

=== renamed file 'calendar.qmlproject' => 'calendar-app.qmlproject'
=== modified file 'calendar.qml'
--- calendar.qml	2013-06-10 11:00:05 +0000
+++ calendar.qml	2013-06-12 18:16:24 +0000
@@ -6,7 +6,7 @@
     id: mainView
 
     objectName: "calendar"
-    applicationName: "ubuntu-calendar-app"
+    applicationName: "calendar-app"
 
     width: units.gu(45)
     height: units.gu(80)

=== renamed file 'debian/ubuntu-calendar-app-autopilot.install' => 'debian/calendar-app-autopilot.install'
--- debian/ubuntu-calendar-app-autopilot.install	2013-05-27 15:12:42 +0000
+++ debian/calendar-app-autopilot.install	2013-06-12 18:16:24 +0000
@@ -1,1 +1,1 @@
-tests/autopilot/ubuntu_calendar_app/* usr/lib/python2.7/dist-packages/ubuntu_calendar_app/
+tests/autopilot/calendar_app/* usr/lib/python2.7/dist-packages/calendar_app/

=== renamed file 'debian/ubuntu-calendar-app.install' => 'debian/calendar-app.install'
--- debian/ubuntu-calendar-app.install	2013-04-11 19:47:11 +0000
+++ debian/calendar-app.install	2013-06-12 18:16:24 +0000
@@ -1,5 +1,5 @@
-ubuntu-calendar-app usr/bin/
-ubuntu-calendar-app.desktop usr/share/applications/
-*.qml usr/share/ubuntu-calendar-app/
-*.png usr/share/ubuntu-calendar-app/
-*.js usr/share/ubuntu-calendar-app/
+calendar-app usr/bin/
+calendar-app.desktop usr/share/applications/
+*.qml usr/share/calendar-app/
+*.png usr/share/calendar-app/
+*.js usr/share/calendar-app/

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-04 21:27:58 +0000
+++ debian/changelog	2013-06-12 18:16:24 +0000
@@ -1,3 +1,15 @@
+calendar-app (0.4) raring; urgency=low
+
+  * Renamed package
+
+ -- David Planella <[e-mail]>  Wed, 12 Jun 2013 17:25:52 +0200
+
+ubuntu-calendar-app (0.3) raring; urgency=low
+
+  * Updated packaging to install translations
+
+ -- David Planella <[e-mail]>  Tue, 28 May 2013 13:53:10 +0200
+
 ubuntu-calendar-app (0.2) raring; urgency=low
 
   * Changing the app name so it can be closed by the hud (LP: #1164130).

=== modified file 'debian/control'
--- debian/control	2013-05-27 15:12:42 +0000
+++ debian/control	2013-06-12 18:16:24 +0000
@@ -1,4 +1,4 @@
-Source: ubuntu-calendar-app
+Source: calendar-app
 Priority: extra
 Maintainer: Ubuntu App Cats <[e-mail]>
 Build-Depends: debhelper (>= 9), 
@@ -7,7 +7,7 @@
 Homepage: https://launchpad.net/ubuntu-calendar-app
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-calendar-dev/ubuntu-calendar-app/trunk
 
-Package: ubuntu-calendar-app
+Package: calendar-app
 Architecture: all
 Depends: ${misc:Depends},
          qmlscene,
@@ -23,11 +23,11 @@
  a diary, a planner, a journal, a life log; and the calendar will behave how
  you need it to.
 
-Package: ubuntu-calendar-app-autopilot
+Package: calendar-app-autopilot
 Architecture: all
 Depends: libautopilot-qt,
          libqt5test5,
-         ubuntu-calendar-app (= ${source:Version}),
+         calendar-app (= ${source:Version}),
 Description: Autopilot tests for Ubuntu Calendar Application
  This package contains autopilot tests for the Ubuntu Calendar application.
 

=== modified file 'debian/copyright'
--- debian/copyright	2013-04-11 19:47:11 +0000
+++ debian/copyright	2013-06-12 18:16:24 +0000
@@ -1,5 +1,5 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: ubuntu-calendar-app
+Upstream-Name: calendar-app
 Source: https://launchpad.net/ubuntu-calendar-app
 
 Files: *

=== modified file 'debian/rules'
--- debian/rules	2013-04-11 19:47:11 +0000
+++ debian/rules	2013-06-12 18:16:24 +0000
@@ -9,3 +9,12 @@
 
 override_dh_install:
 	dh_install --fail-missing
+	appname=calendar-app; \
+	for pofile in $(shell find ./po -name "*.po"); do \
+		pofilename="$${pofile##*/}"; \
+		langcode="$${pofilename%.*}"; \
+		localedir="debian/$$appname/usr/share/locale/$$langcode/LC_MESSAGES"; \
+		mkdir -p $$localedir; \
+		mofile="$$localedir/$$appname.mo"; \
+		msgfmt -o $$mofile $$pofile; \
+	done

=== renamed file 'po/ubuntu-calendar-app.pot' => 'po/calendar-app.pot'
=== renamed directory 'tests/autopilot/ubuntu_calendar_app' => 'tests/autopilot/calendar_app'
=== modified file 'tests/autopilot/calendar_app/tests/__init__.py'
--- tests/autopilot/ubuntu_calendar_app/tests/__init__.py	2013-05-29 15:38:29 +0000
+++ tests/autopilot/calendar_app/tests/__init__.py	2013-06-12 18:16:24 +0000
@@ -15,7 +15,7 @@
 from autopilot.testcase import AutopilotTestCase
 from testtools.matchers import Equals
 
-from ubuntu_calendar_app.emulators.main_window import MainWindow
+from calendar_app.emulators.main_window import MainWindow
 
 
 class CalendarTestCase(AutopilotTestCase):
@@ -48,8 +48,8 @@
     def launch_test_installed(self):
         self.app = self.launch_test_application(
             "qmlscene",
-            "/usr/share/ubuntu-calendar-app/calendar.qml",
-            "--desktop_file_hint=/usr/share/applications/ubuntu-calendar-app.desktop",
+            "/usr/share/calendar-app/calendar.qml",
+            "--desktop_file_hint=/usr/share/applications/calendar-app.desktop",
             app_type='qt')
 
     def reveal_toolbar(self):

=== modified file 'tests/autopilot/calendar_app/tests/test_calendar.py'
--- tests/autopilot/ubuntu_calendar_app/tests/test_calendar.py	2013-05-29 16:38:15 +0000
+++ tests/autopilot/calendar_app/tests/test_calendar.py	2013-06-12 18:16:24 +0000
@@ -12,7 +12,7 @@
 from autopilot.matchers import Eventually
 from testtools.matchers import Equals
 
-from ubuntu_calendar_app.tests import CalendarTestCase
+from calendar_app.tests import CalendarTestCase
 
 
 class TestMainWindow(CalendarTestCase):