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

Proposed by Roman Zonov on 2014-05-30
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 on 2014-06-14
PS Jenkins bot continuous-integration 2014-05-30 Approve on 2014-06-03
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.
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
173. By Roman Zonov on 2014-06-04

Merged changes from Dmitry

174. By Roman Zonov on 2014-06-04

Bug fix

175. By Roman Zonov on 2014-06-04

Deleted Ruble symbol and bug fix.

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
Adolfo Jayme (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
1=== modified file 'plugins/ru/qml/Keyboard_ru.qml'
2--- plugins/ru/qml/Keyboard_ru.qml 2013-12-12 10:12:23 +0000
3+++ plugins/ru/qml/Keyboard_ru.qml 2014-06-04 11:57:40 +0000
4@@ -34,15 +34,16 @@
5
6 CharKey { label: "й"; shifted: "Й"; }
7 CharKey { label: "ц"; shifted: "Ц"; }
8- CharKey { label: "у"; shifted: "Y"; extended: ["ў"]; extendedShifted: ["Ў"] }
9+ CharKey { label: "у"; shifted: "У"; extended: ["ў"]; extendedShifted: ["Ў"] }
10 CharKey { label: "к"; shifted: "К"; }
11- CharKey { label: "e"; shifted: "E"; extended: ["ë", "€"]; extendedShifted: ["Ë", "€"] }
12+ CharKey { label: "е"; shifted: "Е"; extended: ["ё", "€"]; extendedShifted: ["Ё", "€"] }
13 CharKey { label: "н"; shifted: "Н"; }
14 CharKey { label: "г"; shifted: "Г"; }
15 CharKey { label: "ш"; shifted: "Ш"; }
16 CharKey { label: "щ"; shifted: "Щ"; }
17 CharKey { label: "з"; shifted: "З"; }
18 CharKey { label: "х"; shifted: "Х"; }
19+ CharKey { label: "ъ"; shifted: "Ъ"; }
20 }
21
22 Row {
23@@ -52,7 +53,7 @@
24 CharKey { label: "ф"; shifted: "Ф"; }
25 CharKey { label: "ы"; shifted: "Ы"; }
26 CharKey { label: "в"; shifted: "В"; }
27- CharKey { label: "a"; shifted: "A"; }
28+ CharKey { label: "а"; shifted: "А"; }
29 CharKey { label: "п"; shifted: "П"; }
30 CharKey { label: "р"; shifted: "Р"; }
31 CharKey { label: "о"; shifted: "О"; }
32@@ -71,8 +72,7 @@
33 CharKey { label: "ч"; shifted: "Ч"; }
34 CharKey { label: "с"; shifted: "С"; }
35 CharKey { label: "м"; shifted: "М"; }
36- CharKey { label: "і"; shifted: "І"; }
37- CharKey { label: "и"; shifted: "И"; }
38+ CharKey { label: "и"; shifted: "И"; extended: ["і", "І"]; }
39 CharKey { label: "т"; shifted: "Т"; }
40 CharKey { label: "ь"; shifted: "Ь"; }
41 CharKey { label: "б"; shifted: "Б"; }
42@@ -90,8 +90,7 @@
43 LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
44 CharKey { id: commaKey; label: ","; shifted: "/"; anchors.left: languageMenuButton.right; }
45 SpaceKey { id: spaceKey; anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true }
46- CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: extraCharKey.left; }
47- CharKey { id: extraCharKey; label: "ъ"; shifted: "Ъ"; anchors.right: enterKey.left; }
48+ CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
49 ReturnKey { id: enterKey; anchors.right: parent.right }
50 }
51 } // column
52
53=== modified file 'plugins/ru/qml/Keyboard_ru_email.qml'
54--- plugins/ru/qml/Keyboard_ru_email.qml 2013-12-12 10:12:23 +0000
55+++ plugins/ru/qml/Keyboard_ru_email.qml 2014-06-04 11:57:40 +0000
56@@ -36,13 +36,14 @@
57 CharKey { label: "ц"; shifted: "Ц"; }
58 CharKey { label: "у"; shifted: "Y"; extended: ["ў"]; extendedShifted: ["Ў"] }
59 CharKey { label: "к"; shifted: "К"; }
60- CharKey { label: "e"; shifted: "E"; extended: ["ë", "€"]; extendedShifted: ["Ë", "€"] }
61+ CharKey { label: "е"; shifted: "Е"; extended: ["ё", "€"]; extendedShifted: ["Ё", "€"] }
62 CharKey { label: "н"; shifted: "Н"; }
63 CharKey { label: "г"; shifted: "Г"; }
64 CharKey { label: "ш"; shifted: "Ш"; }
65 CharKey { label: "щ"; shifted: "Щ"; }
66 CharKey { label: "з"; shifted: "З"; }
67 CharKey { label: "х"; shifted: "Х"; }
68+ CharKey { label: "ъ"; shifted: "Ъ"; }
69 }
70
71 Row {
72@@ -52,7 +53,7 @@
73 CharKey { label: "ф"; shifted: "Ф"; }
74 CharKey { label: "ы"; shifted: "Ы"; }
75 CharKey { label: "в"; shifted: "В"; }
76- CharKey { label: "a"; shifted: "A"; }
77+ CharKey { label: "а"; shifted: "А"; }
78 CharKey { label: "п"; shifted: "П"; }
79 CharKey { label: "р"; shifted: "Р"; }
80 CharKey { label: "о"; shifted: "О"; }
81@@ -71,8 +72,7 @@
82 CharKey { label: "ч"; shifted: "Ч"; }
83 CharKey { label: "с"; shifted: "С"; }
84 CharKey { label: "м"; shifted: "М"; }
85- CharKey { label: "і"; shifted: "І"; }
86- CharKey { label: "и"; shifted: "И"; }
87+ CharKey { label: "и"; shifted: "И"; extended: ["і", "І"]; }
88 CharKey { label: "т"; shifted: "Т"; }
89 CharKey { label: "ь"; shifted: "Ь"; }
90 CharKey { label: "б"; shifted: "Б"; }
91@@ -88,9 +88,8 @@
92 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
93 CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: symShiftKey.right; }
94 SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true }
95- UrlKey { id: urlKey; label: ".ru"; extended: [".ua",".su",".kg",".рф","укр",".by",".tj"]; anchors.right: dotKey.left; }
96- CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: extraCharKey.left; }
97- CharKey { id: extraCharKey; label: "ъ"; shifted: "Ъ"; anchors.right: enterKey.left; }
98+ UrlKey { id: urlKey; label: ".ru"; extended: [".ua",".su",".kg",".рф",".укр",".by",".tj"]; anchors.right: dotKey.left; }
99+ CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
100 ReturnKey { id: enterKey; anchors.right: parent.right }
101 }
102 } // column
103
104=== modified file 'plugins/ru/qml/Keyboard_ru_url.qml'
105--- plugins/ru/qml/Keyboard_ru_url.qml 2013-12-12 10:12:23 +0000
106+++ plugins/ru/qml/Keyboard_ru_url.qml 2014-06-04 11:57:40 +0000
107@@ -36,13 +36,14 @@
108 CharKey { label: "ц"; shifted: "Ц"; }
109 CharKey { label: "у"; shifted: "Y"; extended: ["ў"]; extendedShifted: ["Ў"] }
110 CharKey { label: "к"; shifted: "К"; }
111- CharKey { label: "e"; shifted: "E"; extended: ["ë", "€"]; extendedShifted: ["Ë", "€"] }
112+ CharKey { label: "е"; shifted: "Е"; extended: ["ё", "€"]; extendedShifted: ["Ё", "€"] }
113 CharKey { label: "н"; shifted: "Н"; }
114 CharKey { label: "г"; shifted: "Г"; }
115 CharKey { label: "ш"; shifted: "Ш"; }
116 CharKey { label: "щ"; shifted: "Щ"; }
117 CharKey { label: "з"; shifted: "З"; }
118 CharKey { label: "х"; shifted: "Х"; }
119+ CharKey { label: "ъ"; shifted: "Ъ"; }
120 }
121
122 Row {
123@@ -52,7 +53,7 @@
124 CharKey { label: "ф"; shifted: "Ф"; }
125 CharKey { label: "ы"; shifted: "Ы"; }
126 CharKey { label: "в"; shifted: "В"; }
127- CharKey { label: "a"; shifted: "A"; }
128+ CharKey { label: "а"; shifted: "А"; }
129 CharKey { label: "п"; shifted: "П"; }
130 CharKey { label: "р"; shifted: "Р"; }
131 CharKey { label: "о"; shifted: "О"; }
132@@ -71,8 +72,7 @@
133 CharKey { label: "ч"; shifted: "Ч"; }
134 CharKey { label: "с"; shifted: "С"; }
135 CharKey { label: "м"; shifted: "М"; }
136- CharKey { label: "і"; shifted: "І"; }
137- CharKey { label: "и"; shifted: "И"; }
138+ CharKey { label: "и"; shifted: "И"; extended: ["і", "І"]; }
139 CharKey { label: "т"; shifted: "Т"; }
140 CharKey { label: "ь"; shifted: "Ь"; }
141 CharKey { label: "б"; shifted: "Б"; }
142@@ -88,8 +88,7 @@
143 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
144 CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }
145 UrlKey { id: urlKey; label: ".ru"; extended: [".ua",".su",".kg",".рф","укр",".by",".tj"]; anchors.right: dotKey.left; }
146- CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: extraCharKey.left; }
147- CharKey { id: extraCharKey; label: "ъ"; shifted: "Ъ"; anchors.right: enterKey.left; }
148+ CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
149 ReturnKey { id: enterKey; anchors.right: parent.right }
150 }
151 } // column
152
153=== modified file 'plugins/ru/qml/Keyboard_ru_url_search.qml'
154--- plugins/ru/qml/Keyboard_ru_url_search.qml 2013-12-12 10:12:23 +0000
155+++ plugins/ru/qml/Keyboard_ru_url_search.qml 2014-06-04 11:57:40 +0000
156@@ -36,13 +36,14 @@
157 CharKey { label: "ц"; shifted: "Ц"; }
158 CharKey { label: "у"; shifted: "Y"; extended: ["ў"]; extendedShifted: ["Ў"] }
159 CharKey { label: "к"; shifted: "К"; }
160- CharKey { label: "e"; shifted: "E"; extended: ["ë", "€"]; extendedShifted: ["Ë", "€"] }
161+ CharKey { label: "е"; shifted: "Е"; extended: ["ё", "€"]; extendedShifted: ["Ё", "€"] }
162 CharKey { label: "н"; shifted: "Н"; }
163 CharKey { label: "г"; shifted: "Г"; }
164 CharKey { label: "ш"; shifted: "Ш"; }
165 CharKey { label: "щ"; shifted: "Щ"; }
166 CharKey { label: "з"; shifted: "З"; }
167 CharKey { label: "х"; shifted: "Х"; }
168+ CharKey { label: "ъ"; shifted: "Ъ"; }
169 }
170
171 Row {
172@@ -52,7 +53,7 @@
173 CharKey { label: "ф"; shifted: "Ф"; }
174 CharKey { label: "ы"; shifted: "Ы"; }
175 CharKey { label: "в"; shifted: "В"; }
176- CharKey { label: "a"; shifted: "A"; }
177+ CharKey { label: "а"; shifted: "А"; }
178 CharKey { label: "п"; shifted: "П"; }
179 CharKey { label: "р"; shifted: "Р"; }
180 CharKey { label: "о"; shifted: "О"; }
181@@ -71,8 +72,7 @@
182 CharKey { label: "ч"; shifted: "Ч"; }
183 CharKey { label: "с"; shifted: "С"; }
184 CharKey { label: "м"; shifted: "М"; }
185- CharKey { label: "і"; shifted: "І"; }
186- CharKey { label: "и"; shifted: "И"; }
187+ CharKey { label: "и"; shifted: "И"; extended: ["і", "І"]; }
188 CharKey { label: "т"; shifted: "Т"; }
189 CharKey { label: "ь"; shifted: "Ь"; }
190 CharKey { label: "б"; shifted: "Б"; }
191@@ -89,8 +89,7 @@
192 CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }
193 SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true }
194 UrlKey { id: urlKey; label: ".ru"; extended: [".ua",".su",".kg",".рф","укр",".by",".tj"]; anchors.right: dotKey.left; }
195- CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: extraCharKey.left; }
196- CharKey { id: extraCharKey; label: "ъ"; shifted: "Ъ"; anchors.right: enterKey.left; }
197+ CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
198 ReturnKey { id: enterKey; anchors.right: parent.right }
199 }
200 } // column

Subscribers

People subscribed via source and target branches