notes-app

Merge lp:~sergiusens/notes-app/app_domain into lp:notes-app

  1. app_domain
  2. Merge into trunk
Proposed by Sergio Schvezov
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 209
Merged at revision: 206
Proposed branch: lp:~sergiusens/notes-app/app_domain
Merge into: lp:notes-app
Diff against target: 148 lines (+17/-17)
8 files modified
CMakeLists.txt (+1/-1)
NotesApp.qml (+1/-1)
debian/notes-app.install (+1/-1)
debian/rules (+1/-1)
notes-app.desktop.in (+1/-1)
po/CMakeLists.txt (+1/-1)
po/com.ubuntu.notes.pot (+10/-10)
tests/autopilot/notes_app/tests/__init__.py (+1/-1)
To merge this branch: bzr merge lp:~sergiusens/notes-app/app_domain
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Olivier Tilloy Approve
David Planella (community) Approve
Review via email: mp+189798@code.launchpad.net

Commit message

Changing applicationName so QtStandardPaths writes to the apparmor confined locations. Making gettext domain follow this change

Description of the change

When built as a click package, the name of pkg name is set to com.ubuntu.notes

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:206
http://jenkins.qa.ubuntu.com/job/notes-app-ci/202/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4761/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2589/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-amd64-ci/97/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-armhf-ci/100/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-i386-ci/97/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/636/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2591/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/notes-app-ci/202/rebuild

review: Needs Fixing (continuous-integration)
lp:~sergiusens/notes-app/app_domain updated
207. By Sergio Schvezov

Fixing debian install for translations

Revision history for this message
Olivier Tilloy (osomon) wrote :

debian/notes-app.install needs updating (s/notes-app.mo/com.ubuntu.notes.mo/)

You also need to re-generate the pot file: in a clean source tree, run the following commands:

    bzr mv po/notes-app.pot po/com.ubuntu.notes.pot
    cmake .
    make com.ubuntu.notes.pot

review: Needs Fixing
Revision history for this message
Olivier Tilloy (osomon) wrote :

In po/CMakeLists.txt, the value passed to --package-name should probably be changed to "com.ubuntu.notes".

lp:~sergiusens/notes-app/app_domain updated
208. By Sergio Schvezov

Regenarating notes pot

209. By Sergio Schvezov

Changing package target

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:206
http://jenkins.qa.ubuntu.com/job/notes-app-ci/204/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4766
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2595/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-amd64-ci/99
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-armhf-ci/102
        deb: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-armhf-ci/102/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-i386-ci/99
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/946
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/641
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/641/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2597
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2597/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/notes-app-ci/204/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:209
http://jenkins.qa.ubuntu.com/job/notes-app-ci/205/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4767
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2596
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-amd64-ci/100
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-armhf-ci/103
        deb: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-armhf-ci/103/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-i386-ci/100
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/947
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/642
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/642/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2598
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2598/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2145
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2158

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/notes-app-ci/205/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
David Planella (dpm) wrote :

This looks good to me, thanks!

The only area of concern that I've got is how Launchpad and other parts of the i18n infrastructure will handle the com.ubuntu.$APPNAME.pot domain/file name. The parts I'm thinking of for example are Launchpad and the (I think it's glib?) patch that loads translations specified in the desktop file as X-Gettext-Domain.

I don't think Launchpad will accept the dots in the name, so on the LP side we might have to manually rename the templates to be com-ubuntu.com-$APPNAME. Which will work, but it might be a bit of a burden to maintain. For now, I'll manually rename the template for the notes app to see how it works.

review: Approve
Revision history for this message
David Planella (dpm) wrote :

Done the changes on https://translations.launchpad.net/notes-app/trunk/+pots/com-ubuntu-notes but I'm not really sure how this will work out.

Revision history for this message
Sergio Schvezov (sergiusens) wrote :

> This looks good to me, thanks!
>
> The only area of concern that I've got is how Launchpad and other parts of the
> i18n infrastructure will handle the com.ubuntu.$APPNAME.pot domain/file name.
> The parts I'm thinking of for example are Launchpad and the (I think it's
> glib?) patch that loads translations specified in the desktop file as X
> -Gettext-Domain.

from the translation point of view, doing

LANGUAGE=es_ES notes-app

