From 3a67407be9c8345474799f8f4557251d64d4bd54 Mon Sep 17 00:00:00 2001 From: Claire Date: Mon, 14 Apr 2025 22:41:48 +0200 Subject: [PATCH] Remove unused `inherit_locales` from flavour definitions (#3044) --- app/javascript/flavours/glitch/theme.yml | 3 --- config/webpack/configuration.js | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/app/javascript/flavours/glitch/theme.yml b/app/javascript/flavours/glitch/theme.yml index 976e7cb506..fd4715b73b 100644 --- a/app/javascript/flavours/glitch/theme.yml +++ b/app/javascript/flavours/glitch/theme.yml @@ -14,9 +14,6 @@ signed_in_preload: # language tags and whose default exports are a messages object. locales: locales -# (OPTIONAL) Which flavour to inherit locales from -inherit_locales: vanilla - # (OPTIONAL) A file to use as the preview screenshot for the flavour, # or an array thereof. These are the full path from `app/javascript/`. screenshot: flavours/glitch/images/glitch-preview.png diff --git a/config/webpack/configuration.js b/config/webpack/configuration.js index c9a1fe268a..8133673633 100644 --- a/config/webpack/configuration.js +++ b/config/webpack/configuration.js @@ -14,12 +14,11 @@ const skinFiles = glob.sync('app/javascript/skins/*/*'); const flavours = {}; flavourFiles.forEach((flavourFile) => { - const { locales, inherit_locales, pack_directory } = load(readFileSync(flavourFile), 'utf8'); + const { locales, pack_directory } = load(readFileSync(flavourFile), 'utf8'); flavours[basename(dirname(flavourFile))] = { name: basename(dirname(flavourFile)), locales: locales ? join(dirname(flavourFile), locales) : null, - inherit_locales, pack_directory: pack_directory, skin: {}, };