From 1581ea48dcd48d0d3f42cc09b388c468aedec45d Mon Sep 17 00:00:00 2001
From: Zach White <skullydazed@gmail.com>
Date: Sat, 27 Feb 2021 12:00:50 -0800
Subject: Fix develop (#12039)

Fixes file encoding errors on Windows, and layouts not correctly merging into info.json.

* force utf8 encoding

* correctly merge layouts and layout aliases

* show what aliases point to
---
 data/schemas/keyboard.jsonschema | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'data')

diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index 967b5f9904..f5fb611bd2 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -85,8 +85,16 @@
         "layout_aliases": {
             "type": "object",
             "additionalProperties": {
-                "type": "string",
-                "pattern": "^LAYOUT_[0-9a-z_]*$"
+                "oneOf": [
+                    {
+                        "type": "string",
+                        "enum": ["LAYOUT"]
+                    },
+                    {
+                        "type": "string",
+                        "pattern": "^LAYOUT_[0-9a-z_]*$"
+                    }
+                ]
             }
         },
         "layouts": {
-- 
cgit v1.2.3