mirrors/mastodon
1
0
Fork 1
mirror of https://github.com/glitch-soc/mastodon synced 2025-04-24 21:14:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove unused inherit_locales from flavour definitions (#3044)

Browse source
This commit is contained in:
Claire 2025-04-14 22:41:48 +02:00 • committed by GitHub
parent 0f2407b4c6
commit 3a67407be9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/javascript/flavours/glitch/theme.yml
View file

@ -14,9 +14,6 @@ signed_in_preload:
# language tags and whose default exports are a messages object. # language tags and whose default exports are a messages object.
locales: locales locales: locales
# (OPTIONAL) Which flavour to inherit locales from
inherit_locales: vanilla
# (OPTIONAL) A file to use as the preview screenshot for the flavour, # (OPTIONAL) A file to use as the preview screenshot for the flavour,
# or an array thereof. These are the full path from `app/javascript/`. # or an array thereof. These are the full path from `app/javascript/`.
screenshot: flavours/glitch/images/glitch-preview.png screenshot: flavours/glitch/images/glitch-preview.png

3
config/webpack/configuration.js
View file

@ -14,12 +14,11 @@ const skinFiles = glob.sync('app/javascript/skins/*/*');
const flavours = {}; const flavours = {};
flavourFiles.forEach((flavourFile) => { 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))] = { flavours[basename(dirname(flavourFile))] = {
name: basename(dirname(flavourFile)), name: basename(dirname(flavourFile)),
locales: locales ? join(dirname(flavourFile), locales) : null, locales: locales ? join(dirname(flavourFile), locales) : null,
inherit_locales,
pack_directory: pack_directory, pack_directory: pack_directory,
skin: {}, skin: {},
}; };