From 2d5cbafd27aefa767fab06d3f035adc636c3fc1d Mon Sep 17 00:00:00 2001
From: Frans de Jonge <fransdejonge@gmail.com>
Date: Wed, 10 Apr 2019 15:47:15 +0200
Subject: [PATCH] [UX] Keyboard: add S diacritics (#4890)

---
 .../ui/data/keyboardlayouts/en_keyboard.lua   |  4 ++-
 .../keyboardlayouts/keypopup/en_popup.lua     | 28 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/frontend/ui/data/keyboardlayouts/en_keyboard.lua b/frontend/ui/data/keyboardlayouts/en_keyboard.lua
index 426dd21d3..a84eada2e 100644
--- a/frontend/ui/data/keyboardlayouts/en_keyboard.lua
+++ b/frontend/ui/data/keyboardlayouts/en_keyboard.lua
@@ -4,6 +4,8 @@ local _A_ = en_popup._A_
 local _a_ = en_popup._a_
 local _E_ = en_popup._E_
 local _e_ = en_popup._e_
+local _S_ = en_popup._S_
+local _s_ = en_popup._s_
 
 return {
     shiftmode_keys = {["Shift"] = true},
@@ -27,7 +29,7 @@ return {
         -- second row
         {  --  1           2       3       4       5       6       7       8       9       10      11      12
             { _A_,        _a_,    "…",    _at,    "Ф",    "ф",    "*",    "0",    "Ê",    "ê",    "Ş",    "ş", },
-            { "S",        "s",    "$",    "4",    "Ы",    "ы",    "+",    "4",    "Ë",    "ë",    "İ",    "ı", },
+            { _S_,        _s_,    "$",    "4",    "Ы",    "ы",    "+",    "4",    "Ë",    "ë",    "İ",    "ı", },
             { "D",        "d",    "%",    "5",    "В",    "в",    "-",    "5",    "Î",    "î",    "Ğ",    "ğ", },
             { "F",        "f",    "^",    "6",    "А",    "а",    "=",    "6",    "Ï",    "ï",    "Ć",    "ć", },
             { "G",        "g",    ":",    ";",    "П",    "п",    "Ү",    "ү",    "Ô",    "ô",    "Č",    "č", },
diff --git a/frontend/ui/data/keyboardlayouts/keypopup/en_popup.lua b/frontend/ui/data/keyboardlayouts/keypopup/en_popup.lua
index feffe687a..b0c54db0e 100644
--- a/frontend/ui/data/keyboardlayouts/keypopup/en_popup.lua
+++ b/frontend/ui/data/keyboardlayouts/keypopup/en_popup.lua
@@ -57,4 +57,32 @@ return {
         "ē",
         "ě",
     },
+    _S_ = {
+        "S",
+        north = "ẞ",
+        northeast = "Ś",
+        northwest = "ſ",
+        east = "Ŝ",
+        west = "Š",
+        south = "Ş",
+        southeast = "$",
+        southwest = "Ṣ",
+        "Σ",
+        "σ",
+        "ς",
+    },
+    _s_ = {
+        "s",
+        north = "ß",
+        northeast = "ś",
+        northwest = "ſ",
+        east = "ŝ",
+        west = "š",
+        south = "ş",
+        southeast = "$",
+        southwest = "ṣ",
+        "Σ",
+        "σ",
+        "ς",
+    },
 }