Merge lp://qastaging/~dinko-metalac/ubuntu-keyboard/add-bosnian into lp://qastaging/ubuntu-keyboard

Proposed by Dinko Osmankovic
Status: Merged
Merged at revision: 248
Proposed branch: lp://qastaging/~dinko-metalac/ubuntu-keyboard/add-bosnian
Merge into: lp://qastaging/ubuntu-keyboard
Diff against target: 612 lines (+494/-0)
15 files modified
debian/control (+8/-0)
debian/ubuntu-keyboard-bosnian.install (+1/-0)
plugins/bs/bs.pro (+9/-0)
plugins/bs/qml/Keyboard_bs.qml (+92/-0)
plugins/bs/qml/Keyboard_bs_email.qml (+93/-0)
plugins/bs/qml/Keyboard_bs_url.qml (+92/-0)
plugins/bs/qml/Keyboard_bs_url_search.qml (+93/-0)
plugins/bs/qml/qml.pro (+20/-0)
plugins/bs/src/bosnianplugin.h (+25/-0)
plugins/bs/src/bosnianplugin.json (+7/-0)
plugins/bs/src/src.pro (+47/-0)
plugins/plugins.pro (+1/-0)
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://qastaging/~dinko-metalac/ubuntu-keyboard/add-bosnian
Reviewer Review Type Date Requested Status
Michael Sheldon (community) Approve
PS Jenkins bot continuous-integration Approve
Łukasz Zemczak packaging Pending
Review via email: mp+238744@code.qastaging.launchpad.net

Commit message

Adding Bosnian Layout.

Description of the change

Adding Bosnian Layout.

Are there any related MPs required for this MP to build/function as expected? Please list.

 * No

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

 * Yes

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

 * Yes

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?

 * Yes (minus new tests that are dependent on pending landings)

If you changed the UI, was the change specified/approved by design?

 * No change

If you changed UI labels, did you update the pot file?

 * No, to avoid merge conflicts with other layout branches pot file will be updated in another MR.

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

 * Yes

To post a comment you must log in.
Revision history for this message
Dinko Osmankovic (dinko-metalac) wrote :

Can someone check this branch please? I really wish this to go into trunk :)

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

Hi Dinko!

 Thanks very much for helping expanding the keyboard layouts we support, it looks like you've accidentally forgotten to run "bzr add" on all your new files, so they haven't been added to the branch you submitted. Once the branch is updated I'll review again :)

review: Needs Fixing
235. By Dinko Osmankovic <email address hidden>

Adding all the files

Revision history for this message
Dinko Osmankovic (dinko-metalac) wrote :

Hi Michael,

Sorry for that. I've done that now, so the new code is in place.

Cheers

On Fri, Oct 24, 2014 at 4:37 PM, Michael Sheldon <
<email address hidden>> wrote:

> Review: Needs Fixing
>
> Hi Dinko!
>
> Thanks very much for helping expanding the keyboard layouts we support,
> it looks like you've accidentally forgotten to run "bzr add" on all your
> new files, so they haven't been added to the branch you submitted. Once the
> branch is updated I'll review again :)
> --
>
> https://code.launchpad.net/~dinko-metalac/ubuntu-keyboard/add-bosnian/+merge/238744
> You are the owner of lp:~dinko-metalac/ubuntu-keyboard/add-bosnian.
>

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

Looks good overall, there's one slight change needed to let the word engine know about your plugin (for prediction and spellchecking to work fully), you'll just need to add an entry for your plugin to WordEngine::onLanguageChanged in src/lib/logic/wordengine.cpp.

Thanks!

review: Needs Fixing
236. By Dinko Osmankovic <email address hidden>

Added bs to wordengine.cpp

Revision history for this message
Dinko Osmankovic (dinko-metalac) wrote :

Hi,

Did that! Hope everything is ok now.

Cheers

On Fri, Oct 24, 2014 at 5:29 PM, Michael Sheldon <
<email address hidden>> wrote:

