Merge lp:~michael-sheldon/ubuntu-keyboard/fix-1669440 into lp:ubuntu-keyboard

Proposed by Michael Sheldon on 2017-04-11
Status: Approved
Approved by: Andrew Hayzen on 2017-04-12
Approved revision: 549
Proposed branch: lp:~michael-sheldon/ubuntu-keyboard/fix-1669440
Merge into: lp:ubuntu-keyboard
Diff against target: 10 lines (+1/-0)
1 file modified
qml/KeyboardContainer.qml (+1/-0)
To merge this branch: bzr merge lp:~michael-sheldon/ubuntu-keyboard/fix-1669440
Reviewer Review Type Date Requested Status
Andrew Hayzen (community) 2017-04-11 Approve on 2017-04-12
Review via email: mp+322361@code.launchpad.net

Commit message

Fix fallback to English when the selected plugin is no longer available

Description of the change

Fix fallback to English when the selected plugin is no longer available

To post a comment you must log in.
Andrew Hayzen (ahayzen) wrote :

LGTM, this fixes the issue by falling back to English.

Only minor thing is that the other language still appears when you press'n'hold the keyboard selector thing, and you can click on it but nothing happens. I wonder if either it shouldn't be shown or an error message should appear? But this can be done in another branch as this branch fixes the issue of the keyboard becoming unusable.

review: Approve

Unmerged revisions

549. By Michael Sheldon on 2017-04-11

Fix fallback to English when the selected plugin is no longer available

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/KeyboardContainer.qml'
2--- qml/KeyboardContainer.qml 2017-02-13 14:31:20 +0000
3+++ qml/KeyboardContainer.qml 2017-04-11 12:57:03 +0000
4@@ -128,6 +128,7 @@
5
6 if (!maliit_input_method.languageIsSupported(language)) {
7 console.log("Language '" + language + "' not supported - using 'en' instead");
8+ maliit_input_method.activeLanguage = "en";
9 language = "en";
10 }
11

Subscribers

People subscribed via source and target branches