From 93e4345e823dbb9d9ee187d1f5b32c6dd7dffdd3 Mon Sep 17 00:00:00 2001
From: Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>
Date: Mon, 5 Apr 2021 08:17:07 +0000
Subject: [PATCH] layout: Take into account text purpose again

---
 src/data.rs | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/data.rs b/src/data.rs
index e5aa3910..71711c3f 100644
--- a/src/data.rs
+++ b/src/data.rs
@@ -239,13 +239,18 @@ fn load_layout_data_with_fallback(
         .map(PathBuf::from)
         .or_else(|| xdg::data_path("squeekboard/keyboards"));
 
-    log_print!(
-        logging::Level::Debug, 
-        "load_layout_data_with_fallback() -> name:{}, purpose:{:?}, overlay:{}, layout_name:{}", 
-        name, purpose, overlay, &name
-    );
+    let layout_purpose = match overlay {
+        "" => match purpose {
+            ContentPurpose::Number => "number",
+            ContentPurpose::Digits => "number",
+            ContentPurpose::Phone => "number",
+            ContentPurpose::Terminal => "terminal",
+            _ => "",
+        },
+        overlay => overlay,
+    };
 
-    for (kind, source) in list_layout_sources(&name, kind, overlay, path) {
+    for (kind, source) in list_layout_sources(&name, kind, layout_purpose, path) {
         let layout = load_layout_data(source.clone());
         match layout {
             Err(e) => match (e, source) {