> Review: Needs Fixing
>
> Looks good overall, there's one slight change needed to let the word
> engine know about your plugin (for prediction and spellchecking to work
> fully), you'll just need to add an entry for your plugin to
> WordEngine::onLanguageChanged in src/lib/logic/wordengine.cpp.
>
> Thanks!
> --
>
> https://code.launchpad.net/~dinko-metalac/ubuntu-keyboard/add-bosnian/+merge/238744
> You are the owner of lp:~dinko-metalac/ubuntu-keyboard/add-bosnian.
>

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

Couple more things:

In ./plugins/bs/src/bosnianplugin.h it looks like you've missed a couple of class names that were copied over from the Serbian plugin (the class name itself and the constructor name).

Similarly lang_sr.path and lang_sr.files need to be changed to lang_bs.path and lang_bs.files in plugins/bs/qml/qml.pro

It looks like there isn't a hunspell-bs package in the Ubuntu repositories at the moment (nor a myspell or aspell Bosnian dictionary unfortunately), so you'll need to remove that dependency for now.

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

I've added a couple of comments to the diff at the relevant points to clarify the areas that need updating :)

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

Also, it looks like you're missing the "M" key from the URL and email layouts

237. By Dinko Osmankovic <email address hidden>

Fixes as proposed by Michael

Revision history for this message
Dinko Osmankovic (dinko-metalac) wrote :

Ok Michael,

I have a new code in the branch. Is it possible to use myspell-hr for
croatian language since bosnian and croatian are almost the same languages?
Are the changes in debian/control sufficient?

Cheers

On Fri, Oct 24, 2014 at 7:23 PM, Michael Sheldon <
<email address hidden>> wrote:

> Also, it looks like you're missing the "M" key from the URL and email
> layouts
> --
>
> https://code.launchpad.net/~dinko-metalac/ubuntu-keyboard/add-bosnian/+merge/238744
> You are the owner of lp:~dinko-metalac/ubuntu-keyboard/add-bosnian.
>

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

I've had a bit of a think about this and while it's not currently possible to use the Croatian dictionary it might be possible in the future. You can override the setLanguage function and force it to load "hr" data instead of "bs", however because we don't currently have a Croation layout plugin with prediction data this fails for now. Once we add a Croation plugin it should be possible to update the Bosnian plugin to make use of its data.

So for now could you remove the dependence on myspell-hr (since otherwise it'll just be taking up the user's space without doing anything), and we can add it back in the future. Once that's done this branch looks pretty much good to go :)

Revision history for this message
Dinko Osmankovic (dinko-metalac) wrote :

Ok, i will add croatian layout as well since they are the same actually. I
will create a separate branch for croatian.
On 28 Oct 2014 14:40, "Michael Sheldon" <email address hidden>
wrote:

> I've had a bit of a think about this and while it's not currently possible
> to use the Croatian dictionary it might be possible in the future. You can
> override the setLanguage function and force it to load "hr" data instead of
> "bs", however because we don't currently have a Croation layout plugin with
> prediction data this fails for now. Once we add a Croation plugin it should
> be possible to update the Bosnian plugin to make use of its data.
>
> So for now could you remove the dependence on myspell-hr (since otherwise
> it'll just be taking up the user's space without doing anything), and we
> can add it back in the future. Once that's done this branch looks pretty
> much good to go :)
> --
>
> https://code.launchpad.net/~dinko-metalac/ubuntu-keyboard/add-bosnian/+merge/238744
> You are the owner of lp:~dinko-metalac/ubuntu-keyboard/add-bosnian.
>

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

Awesome, thanks!

238. By Dinko Osmankovic <email address hidden>

Removed myspell-hr dependency

239. By Dinko Osmankovic <email address hidden>

Updated bosnian database

240. By Dinko Osmankovic <email address hidden>

Updated bosnian database

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

Could you leave the Bosnian database empty in this MR? Unfortunately the predictions aren't usable without a corresponding dictionary database so it'll just be taking up space on the device. Once this and the Croatian layout have landed I'll submit an additional MR to get this using the Croatian spelling and prediction databases (they have to be used together) as a temporary measure until we can find a Bosnian dictionary and get it packaged.

241. By Dinko Osmankovic <email address hidden>

reverted to 238

Revision history for this message
Dinko Osmankovic (dinko-metalac) wrote :

Did so.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
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 (completed on submitter's behalf)

review: Approve

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