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

[Dmitry]

Changed latin 'e', 'e-diaeresis' and 'a' to the semantically correct Cyrillic equivalents. Added the Ruble currency sign (U+20BD) which is to be released with Unicode 7.0.0 soon (requires a correct font for correct display).

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.

[Roman Zonov (roman2861)]

Thank you!

review: Approve

[Dmitry (rusdmitry)]

We should probably merge my changes into your private branch to update your merge to lp:ubuntu-keyboard: https://code.launchpad.net/~roman2861/ubuntu-keyboard/ubuntu-keyboard/+merge/221590
I don't have permissions to merge into your private branch so I guess only you are going to be able to do the merge.

[Dmitry (rusdmitry)]

Still don't see your branch updated. It looks like changing status on
Launchpad does not do the actual merge.

So I think you are going to need to do the following in your local repo:

#if on a different branch
bzr switch lp:~roman2861/ubuntu-keyboard/ubuntu-keyboard

#merge
bzr merge lp:~rusdmitry/ubuntu-keyboard/ubuntu-keyboard

#commit merged changes
bzr commit -m "Merged Dmitry's changes."

Thanks!

On 06/03/2014 01:41 PM, Zonov Roman wrote:
> The proposal to merge lp:~rusdmitry/ubuntu-keyboard/ubuntu-keyboard into lp:~roman2861/ubuntu-keyboard/ubuntu-keyboard has been updated.
>
> Status: Approved => Merged
>
> For more details, see:
> https://code.launchpad.net/~rusdmitry/ubuntu-keyboard/ubuntu-keyboard/+merge/221915
>

[Michael Sheldon (michael-sheldon)]

I think it might be best if the addition of the ruble character is made in a separate merge request, otherwise we'll probably have to delay merging these changes until the font can be updated.

[Roman Zonov (roman2861)]

Ok, Michael, I'll delete ruble character from my branch.

[Roman Zonov (roman2861)]

Updated branch (174). So, now we are waiting for merge:)

[Dmitry (rusdmitry)]

I created a blueprint for the ruble glyph to be added to the Ubuntu Font
Family
https://blueprints.launchpad.net/ubuntu-font-family/+spec/ruble-currency-sign
so I am not sure if I need to create a merge request from my branch now
or later once the glyph is added.

On 06/04/2014 07:29 AM, Michael Sheldon wrote:
> I think it might be best if the addition of the ruble character is made in a separate merge request, otherwise we'll probably have to delay merging these changes until the font can be updated.
>

=== modified file 'plugins/ru/qml/Keyboard_ru.qml'
--- plugins/ru/qml/Keyboard_ru.qml	2014-05-30 20:36:06 +0000
+++ plugins/ru/qml/Keyboard_ru.qml	2014-06-03 15:48:38 +0000
@@ -36,7 +36,7 @@
             CharKey { label: "ц"; shifted: "Ц"; }
             CharKey { label: "у"; shifted: "У"; extended: ["ў"]; extendedShifted: ["Ў"] }
             CharKey { label: "к"; shifted: "К"; }
-            CharKey { label: "e"; shifted: "E"; extended: ["ë", "€"]; extendedShifted: ["Ë", "€"] }
+            CharKey { label: "е"; shifted: "Е"; extended: ["ё", "€"]; extendedShifted: ["Ё", "€"] }
             CharKey { label: "н"; shifted: "Н"; }
             CharKey { label: "г"; shifted: "Г"; }
             CharKey { label: "ш"; shifted: "Ш"; }
@@ -53,9 +53,9 @@
             CharKey { label: "ф"; shifted: "Ф"; }
             CharKey { label: "ы"; shifted: "Ы"; }
             CharKey { label: "в"; shifted: "В"; }
-            CharKey { label: "a"; shifted: "A"; }
+            CharKey { label: "а"; shifted: "А"; }
             CharKey { label: "п"; shifted: "П"; }
-            CharKey { label: "р"; shifted: "Р"; }
+            CharKey { label: "р"; shifted: "Р"; extended: ["₽"]; extendedShifted: ["₽"] }
             CharKey { label: "о"; shifted: "О"; }
             CharKey { label: "л"; shifted: "Л"; }
             CharKey { label: "д"; shifted: "Д"; }