ubuntu-keyboard

Merge lp://staging/~dpm/ubuntu-keyboard/add-catalan into lp://staging/ubuntu-keyboard

  1. add-catalan
  2. Merge into trunk
Proposed by David Planella
Status: Merged
Approved by: Michael Sheldon
Approved revision: 238
Merged at revision: 248
Proposed branch: lp://staging/~dpm/ubuntu-keyboard/add-catalan
Merge into: lp://staging/ubuntu-keyboard
Diff against target: 6826 lines (+6598/-21)
18 files modified
debian/control (+9/-0)
debian/server.conf (+1/-0)
debian/ubuntu-keyboard-catalan.install (+1/-0)
plugins/ca/ca.pro (+9/-0)
plugins/ca/qml/Keyboard_ca.qml (+93/-0)
plugins/ca/qml/Keyboard_ca_email.qml (+94/-0)
plugins/ca/qml/Keyboard_ca_url.qml (+93/-0)
plugins/ca/qml/Keyboard_ca_url_search.qml (+94/-0)
plugins/ca/qml/qml.pro (+20/-0)
plugins/ca/src/catalanplugin.h (+25/-0)
plugins/ca/src/catalanplugin.json (+7/-0)
plugins/ca/src/paulina_buxareu.txt (+6073/-0)
plugins/ca/src/src.pro (+47/-0)
plugins/plugins.pro (+1/-0)
po/ubuntu-keyboard.pot (+25/-21)
qml/KeyboardContainer.qml (+3/-0)
qml/keys/LanguageMenu.qml (+1/-0)
src/lib/logic/wordengine.cpp (+2/-0)
To merge this branch: bzr merge lp://staging/~dpm/ubuntu-keyboard/add-catalan
Reviewer Review Type Date Requested Status
Łukasz Zemczak (community) packaging Approve
Michael Sheldon (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+238368@code.staging.launchpad.net

Commit message

Add Catalan keyboard + predictive text database.

Description of the change

Add Catalan keyboard + predictive text database.

Q. Are there any related MPs required for this MP to build/function as expected? Please list.
A. No, but this requires a sync of the myspell-ca package from utopic to ubuntu-rtm/14.09 for spellchecking to work.

Q. Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
A. Yes.

Q. Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
A. Yes, I built the package, installed it and tested it on a device (mako) on the ubuntu-rtm/devel-proposed channel

Q. Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/ubuntu-keyboard) on device or emulator?
A. Yes.

Q. If you changed the UI, was the change specified/approved by design?
A. No UI changes, just the addition of a new layout.

Q. If you changed UI labels, did you update the pot file?
A. No UI label changes.

Q.If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
A. TBD

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

PASSED: Continuous integration, rev:235
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/480/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-amd64-ci/106
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/105
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/105/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-i386-ci/105

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/480/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Overall looks good, but could you add entries for Catalan in the languageIdToName function in qml/keys/LanguageMenu.qml and in the freeTextLanguageKeyboard and languageIsSupported functions in qml/KeyboardContainer.qml (these should really be redesigned to avoid the need for that, but that's currently fairly low on the priority list I'm afraid).

If you could also add the submission checklist from here: https://wiki.ubuntu.com/Process/Merges/Checklists/system-apps that'd help speed along acceptance as well.

Thanks!

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

Oh, I see, I was wondering why the keyboard wasn't actually working for me, that was why. It now works on my device, thanks!

Regarging fixing the need to modify languageIdToName & Co., the fix to languageIdToName() should be quite easy using Qt.locale(code).nativeLanguageName, the other ones, not so much.

Let me update the MP with the requested submission checklist when I get back home.

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

PASSED: Continuous integration, rev:236
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/483/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-amd64-ci/109
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/108
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/108/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-i386-ci/108

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/483/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Looks good, one last small thing since i18n.tr("Catalan") is a new translatable string could you update the POT file by running "qmake && make pot" in the po directory.

Thanks for the pointer on "Qt.locale(code).nativeLanguageName", will keep that in mind when we refactor that stuff.

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

Ok, updated the .pot file, thanks for the heads up.

I'm not sure how the release workflow of ubuntu-keyboard is, but I'll mention again the comment on "this requires a sync of the myspell-ca package from utopic to ubuntu-rtm/14.09 for spellchecking to work." I.e. before the ubuntu-keyboard-catalan package is uploaded, it will require having myspell-ca available on the RTM archive.

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

FAILED: Continuous integration, rev:237
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/484/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-amd64-ci/110
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/109/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-i386-ci/109

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/484/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Sorry! Looks like there was one further entry I forgot to mention, you'll need to add an entry to WordEngine::onLanguageChanged in src/lib/logic/wordengine.cpp as well.

Redesigning this is rapidly going up my priority list the more layout plugin MRs I review ;)

I've made a note to double check that myspell-ca is added to RTM before we land this one.

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

Ok, pushed that change. I also had requested a sync of myspell-ca to rtm, and that has been done now. So this branch should be ready to go.

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

PASSED: Continuous integration, rev:238
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/490/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-amd64-ci/116
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/115
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/115/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-i386-ci/115

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/490/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?

 * Yes

Did CI run pass? If not, please explain why.

 * Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?

 * Yes

review: Approve
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

+1 on the packaging

review: Approve (packaging)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches