ubuntu-keyboard

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

  1. ubuntu-keyboard
  2. Merge into trunk
Proposed by Roman Zonov
Status: Merged
Merged at revision: 187
Proposed branch: lp:~roman2861/ubuntu-keyboard/ubuntu-keyboard
Merge into: lp:ubuntu-keyboard
Diff against target: 200 lines (+22/-26)
4 files modified
plugins/ru/qml/Keyboard_ru.qml (+6/-7)
plugins/ru/qml/Keyboard_ru_email.qml (+6/-7)
plugins/ru/qml/Keyboard_ru_url.qml (+5/-6)
plugins/ru/qml/Keyboard_ru_url_search.qml (+5/-6)
To merge this branch: bzr merge lp:~roman2861/ubuntu-keyboard/ubuntu-keyboard
Reviewer Review Type Date Requested Status
Dmitry (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+221590@code.launchpad.net

Commit message

Fix incorrect characters in Russian language layout.

Description of the change

Updated Russian language.Fixed bug with wrong letter (bug isn't in Launchpad, but in the mailing list).

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

review: Approve (continuous-integration)
Revision history for this message
Dmitry (rusdmitry) wrote :

(Requested a merge with a fix for this branch)

I looked at the values for the characters again and there are still some Latin characters that look like Cyrillic ones (or vice versa). They should be Cyrillic though because they are semantically different:

1) There should be a Cyrillic letter 'а' (U+0430) instead of a Latin 'a' (U+0061) (in uppercase as well: U+0410 instead of U+0041);
2) There should be Cyrillic letters 'е' (U+0435), 'ё' (U+0451) instead of Latin letter 'e' (U+0065), Latin letter 'e' with diaeresis (ë - U+00EB) including their uppercase variants (CYRILLIC CAPITAL LETTER IE U+0415, CYRILLIC CAPITAL LETTER IO U+0401).

I also added the RUBLE SIGN U+20BD which is going to be released with an upcoming Unicode Standard 7.0.0 though additional work must be done here to include a glyph for this character in the Ubuntu font.

review: Needs Fixing
lp:~roman2861/ubuntu-keyboard/ubuntu-keyboard updated
173. By Roman Zonov

Merged changes from Dmitry

174. By Roman Zonov

Bug fix

175. By Roman Zonov

Deleted Ruble symbol and bug fix.

Revision history for this message
Dmitry (rusdmitry) wrote :

Since I have created a blueprint for Ruble sign glyph in Ubuntu-Font I guess its addition to the Ubuntu-keyboard can wait (maybe a separate bug or a feature request will do). The semantic differences fixed at this point are quite important for many functions such as searching so this should be merged with Ubuntu-keyboard ASAP. Just updating this to bring some visibility.

review: Approve
Revision history for this message
Adolfo Jayme Barrientos (fitojb) wrote :

