Merge lp:~danielholm/ubuntu-keyboard/ubuntu-keyboard into lp:ubuntu-keyboard

[Daniel Holm]

Set the correct order of the "Ö" and "Ä" characters in the Swedish layout

Resolve bug 1395402 - The letter "Ö" and "Ä" are in the wrong order in the Swedish keyboard 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

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 change

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

 * No change

[Michael Sheldon (michael-sheldon)]

That's great, thanks. One small issue, could you move the "rightSide: true" property to the "ä" key, since that's now the furthest right key (this then gives it an extended touch area to the edge of the keyboard).

Thanks!

review: Needs Fixing

[lp:~danielholm/ubuntu-keyboard/ubuntu-keyboard]

254. By Daniel Holm on 2014-11-24

Moved rightSide: true; to Ä instead of ö

[Daniel Holm (danielholm)]

Like so? :)
Thank you!

[Michael Sheldon (michael-sheldon)]

Perfect, thanks! I'll run that through our tests quickly and then we can see about getting it merged :)

[Michael Sheldon (michael-sheldon)]

Couple more changes needed, there's the same issue on the email and url layouts: Keyboard_sv_email.qml, Keyboard_sv_url.qml and Keyboard_sv_url_search.qml

If you could apply the same fix there we should then be good to go :)

review: Needs Fixing

[lp:~danielholm/ubuntu-keyboard/ubuntu-keyboard]

255. By Daniel Holm on 2014-11-26

Switched place of Ä and Ö in the email, url and search as well.

[Daniel Holm (danielholm)]

Why I did not done that already, I don't know. But it's done now. Sorry.

[Michael Sheldon (michael-sheldon)]

Great, thanks very much; I'll re-test tomorrow and then we should be able to include it in our next batch of merges :)

=== modified file 'plugins/sv/qml/Keyboard_sv.qml'
--- plugins/sv/qml/Keyboard_sv.qml	2014-09-26 13:22:23 +0000
+++ plugins/sv/qml/Keyboard_sv.qml	2014-11-26 17:34:39 +0000
@@ -59,8 +59,8 @@
             CharKey { label: "j"; shifted: "J"; }
             CharKey { label: "k"; shifted: "K"; }
             CharKey { label: "l"; shifted: "L"; }
-            CharKey { label: "ä"; shifted: "Ä"; extended: ["æ"]; extendedShifted: ["Æ"] }
-            CharKey { label: "ö"; shifted: "Ö"; extended: ["ø"]; extendedShifted: ["Ø"]; rightSide: true; }
+            CharKey { label: "ö"; shifted: "Ö"; extended: ["ø"]; extendedShifted: ["Ø"]}
+            CharKey { label: "ä"; shifted: "Ä"; extended: ["æ"]; extendedShifted: ["Æ"]; rightSide: true; }
         }
 
         Row {

=== modified file 'plugins/sv/qml/Keyboard_sv_email.qml'
--- plugins/sv/qml/Keyboard_sv_email.qml	2014-09-26 13:22:23 +0000
+++ plugins/sv/qml/Keyboard_sv_email.qml	2014-11-26 17:34:39 +0000
@@ -59,8 +59,8 @@
             CharKey { label: "j"; shifted: "J"; }
             CharKey { label: "k"; shifted: "K"; }
             CharKey { label: "l"; shifted: "L"; }
-            CharKey { label: "ä"; shifted: "Ä"; extended: ["æ"]; extendedShifted: ["Æ"] }
-            CharKey { label: "ö"; shifted: "Ö"; extended: ["ø"]; extendedShifted: ["Ø"]; rightSide: true; }
+            CharKey { label: "ö"; shifted: "Ö"; extended: ["ø"]; extendedShifted: ["Ø"] }
+            CharKey { label: "ä"; shifted: "Ä"; extended: ["æ"]; extendedShifted: ["Æ"]; rightSide: true; }
         }
 
         Row {

=== modified file 'plugins/sv/qml/Keyboard_sv_url.qml'
--- plugins/sv/qml/Keyboard_sv_url.qml	2014-09-26 13:22:23 +0000
+++ plugins/sv/qml/Keyboard_sv_url.qml	2014-11-26 17:34:39 +0000
@@ -59,8 +59,8 @@
             CharKey { label: "j"; shifted: "J"; }
             CharKey { label: "k"; shifted: "K"; }
             CharKey { label: "l"; shifted: "L"; }
-            CharKey { label: "ä"; shifted: "Ä"; extended: ["æ"]; extendedShifted: ["Æ"] }
-            CharKey { label: "ö"; shifted: "Ö"; extended: ["ø"]; extendedShifted: ["Ø"]; rightSide: true; }
+            CharKey { label: "ö"; shifted: "Ö"; extended: ["ø"]; extendedShifted: ["Ø"] }
+            CharKey { label: "ä"; shifted: "Ä"; extended: ["æ"]; extendedShifted: ["Æ"]; rightSide: true; }            
         }
 
         Row {

=== modified file 'plugins/sv/qml/Keyboard_sv_url_search.qml'
--- plugins/sv/qml/Keyboard_sv_url_search.qml	2014-09-26 13:22:23 +0000
+++ plugins/sv/qml/Keyboard_sv_url_search.qml	2014-11-26 17:34:39 +0000
@@ -59,8 +59,8 @@
             CharKey { label: "j"; shifted: "J"; }
             CharKey { label: "k"; shifted: "K"; }
             CharKey { label: "l"; shifted: "L"; }
-            CharKey { label: "ä"; shifted: "Ä"; extended: ["æ"]; extendedShifted: ["Æ"] }
-            CharKey { label: "ö"; shifted: "Ö";  extended: ["ø"]; extendedShifted: ["Ø"]; rightSide: true; }
+            CharKey { label: "ö"; shifted: "Ö";  extended: ["ø"]; extendedShifted: ["Ø"] }
+            CharKey { label: "ä"; shifted: "Ä"; extended: ["æ"]; extendedShifted: ["Æ"]; rightSide: true; }
         }
 
         Row {