with this package just works

> I don't think Launchpad will accept the dots in the name, so on the LP side we
> might have to manually rename the templates to be com-ubuntu.com-$APPNAME.
> Which will work, but it might be a bit of a burden to maintain. For now, I'll
> manually rename the template for the notes app to see how it works.

Ack, I'm not familiar with this part of the infra, so I'll leave it to you.
we can always rename the pot at install time, right?

Revision history for this message
David Planella (dpm) wrote :

45 + $(MAKE) -C obj-$(DEB_HOST_GNU_TYPE) com.ubuntu.notes.pot

5 + $(MAKE) -C obj-$(DEB_HOST_GNU_TYPE) com.ubuntu.notes.pot

66 + --package-name=com.ubuntu.notes

I'm not familiar with CMake, but would it not make sense to put com.ubuntu.notes in a variable name rather than hardcoding it and repeating it multiple times? On autotools with gettext, this is generally defined as the GETTEXT_PACKAGE variable

Revision history for this message
Olivier Tilloy (osomon) wrote :

Looks good to me now.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2013-09-23 18:03:09 +0000
+++ CMakeLists.txt 2013-10-08 10:38:14 +0000
@@ -93,7 +93,7 @@
9393
94# for dh_translations to extract the domain94# for dh_translations to extract the domain
95# (regarding syntax consistency, see http://pad.lv/1181187)95# (regarding syntax consistency, see http://pad.lv/1181187)
96set (GETTEXT_PACKAGE "notes-app")96set (GETTEXT_PACKAGE "com.ubuntu.notes")
9797
98add_subdirectory(po)98add_subdirectory(po)
99add_subdirectory(click)99add_subdirectory(click)
100100
=== modified file 'NotesApp.qml'
--- NotesApp.qml 2013-08-30 07:18:41 +0000
+++ NotesApp.qml 2013-10-08 10:38:14 +0000
@@ -24,7 +24,7 @@
2424
25MainView {25MainView {
26 id: notesMainWindow26 id: notesMainWindow
27 applicationName: "notes-app"27 applicationName: "com.ubuntu.notes"
28 width: units.gu(40)28 width: units.gu(40)
29 height: units.gu(71)29 height: units.gu(71)
30 automaticOrientation: true30 automaticOrientation: true
3131
=== modified file 'debian/notes-app.install'
--- debian/notes-app.install 2013-05-20 11:26:53 +0000
+++ debian/notes-app.install 2013-10-08 10:38:14 +0000
@@ -2,4 +2,4 @@
2usr/lib/*/qt5/qml/NotesApp2usr/lib/*/qt5/qml/NotesApp
3usr/share/applications/notes-app.desktop3usr/share/applications/notes-app.desktop
4usr/share/notes-app4usr/share/notes-app
5usr/share/locale/*/LC_MESSAGES/notes-app.mo5usr/share/locale/*/LC_MESSAGES/com.ubuntu.notes.mo
66
=== modified file 'debian/rules'
--- debian/rules 2013-06-17 15:04:55 +0000
+++ debian/rules 2013-10-08 10:38:14 +0000
@@ -20,4 +20,4 @@
20 # Override dh_translations to work around http://pad.lv/1183262.20 # Override dh_translations to work around http://pad.lv/1183262.
21 # Unfortunately, the default build directory is not exposed21 # Unfortunately, the default build directory is not exposed
22 # (see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=601774).22 # (see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=601774).
23 $(MAKE) -C obj-$(DEB_HOST_GNU_TYPE) notes-app.pot23 $(MAKE) -C obj-$(DEB_HOST_GNU_TYPE) com.ubuntu.notes.pot
2424
=== modified file 'notes-app.desktop.in'
--- notes-app.desktop.in 2013-09-30 15:51:16 +0000
+++ notes-app.desktop.in 2013-10-08 10:38:14 +0000
@@ -9,5 +9,5 @@
9Terminal=false9Terminal=false
10X-Ubuntu-Touch=true10X-Ubuntu-Touch=true
11X-Ubuntu-StageHint=SideStage11X-Ubuntu-StageHint=SideStage
12X-Ubuntu-Gettext-Domain=notes-app12X-Ubuntu-Gettext-Domain=com.ubuntu.notes
13X-Ubuntu-Single-Instance=true13X-Ubuntu-Single-Instance=true
1414
=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt 2013-06-17 15:04:55 +0000
+++ po/CMakeLists.txt 2013-10-08 10:38:14 +0000
@@ -13,7 +13,7 @@
13 --from-code=UTF-813 --from-code=UTF-8
14 --c++ --qt --add-comments=TRANSLATORS14 --c++ --qt --add-comments=TRANSLATORS
15 --keyword=tr --keyword=tr:1,215 --keyword=tr --keyword=tr:1,2
16 --package-name=notes-app16 --package-name=com.ubuntu.notes
17 --copyright-holder='Canonical Ltd.'17 --copyright-holder='Canonical Ltd.'
18 ${I18N_SRC_FILES})18 ${I18N_SRC_FILES})
1919
2020
=== renamed file 'po/notes-app.pot' => 'po/com.ubuntu.notes.pot'
--- po/notes-app.pot 2013-06-17 15:35:29 +0000
+++ po/com.ubuntu.notes.pot 2013-10-08 10:38:14 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: notes-app\n"9"Project-Id-Version: notes-app\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2013-06-17 17:34+0200\n"11"POT-Creation-Date: 2013-10-08 07:29-0300\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,19 +17,19 @@
17"Content-Type: text/plain; charset=CHARSET\n"17"Content-Type: text/plain; charset=CHARSET\n"
18"Content-Transfer-Encoding: 8bit\n"18"Content-Transfer-Encoding: 8bit\n"
1919
20#: Components/ClipboardPopover.qml:4320#: Components/ClipboardPopover.qml:42
21msgid "Select All"21msgid "Select All"
22msgstr ""22msgstr ""
2323
24#: Components/ClipboardPopover.qml:4824#: Components/ClipboardPopover.qml:47
25msgid "Cut"25msgid "Cut"
26msgstr ""26msgstr ""
2727
28#: Components/ClipboardPopover.qml:5328#: Components/ClipboardPopover.qml:52
29msgid "Copy"29msgid "Copy"
30msgstr ""30msgstr ""
3131
32#: Components/ClipboardPopover.qml:5832#: Components/ClipboardPopover.qml:57
33msgid "Paste"33msgid "Paste"
34msgstr ""34msgstr ""
3535
@@ -37,23 +37,23 @@
37msgid "Clear"37msgid "Clear"
38msgstr ""38msgstr ""
3939
40#: NotesApp.qml:39 NotesApp.qml:7540#: NotesApp.qml:34 NotesApp.qml:69
41msgid "Add"41msgid "Add"
42msgstr ""42msgstr ""
4343
44#: NotesApp.qml:4044#: NotesApp.qml:35
45msgid "Create New Note"45msgid "Create New Note"
46msgstr ""46msgstr ""
4747
48#: NotesApp.qml:4448#: NotesApp.qml:39
49msgid "Delete"49msgid "Delete"
50msgstr ""50msgstr ""
5151
52#: NotesApp.qml:4552#: NotesApp.qml:40
53msgid "Trash;Erase Note"53msgid "Trash;Erase Note"
54msgstr ""54msgstr ""
5555
56#: NotesApp.qml:70 notes-app.desktop.in:656#: NotesApp.qml:64 notes-app.desktop.in:6
57msgid "Notes"57msgid "Notes"
58msgstr ""58msgstr ""
5959
6060
=== modified file 'tests/autopilot/notes_app/tests/__init__.py'
--- tests/autopilot/notes_app/tests/__init__.py 2013-10-06 04:33:44 +0000
+++ tests/autopilot/notes_app/tests/__init__.py 2013-10-08 10:38:14 +0000
@@ -185,7 +185,7 @@
185185
186 def _get_db_path(self):186 def _get_db_path(self):
187 db_path_list = [187 db_path_list = [
188 "~/.local/share/notes-app/Databases",188 "~/.local/share/com.ubuntu.notes/Databases",
189 "~/.local/share/Qt Project/QtQmlViewer/QML/OfflineStorage/"189 "~/.local/share/Qt Project/QtQmlViewer/QML/OfflineStorage/"
190 "Databases/"]190 "Databases/"]
191 for path in db_path_list:191 for path in db_path_list:

Subscribers

People subscribed via source and target branches