From 7e06db9c2aea1b2181f71fc4fbb804cdf8b43a38 Mon Sep 17 00:00:00 2001
From: Frans de Jonge <fransdejonge@gmail.com>
Date: Sun, 14 Apr 2019 18:39:09 +0200
Subject: [PATCH] [UX] Keyboard popup: add H and J (#4920)

---
 .../ui/data/keyboardlayouts/en_keyboard.lua    | 12 ++++++++----
 .../data/keyboardlayouts/keypopup/en_popup.lua | 18 ++++++++++++++++++
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/frontend/ui/data/keyboardlayouts/en_keyboard.lua b/frontend/ui/data/keyboardlayouts/en_keyboard.lua
index a0f75a329..efd219087 100644
--- a/frontend/ui/data/keyboardlayouts/en_keyboard.lua
+++ b/frontend/ui/data/keyboardlayouts/en_keyboard.lua
@@ -8,16 +8,20 @@ local _B_ = en_popup._B_
 local _b_ = en_popup._b_
 local _C_ = en_popup._C_
 local _c_ = en_popup._c_
+local _D_ = en_popup._D_
+local _d_ = en_popup._d_
 local _E_ = en_popup._E_
 local _e_ = en_popup._e_
 local _F_ = en_popup._F_
 local _f_ = en_popup._f_
 local _G_ = en_popup._G_
 local _g_ = en_popup._g_
-local _D_ = en_popup._D_
-local _d_ = en_popup._d_
+local _H_ = en_popup._H_
+local _h_ = en_popup._h_
 local _I_ = en_popup._I_
 local _i_ = en_popup._i_
+local _J_ = en_popup._J_
+local _j_ = en_popup._j_
 local _K_ = en_popup._K_
 local _k_ = en_popup._k_
 local _L_ = en_popup._L_
@@ -63,8 +67,8 @@ return {
             { _D_,        _d_,    "%",    "5",    "В",    "в",    "-",    "5",    "Î",    "î",    "Ğ",    "ğ", },
             { _F_,        _f_,    "^",    "6",    "А",    "а",    "=",    "6",    "Ï",    "ï",    "Ć",    "ć", },
             { _G_,        _g_,    ":",    ";",    "П",    "п",    "Ү",    "ү",    "Ô",    "ô",    "Č",    "č", },
-            { "H",        "h",    "\"",   "'",    "Р",    "р",    "Ұ",    "ұ",    "Œ",    "œ",    "Đ",    "đ", },
-            { "J",        "j",    "{",    "[",    "О",    "о",    "Қ",    "қ",    "Ù",    "ù",    "Š",    "š", },
+            { _H_,        _h_,    '"',    "'",    "Р",    "р",    "Ұ",    "ұ",    "Œ",    "œ",    "Đ",    "đ", },
+            { _J_,        _j_,    "{",    "[",    "О",    "о",    "Қ",    "қ",    "Ù",    "ù",    "Š",    "š", },
             { _K_,        _k_,    "}",    "]",   "Л",    "л",    "Ж",    "ж",    "Û",    "û",    "Ž",    "ž", },
             { _L_,        _l_,    "_",    "-",    "Д",    "д",    "Э",    "э",    "Ÿ",    "ÿ",    "Ő",    "ő", },
         },
diff --git a/frontend/ui/data/keyboardlayouts/keypopup/en_popup.lua b/frontend/ui/data/keyboardlayouts/keypopup/en_popup.lua
index 617c1bdf7..5eaae530a 100644
--- a/frontend/ui/data/keyboardlayouts/keypopup/en_popup.lua
+++ b/frontend/ui/data/keyboardlayouts/keypopup/en_popup.lua
@@ -149,6 +149,16 @@ return {
         east = "ɣ", -- voiced velar fricative IPA
         west = "γ", -- lowercase gamma
     },
+    _H_ = {
+        "H",
+        east = "ɥ", -- labialized palatal approximant (like a combination between /w/ and /y/)
+        west = "Η", -- uppercase eta
+    },
+    _h_ = {
+        "h",
+        east = "ɥ", -- labialized palatal approximant (like a combination between /w/ and /y/)
+        west = "η", -- lowercase eta
+    },
     _I_ = {
         "I",
         north = "Í",
@@ -171,6 +181,14 @@ return {
         "ī",
         "ɪ", -- small capital letter i, near-close front unrounded vowel IPA
     },
+    _J_ = {
+        "J",
+        east = "ʝ", -- voiced palatal fricative
+    },
+    _j_ = {
+        "j",
+        east = "ʝ", -- voiced palatal fricative
+    },
     _K_ = {
         "K",
         north = '"',