From 44104a8970a10dff2894745f0c904644ca3234e0 Mon Sep 17 00:00:00 2001
From: "(quasar) nebula" <qznebula@protonmail.com>
Date: Thu, 12 May 2022 23:54:28 -0300
Subject: don't inherit strings in the wrong direction lol

---
 src/data/things.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/data/things.js b/src/data/things.js
index 1865ee4..8f460e4 100644
--- a/src/data/things.js
+++ b/src/data/things.js
@@ -1447,7 +1447,7 @@ Language.propertyDescriptors = {
             dependencies: ['inheritedStrings'],
             transform(strings, { inheritedStrings }) {
                 if (strings || inheritedStrings) {
-                    return {...strings ?? {}, ...inheritedStrings ?? {}};
+                    return {...inheritedStrings ?? {}, ...strings ?? {}};
                 } else {
                     return null;
                 }
@@ -1482,8 +1482,8 @@ Language.propertyDescriptors = {
         expose: {
             dependencies: ['strings', 'inheritedStrings'],
             compute: ({ strings, inheritedStrings }) => Array.from(new Set([
-                ...Object.keys(strings ?? {}),
-                ...Object.keys(inheritedStrings ?? {})
+                ...Object.keys(inheritedStrings ?? {}),
+                ...Object.keys(strings ?? {})
             ]))
         }
     },
@@ -1494,7 +1494,7 @@ Language.propertyDescriptors = {
             dependencies: ['strings', 'inheritedStrings', 'escapeHTML'],
             compute({ strings, inheritedStrings, escapeHTML }) {
                 if (!(strings || inheritedStrings) || !escapeHTML) return null;
-                const allStrings = {...strings ?? {}, ...inheritedStrings ?? {}};
+                const allStrings = {...inheritedStrings ?? {}, ...strings ?? {}};
                 return Object.fromEntries(Object.entries(allStrings)
                     .map(([ k, v ]) => [k, escapeHTML(v)]));
             }
-- 
cgit 1.3.0-6-gf8a5