ubuntu-keyboard

Merge lp:~michael-sheldon/ubuntu-keyboard/fix-pt-br-url-key into lp:ubuntu-keyboard

  1. fix-pt-br-url-key
  2. Merge into trunk
Proposed by Michael Sheldon
Status: Merged
Approved by: Bill Filler
Approved revision: 234
Merged at revision: 234
Proposed branch: lp:~michael-sheldon/ubuntu-keyboard/fix-pt-br-url-key
Merge into: lp:ubuntu-keyboard
Diff against target: 38 lines (+3/-3)
3 files modified
plugins/pt/qml/Keyboard_pt_email.qml (+1/-1)
plugins/pt/qml/Keyboard_pt_url.qml (+1/-1)
plugins/pt/qml/Keyboard_pt_url_search.qml (+1/-1)
To merge this branch: bzr merge lp:~michael-sheldon/ubuntu-keyboard/fix-pt-br-url-key
Reviewer Review Type Date Requested Status
Bill Filler (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+238961@code.launchpad.net

Commit message

Change URL key in Brazilian Portuguese layout to ".com.br"

Description of the change

Change URL key in Brazilian Portuguese layout to ".com.br"

To post a comment you must log in.
Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

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

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

PASSED: Continuous integration, rev:234
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/487/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-amd64-ci/113
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/112
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/112/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-i386-ci/112

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

review: Approve (continuous-integration)
Revision history for this message
Bill Filler (bfiller) wrote :

approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/pt/qml/Keyboard_pt_email.qml'
2--- plugins/pt/qml/Keyboard_pt_email.qml 2014-09-26 13:22:23 +0000
3+++ plugins/pt/qml/Keyboard_pt_email.qml 2014-10-20 20:15:34 +0000
4@@ -86,7 +86,7 @@
5 LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; }
6 CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; height: parent.height; }
7 SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
8- UrlKey { id: urlKey; label: ".br"; extended: [".pt", ".mz", ".ao", ".gw", ".tl"]; anchors.right: dotKey.left; height: parent.height; }
9+ UrlKey { id: urlKey; label: ".com.br"; extended: [".pt", ".mz", ".ao", ".gw", ".tl"]; anchors.right: dotKey.left; height: parent.height; width: panel.keyWidth + units.gu(UI.emailLayoutUrlKeyPadding + 0.5); }
10 CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
11 ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; }
12 }
13
14=== modified file 'plugins/pt/qml/Keyboard_pt_url.qml'
15--- plugins/pt/qml/Keyboard_pt_url.qml 2014-09-26 13:22:23 +0000
16+++ plugins/pt/qml/Keyboard_pt_url.qml 2014-10-20 20:15:34 +0000
17@@ -85,7 +85,7 @@
18 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; height: parent.height; }
19 LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; }
20 CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; }
21- UrlKey { id: urlKey; label: ".br"; extended: [".pt", ".mz", ".ao", ".gw", ".tl"]; anchors.right: dotKey.left; height: parent.height; }
22+ UrlKey { id: urlKey; label: ".com.br"; extended: [".pt", ".mz", ".ao", ".gw", ".tl"]; anchors.right: dotKey.left; height: parent.height; width: panel.keyWidth + units.gu(UI.emailLayoutUrlKeyPadding + 0.5); }
23 CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
24 ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; }
25 }
26
27=== modified file 'plugins/pt/qml/Keyboard_pt_url_search.qml'
28--- plugins/pt/qml/Keyboard_pt_url_search.qml 2014-09-26 13:22:23 +0000
29+++ plugins/pt/qml/Keyboard_pt_url_search.qml 2014-10-20 20:15:34 +0000
30@@ -86,7 +86,7 @@
31 LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; }
32 CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; }
33 SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
34- UrlKey { id: urlKey; label: ".br"; extended: [".pt", ".mz", ".ao", ".gw", ".tl"]; anchors.right: dotKey.left; height: parent.height; }
35+ UrlKey { id: urlKey; label: ".com.br"; extended: [".pt", ".mz", ".ao", ".gw", ".tl"]; anchors.right: dotKey.left; height: parent.height; width: panel.keyWidth + units.gu(UI.emailLayoutUrlKeyPadding + 0.5); }
36 CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
37 ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; }
38 }

Subscribers

People subscribed via source and target branches