Just a heads-up: I’ve just filed bug 1345591 to request the addition of the ruble sign to the Ubuntu font family.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'plugins/ru/qml/Keyboard_ru.qml'
--- plugins/ru/qml/Keyboard_ru.qml 2013-12-12 10:12:23 +0000
+++ plugins/ru/qml/Keyboard_ru.qml 2014-06-04 11:57:40 +0000
@@ -34,15 +34,16 @@
3434
35 CharKey { label: "й"; shifted: "Й"; }35 CharKey { label: "й"; shifted: "Й"; }
36 CharKey { label: "ц"; shifted: "Ц"; }36 CharKey { label: "ц"; shifted: "Ц"; }
37 CharKey { label: "у"; shifted: "Y"; extended: ["ў"]; extendedShifted: ["Ў"] }37 CharKey { label: "у"; shifted: "У"; extended: ["ў"]; extendedShifted: ["Ў"] }
38 CharKey { label: "к"; shifted: "К"; }38 CharKey { label: "к"; shifted: "К"; }
39 CharKey { label: "e"; shifted: "E"; extended: ["ë", "€"]; extendedShifted: ["Ë", "€"] }39 CharKey { label: "е"; shifted: "Е"; extended: ["ё", "€"]; extendedShifted: ["Ё", "€"] }
40 CharKey { label: "н"; shifted: "Н"; }40 CharKey { label: "н"; shifted: "Н"; }
41 CharKey { label: "г"; shifted: "Г"; }41 CharKey { label: "г"; shifted: "Г"; }
42 CharKey { label: "ш"; shifted: "Ш"; }42 CharKey { label: "ш"; shifted: "Ш"; }
43 CharKey { label: "щ"; shifted: "Щ"; }43 CharKey { label: "щ"; shifted: "Щ"; }
44 CharKey { label: "з"; shifted: "З"; }44 CharKey { label: "з"; shifted: "З"; }
45 CharKey { label: "х"; shifted: "Х"; }45 CharKey { label: "х"; shifted: "Х"; }
46 CharKey { label: "ъ"; shifted: "Ъ"; }
46 }47 }
4748
48 Row {49 Row {
@@ -52,7 +53,7 @@
52 CharKey { label: "ф"; shifted: "Ф"; }53 CharKey { label: "ф"; shifted: "Ф"; }
53 CharKey { label: "ы"; shifted: "Ы"; }54 CharKey { label: "ы"; shifted: "Ы"; }
54 CharKey { label: "в"; shifted: "В"; }55 CharKey { label: "в"; shifted: "В"; }
55 CharKey { label: "a"; shifted: "A"; }56 CharKey { label: "а"; shifted: "А"; }
56 CharKey { label: "п"; shifted: "П"; }57 CharKey { label: "п"; shifted: "П"; }
57 CharKey { label: "р"; shifted: "Р"; }58 CharKey { label: "р"; shifted: "Р"; }
58 CharKey { label: "о"; shifted: "О"; }59 CharKey { label: "о"; shifted: "О"; }
@@ -71,8 +72,7 @@
71 CharKey { label: "ч"; shifted: "Ч"; }72 CharKey { label: "ч"; shifted: "Ч"; }
72 CharKey { label: "с"; shifted: "С"; }73 CharKey { label: "с"; shifted: "С"; }
73 CharKey { label: "м"; shifted: "М"; }74 CharKey { label: "м"; shifted: "М"; }
74 CharKey { label: "і"; shifted: "І"; }75 CharKey { label: "и"; shifted: "И"; extended: ["і", "І"]; }
75 CharKey { label: "и"; shifted: "И"; }
76 CharKey { label: "т"; shifted: "Т"; }76 CharKey { label: "т"; shifted: "Т"; }
77 CharKey { label: "ь"; shifted: "Ь"; }77 CharKey { label: "ь"; shifted: "Ь"; }
78 CharKey { label: "б"; shifted: "Б"; }78 CharKey { label: "б"; shifted: "Б"; }
@@ -90,8 +90,7 @@
90 LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }90 LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
91 CharKey { id: commaKey; label: ","; shifted: "/"; anchors.left: languageMenuButton.right; }91 CharKey { id: commaKey; label: ","; shifted: "/"; anchors.left: languageMenuButton.right; }
92 SpaceKey { id: spaceKey; anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true }92 SpaceKey { id: spaceKey; anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true }
93 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: extraCharKey.left; }93 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
94 CharKey { id: extraCharKey; label: "ъ"; shifted: "Ъ"; anchors.right: enterKey.left; }
95 ReturnKey { id: enterKey; anchors.right: parent.right }94 ReturnKey { id: enterKey; anchors.right: parent.right }
96 }95 }
97 } // column96 } // column
9897
=== modified file 'plugins/ru/qml/Keyboard_ru_email.qml'
--- plugins/ru/qml/Keyboard_ru_email.qml 2013-12-12 10:12:23 +0000
+++ plugins/ru/qml/Keyboard_ru_email.qml 2014-06-04 11:57:40 +0000
@@ -36,13 +36,14 @@
36 CharKey { label: "ц"; shifted: "Ц"; }36 CharKey { label: "ц"; shifted: "Ц"; }
37 CharKey { label: "у"; shifted: "Y"; extended: ["ў"]; extendedShifted: ["Ў"] }37 CharKey { label: "у"; shifted: "Y"; extended: ["ў"]; extendedShifted: ["Ў"] }
38 CharKey { label: "к"; shifted: "К"; }38 CharKey { label: "к"; shifted: "К"; }
39 CharKey { label: "e"; shifted: "E"; extended: ["ë", "€"]; extendedShifted: ["Ë", "€"] }39 CharKey { label: "е"; shifted: "Е"; extended: ["ё", "€"]; extendedShifted: ["Ё", "€"] }
40 CharKey { label: "н"; shifted: "Н"; }40 CharKey { label: "н"; shifted: "Н"; }
41 CharKey { label: "г"; shifted: "Г"; }41 CharKey { label: "г"; shifted: "Г"; }
42 CharKey { label: "ш"; shifted: "Ш"; }42 CharKey { label: "ш"; shifted: "Ш"; }
43 CharKey { label: "щ"; shifted: "Щ"; }43 CharKey { label: "щ"; shifted: "Щ"; }
44 CharKey { label: "з"; shifted: "З"; }44 CharKey { label: "з"; shifted: "З"; }
45 CharKey { label: "х"; shifted: "Х"; }45 CharKey { label: "х"; shifted: "Х"; }
46 CharKey { label: "ъ"; shifted: "Ъ"; }
46 }47 }
4748
48 Row {49 Row {
@@ -52,7 +53,7 @@
52 CharKey { label: "ф"; shifted: "Ф"; }53 CharKey { label: "ф"; shifted: "Ф"; }
53 CharKey { label: "ы"; shifted: "Ы"; }54 CharKey { label: "ы"; shifted: "Ы"; }
54 CharKey { label: "в"; shifted: "В"; }55 CharKey { label: "в"; shifted: "В"; }
55 CharKey { label: "a"; shifted: "A"; }56 CharKey { label: "а"; shifted: "А"; }
56 CharKey { label: "п"; shifted: "П"; }57 CharKey { label: "п"; shifted: "П"; }
57 CharKey { label: "р"; shifted: "Р"; }58 CharKey { label: "р"; shifted: "Р"; }
58 CharKey { label: "о"; shifted: "О"; }59 CharKey { label: "о"; shifted: "О"; }
@@ -71,8 +72,7 @@
71 CharKey { label: "ч"; shifted: "Ч"; }72 CharKey { label: "ч"; shifted: "Ч"; }
72 CharKey { label: "с"; shifted: "С"; }73 CharKey { label: "с"; shifted: "С"; }
73 CharKey { label: "м"; shifted: "М"; }74 CharKey { label: "м"; shifted: "М"; }
74 CharKey { label: "і"; shifted: "І"; }75 CharKey { label: "и"; shifted: "И"; extended: ["і", "І"]; }
75 CharKey { label: "и"; shifted: "И"; }
76 CharKey { label: "т"; shifted: "Т"; }76 CharKey { label: "т"; shifted: "Т"; }
77 CharKey { label: "ь"; shifted: "Ь"; }77 CharKey { label: "ь"; shifted: "Ь"; }
78 CharKey { label: "б"; shifted: "Б"; }78 CharKey { label: "б"; shifted: "Б"; }
@@ -88,9 +88,8 @@
88 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }88 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
89 CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: symShiftKey.right; }89 CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: symShiftKey.right; }
90 SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true }90 SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true }
91 UrlKey { id: urlKey; label: ".ru"; extended: [".ua",".su",".kg",".рф","укр",".by",".tj"]; anchors.right: dotKey.left; }91 UrlKey { id: urlKey; label: ".ru"; extended: [".ua",".su",".kg",".рф",".укр",".by",".tj"]; anchors.right: dotKey.left; }
92 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: extraCharKey.left; }92 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
93 CharKey { id: extraCharKey; label: "ъ"; shifted: "Ъ"; anchors.right: enterKey.left; }
94 ReturnKey { id: enterKey; anchors.right: parent.right }93 ReturnKey { id: enterKey; anchors.right: parent.right }
95 }94 }
96 } // column95 } // column
9796
=== modified file 'plugins/ru/qml/Keyboard_ru_url.qml'
--- plugins/ru/qml/Keyboard_ru_url.qml 2013-12-12 10:12:23 +0000
+++ plugins/ru/qml/Keyboard_ru_url.qml 2014-06-04 11:57:40 +0000
@@ -36,13 +36,14 @@
36 CharKey { label: "ц"; shifted: "Ц"; }36 CharKey { label: "ц"; shifted: "Ц"; }
37 CharKey { label: "у"; shifted: "Y"; extended: ["ў"]; extendedShifted: ["Ў"] }37 CharKey { label: "у"; shifted: "Y"; extended: ["ў"]; extendedShifted: ["Ў"] }
38 CharKey { label: "к"; shifted: "К"; }38 CharKey { label: "к"; shifted: "К"; }
39 CharKey { label: "e"; shifted: "E"; extended: ["ë", "€"]; extendedShifted: ["Ë", "€"] }39 CharKey { label: "е"; shifted: "Е"; extended: ["ё", "€"]; extendedShifted: ["Ё", "€"] }
40 CharKey { label: "н"; shifted: "Н"; }40 CharKey { label: "н"; shifted: "Н"; }
41 CharKey { label: "г"; shifted: "Г"; }41 CharKey { label: "г"; shifted: "Г"; }
42 CharKey { label: "ш"; shifted: "Ш"; }42 CharKey { label: "ш"; shifted: "Ш"; }
43 CharKey { label: "щ"; shifted: "Щ"; }43 CharKey { label: "щ"; shifted: "Щ"; }
44 CharKey { label: "з"; shifted: "З"; }44 CharKey { label: "з"; shifted: "З"; }
45 CharKey { label: "х"; shifted: "Х"; }45 CharKey { label: "х"; shifted: "Х"; }
46 CharKey { label: "ъ"; shifted: "Ъ"; }
46 }47 }
4748
48 Row {49 Row {
@@ -52,7 +53,7 @@
52 CharKey { label: "ф"; shifted: "Ф"; }53 CharKey { label: "ф"; shifted: "Ф"; }
53 CharKey { label: "ы"; shifted: "Ы"; }54 CharKey { label: "ы"; shifted: "Ы"; }
54 CharKey { label: "в"; shifted: "В"; }55 CharKey { label: "в"; shifted: "В"; }
55 CharKey { label: "a"; shifted: "A"; }56 CharKey { label: "а"; shifted: "А"; }
56 CharKey { label: "п"; shifted: "П"; }57 CharKey { label: "п"; shifted: "П"; }
57 CharKey { label: "р"; shifted: "Р"; }58 CharKey { label: "р"; shifted: "Р"; }
58 CharKey { label: "о"; shifted: "О"; }59 CharKey { label: "о"; shifted: "О"; }
@@ -71,8 +72,7 @@
71 CharKey { label: "ч"; shifted: "Ч"; }72 CharKey { label: "ч"; shifted: "Ч"; }
72 CharKey { label: "с"; shifted: "С"; }73 CharKey { label: "с"; shifted: "С"; }
73 CharKey { label: "м"; shifted: "М"; }74 CharKey { label: "м"; shifted: "М"; }
74 CharKey { label: "і"; shifted: "І"; }75 CharKey { label: "и"; shifted: "И"; extended: ["і", "І"]; }
75 CharKey { label: "и"; shifted: "И"; }
76 CharKey { label: "т"; shifted: "Т"; }76 CharKey { label: "т"; shifted: "Т"; }
77 CharKey { label: "ь"; shifted: "Ь"; }77 CharKey { label: "ь"; shifted: "Ь"; }
78 CharKey { label: "б"; shifted: "Б"; }78 CharKey { label: "б"; shifted: "Б"; }
@@ -88,8 +88,7 @@
88 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }88 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
89 CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }89 CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }
90 UrlKey { id: urlKey; label: ".ru"; extended: [".ua",".su",".kg",".рф","укр",".by",".tj"]; anchors.right: dotKey.left; }90 UrlKey { id: urlKey; label: ".ru"; extended: [".ua",".su",".kg",".рф","укр",".by",".tj"]; anchors.right: dotKey.left; }
91 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: extraCharKey.left; }91 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
92 CharKey { id: extraCharKey; label: "ъ"; shifted: "Ъ"; anchors.right: enterKey.left; }
93 ReturnKey { id: enterKey; anchors.right: parent.right }92 ReturnKey { id: enterKey; anchors.right: parent.right }
94 }93 }
95 } // column94 } // column
9695
=== modified file 'plugins/ru/qml/Keyboard_ru_url_search.qml'
--- plugins/ru/qml/Keyboard_ru_url_search.qml 2013-12-12 10:12:23 +0000
+++ plugins/ru/qml/Keyboard_ru_url_search.qml 2014-06-04 11:57:40 +0000
@@ -36,13 +36,14 @@
36 CharKey { label: "ц"; shifted: "Ц"; }36 CharKey { label: "ц"; shifted: "Ц"; }
37 CharKey { label: "у"; shifted: "Y"; extended: ["ў"]; extendedShifted: ["Ў"] }37 CharKey { label: "у"; shifted: "Y"; extended: ["ў"]; extendedShifted: ["Ў"] }
38 CharKey { label: "к"; shifted: "К"; }38 CharKey { label: "к"; shifted: "К"; }
39 CharKey { label: "e"; shifted: "E"; extended: ["ë", "€"]; extendedShifted: ["Ë", "€"] }39 CharKey { label: "е"; shifted: "Е"; extended: ["ё", "€"]; extendedShifted: ["Ё", "€"] }
40 CharKey { label: "н"; shifted: "Н"; }40 CharKey { label: "н"; shifted: "Н"; }
41 CharKey { label: "г"; shifted: "Г"; }41 CharKey { label: "г"; shifted: "Г"; }
42 CharKey { label: "ш"; shifted: "Ш"; }42 CharKey { label: "ш"; shifted: "Ш"; }
43 CharKey { label: "щ"; shifted: "Щ"; }43 CharKey { label: "щ"; shifted: "Щ"; }
44 CharKey { label: "з"; shifted: "З"; }44 CharKey { label: "з"; shifted: "З"; }
45 CharKey { label: "х"; shifted: "Х"; }45 CharKey { label: "х"; shifted: "Х"; }
46 CharKey { label: "ъ"; shifted: "Ъ"; }
46 }47 }
4748
48 Row {49 Row {
@@ -52,7 +53,7 @@
52 CharKey { label: "ф"; shifted: "Ф"; }53 CharKey { label: "ф"; shifted: "Ф"; }
53 CharKey { label: "ы"; shifted: "Ы"; }54 CharKey { label: "ы"; shifted: "Ы"; }
54 CharKey { label: "в"; shifted: "В"; }55 CharKey { label: "в"; shifted: "В"; }
55 CharKey { label: "a"; shifted: "A"; }56 CharKey { label: "а"; shifted: "А"; }
56 CharKey { label: "п"; shifted: "П"; }57 CharKey { label: "п"; shifted: "П"; }
57 CharKey { label: "р"; shifted: "Р"; }58 CharKey { label: "р"; shifted: "Р"; }
58 CharKey { label: "о"; shifted: "О"; }59 CharKey { label: "о"; shifted: "О"; }
@@ -71,8 +72,7 @@
71 CharKey { label: "ч"; shifted: "Ч"; }72 CharKey { label: "ч"; shifted: "Ч"; }
72 CharKey { label: "с"; shifted: "С"; }73 CharKey { label: "с"; shifted: "С"; }
73 CharKey { label: "м"; shifted: "М"; }74 CharKey { label: "м"; shifted: "М"; }
74 CharKey { label: "і"; shifted: "І"; }75 CharKey { label: "и"; shifted: "И"; extended: ["і", "І"]; }
75 CharKey { label: "и"; shifted: "И"; }
76 CharKey { label: "т"; shifted: "Т"; }76 CharKey { label: "т"; shifted: "Т"; }
77 CharKey { label: "ь"; shifted: "Ь"; }77 CharKey { label: "ь"; shifted: "Ь"; }
78 CharKey { label: "б"; shifted: "Б"; }78 CharKey { label: "б"; shifted: "Б"; }
@@ -89,8 +89,7 @@
89 CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }89 CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }
90 SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true }90 SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true }
91 UrlKey { id: urlKey; label: ".ru"; extended: [".ua",".su",".kg",".рф","укр",".by",".tj"]; anchors.right: dotKey.left; }91 UrlKey { id: urlKey; label: ".ru"; extended: [".ua",".su",".kg",".рф","укр",".by",".tj"]; anchors.right: dotKey.left; }
92 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: extraCharKey.left; }92 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
93 CharKey { id: extraCharKey; label: "ъ"; shifted: "Ъ"; anchors.right: enterKey.left; }
94 ReturnKey { id: enterKey; anchors.right: parent.right }93 ReturnKey { id: enterKey; anchors.right: parent.right }
95 }94 }
96 } // column95 } // column

Subscribers

People subscribed via source and target branches