From 608be930f78d2ff42b477c1990cc5a7affcaa3af Mon Sep 17 00:00:00 2001
From: Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>
Date: Thu, 1 Apr 2021 16:14:27 +0000
Subject: [PATCH] layout selection: Fix emoji and number

---
 data/keyboards/{emoji.yaml => emoji/us.yaml}   | 0
 data/keyboards/{number.yaml => number/us.yaml} | 0
 src/resources.rs                               | 7 ++++---
 tests/meson.build                              | 6 +++---
 4 files changed, 7 insertions(+), 6 deletions(-)
 rename data/keyboards/{emoji.yaml => emoji/us.yaml} (100%)
 rename data/keyboards/{number.yaml => number/us.yaml} (100%)

diff --git a/data/keyboards/emoji.yaml b/data/keyboards/emoji/us.yaml
similarity index 100%
rename from data/keyboards/emoji.yaml
rename to data/keyboards/emoji/us.yaml
diff --git a/data/keyboards/number.yaml b/data/keyboards/number/us.yaml
similarity index 100%
rename from data/keyboards/number.yaml
rename to data/keyboards/number/us.yaml
diff --git a/src/resources.rs b/src/resources.rs
index b3d40dbf..8fa63696 100644
--- a/src/resources.rs
+++ b/src/resources.rs
@@ -80,7 +80,7 @@ const KEYBOARDS: &[(*const str, *const str)] = &[
     ("us+dvorak_wide", include_str!("../data/keyboards/us+dvorak_wide.yaml")),
 
     // Others
-    ("number", include_str!("../data/keyboards/number.yaml")),
+    ("number/us", include_str!("../data/keyboards/number/us.yaml")),
 
     // Terminal
     ("terminal/fr", include_str!("../data/keyboards/terminal/fr.yaml")),
@@ -89,7 +89,7 @@ const KEYBOARDS: &[(*const str, *const str)] = &[
     ("terminal/us_wide",   include_str!("../data/keyboards/terminal/us_wide.yaml")),
 
     // Overlays
-    ("emoji", include_str!("../data/keyboards/emoji.yaml")),
+    ("emoji/us", include_str!("../data/keyboards/emoji/us.yaml")),
 ];
 
 pub fn get_keyboard(needle: &str) -> Option<&'static str> {
@@ -108,6 +108,7 @@ pub fn get_keyboard(needle: &str) -> Option<&'static str> {
 
 const OVERLAY_NAMES: &[*const str] = &[
     "emoji",
+    "terminal",
 ];
 
 pub fn get_overlays() -> Vec<&'static str> {
@@ -171,7 +172,7 @@ mod test {
     #[test]
     fn check_overlays_present() {
         for name in get_overlays() {
-            assert!(get_keyboard(name).is_some());
+            assert!(get_keyboard(&format!("{}/us", name)).is_some());
         }
     }
 
diff --git a/tests/meson.build b/tests/meson.build
index f2529dce..e2ceb6dd 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -91,11 +91,11 @@ foreach layout : [
     'terminal/us_wide',
     
     # Block: Not languages.
-    'emoji',
-    'number',
+    'emoji/us',
+    'number/us',
 ]
     extra = []
-    if layout == 'emoji'
+    if layout.startswith('emoji/')
         extra += ['allow_missing_return']
     endif