Merge lp://staging/~gang65/ubuntu-keyboard/ubuntu-keyboard-polish-keyboard-fix into lp://staging/ubuntu-keyboard

Proposed by Bartosz Kosiorek
Status: Needs review
Proposed branch: lp://staging/~gang65/ubuntu-keyboard/ubuntu-keyboard-polish-keyboard-fix
Merge into: lp://staging/ubuntu-keyboard
Diff against target: 284 lines (+70/-80)
5 files modified
debian/changelog (+6/-0)
plugins/pl/qml/Keyboard_pl.qml (+16/-20)
plugins/pl/qml/Keyboard_pl_email.qml (+16/-20)
plugins/pl/qml/Keyboard_pl_url.qml (+16/-20)
plugins/pl/qml/Keyboard_pl_url_search.qml (+16/-20)
To merge this branch: bzr merge lp://staging/~gang65/ubuntu-keyboard/ubuntu-keyboard-polish-keyboard-fix
Reviewer Review Type Date Requested Status
Bartosz Kosiorek (community) Needs Information
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+264763@code.staging.launchpad.net

Commit message

Limit number of keys for Polish Keyboard to only existed in Polish language (LP: #1468799)

Description of the change

Limit number of keys for Polish Keyboard to only existed in Polish language (LP: #1468799)

To post a comment you must log in.
392. By Bartosz Kosiorek

Adding right side

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

Sync with trunk

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

What I should do with this error:

ubuntuapplicationapiwrapper.o ubuntuapplicationapiwrapper.cpp
ubuntuapplicationapiwrapper.cpp:23:49: fatal error: ubuntu/ui/ubuntu_ui_session_service.h: No such file or directory
 #include <ubuntu/ui/ubuntu_ui_session_service.h>
                                                 ^
compilation terminated.

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

Hi Bartosz,

 Don't worry about that error, it was due to a change in the platform API which broke compatibility with the keyboard, we have a separate branch that fixes that now (https://code.launchpad.net/~michael-sheldon/ubuntu-keyboard/fix-build-against-new-libplatform). We're actually also in the process of changing the layout format to simpler and easier to maintain JSON layouts, so rather than merge this branch directly I'll make the equivalent changes to our Polish JSON layout.

Thanks!
 Mike.

Unmerged revisions

393. By Bartosz Kosiorek

Sync with trunk

392. By Bartosz Kosiorek

Adding right side

391. By Bartosz Kosiorek

Small fix

390. By Bartosz Kosiorek

Update changelog (LP: #1468799)

389. By Bartosz Kosiorek

Limit number of keys for Polish Keyboard to only existed in Polish language (LP: #1468799)

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