From 849bd951edb0eeb06bac49c432d887c3110cae1e Mon Sep 17 00:00:00 2001
From: Mihai Vasiliu <mihai.vasiliu.93@gmail.com>
Date: Sat, 30 Nov 2019 17:37:17 +0200
Subject: [PATCH] [UX] Add Moldavian diacritics to ru_keyboard (#5652)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added Ӂӂ on the Russian layout popup for Moldavian.
---
 frontend/ui/data/keyboardlayouts/keypopup/ru_popup.lua | 10 ++++++++++
 frontend/ui/data/keyboardlayouts/ru_keyboard.lua       |  5 ++++-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 frontend/ui/data/keyboardlayouts/keypopup/ru_popup.lua

diff --git a/frontend/ui/data/keyboardlayouts/keypopup/ru_popup.lua b/frontend/ui/data/keyboardlayouts/keypopup/ru_popup.lua
new file mode 100644
index 000000000..ec1569600
--- /dev/null
+++ b/frontend/ui/data/keyboardlayouts/keypopup/ru_popup.lua
@@ -0,0 +1,10 @@
+return {
+    _Je_ = {
+        "Ж",
+        north = "Ӂ", -- Ж with breve (Moldavian)
+    },
+    _je_ = {
+        "ж",
+        north = "ӂ", -- ж with breve (Moldavian)
+    },
+}
diff --git a/frontend/ui/data/keyboardlayouts/ru_keyboard.lua b/frontend/ui/data/keyboardlayouts/ru_keyboard.lua
index 9f8685225..51d266134 100644
--- a/frontend/ui/data/keyboardlayouts/ru_keyboard.lua
+++ b/frontend/ui/data/keyboardlayouts/ru_keyboard.lua
@@ -1,8 +1,11 @@
 local en_popup = require("ui/data/keyboardlayouts/keypopup/en_popup")
+local ru_popup = require("ui/data/keyboardlayouts/keypopup/ru_popup")
 local com = en_popup.com -- comma (,)
 local prd = en_popup.prd -- period (.)
 local _at = en_popup._at
 local _eq = en_popup._eq -- equals sign (=)
+local _Je_ = ru_popup._Je_
+local _je_ = ru_popup._je_
 
 return {
     min_layer = 1,
@@ -34,7 +37,7 @@ return {
             { "П",    "п",    ":",    ";",    "Ү",    "ү",    "Č",    "č", },
             { "Р",    "р",    '"',    "'",    "Ұ",    "ұ",    "Đ",    "đ", },
             { "О",    "о",    "{",    "[",    "Қ",    "қ",    "Š",    "š", },
-            { "Л",    "л",    "}",    "]",    "Ж",    "ж",    "Ž",    "ž", },
+            { "Л",    "л",    "}",    "]",   _Je_,   _je_,    "Ž",    "ž", },
             { "Д",    "д",    "_",    "-",    "Э",    "э",    "Ő",    "ő", },
         },
         -- third row