Rename themes -> flavours ? ?

config/locales/simple_form.en.yml

@@ -14,8 +14,8 @@ en:
           one: <span class="note-counter">1</span> character left
           other: <span class="note-counter">%{count}</span> characters left
         setting_noindex: Affects your public profile and status pages
-        setting_theme: Affects how Mastodon looks when you're logged in from any device.
-        setting_skin: Reskins the selected Mastodon theme
+        setting_flavour: Affects how Mastodon looks when you're logged in from any device
+        setting_skin: Reskins the selected Mastodon flavour
       imports:
         data: CSV file exported from another Mastodon instance
       sessions:
@@ -47,7 +47,7 @@ en:
         setting_noindex: Opt-out of search engine indexing
         setting_reduce_motion: Reduce motion in animations
         setting_system_font_ui: Use system's default font
-        setting_theme: Site theme
+        setting_flavour: Mastodon Flavour
         setting_skin: Skin
         setting_unfollow_modal: Show confirmation dialog before unfollowing someone
         severity: Severity

config/settings.yml

@@ -25,7 +25,7 @@ defaults: &defaults
   reduce_motion: false
   system_font_ui: false
   noindex: false
-  theme: 'glitch'
+  flavour: 'glitch'
   skin: 'default'
   notification_emails:
     follow: false

config/webpack/configuration.js

@@ -9,9 +9,9 @@ const glob = require('glob');
 const configPath = resolve('config', 'webpacker.yml');
 const loadersDir = join(__dirname, 'loaders');
 const settings = safeLoad(readFileSync(configPath), 'utf8')[env.NODE_ENV];
-const themeFiles = glob.sync('app/javascript/themes/*/theme.yml');
+const flavourFiles = glob.sync('app/javascript/flavours/*/theme.yml');
 const skinFiles = glob.sync('app/javascript/skins/*/*');
-const themes = {};
+const flavours = {};
 
 const core = function () {
   const coreFile = resolve('app', 'javascript', 'core', 'theme.yml');
@@ -22,16 +22,16 @@ const core = function () {
   return data.pack ? data : {};
 }();
 
-for (let i = 0; i < themeFiles.length; i++) {
-  const themeFile = themeFiles[i];
-  const data = safeLoad(readFileSync(themeFile), 'utf8');
-  data.name = basename(dirname(themeFile));
+for (let i = 0; i < flavourFiles.length; i++) {
+  const flavourFile = flavourFiles[i];
+  const data = safeLoad(readFileSync(flavourFile), 'utf8');
+  data.name = basename(dirname(flavourFile));
   data.skin = {};
   if (!data.pack_directory) {
-    data.pack_directory = dirname(themeFile);
+    data.pack_directory = dirname(flavourFile);
   }
   if (data.pack && typeof data.pack === 'object') {
-    themes[data.name] = data;
+    flavours[data.name] = data;
   }
 }
 
@@ -39,10 +39,10 @@ for (let i = 0; i < skinFiles.length; i++) {
   const skinFile = skinFiles[i];
   let skin = basename(skinFile);
   const name = basename(dirname(skinFile));
-  if (!themes[name]) {
+  if (!flavours[name]) {
     continue;
   }
-  const data = themes[name].skin;
+  const data = flavours[name].skin;
   if (lstatSync(skinFile).isDirectory()) {
     data[skin] = {};
     const skinPacks = glob.sync(skinFile, '*.{css,scss}');
@@ -76,7 +76,7 @@ const output = {
 module.exports = {
   settings,
   core,
-  themes,
+  flavours,
   env,
   loadersDir,
   output,

config/webpack/shared.js

@@ -6,7 +6,7 @@ const { sync } = require('glob');
 const ExtractTextPlugin = require('extract-text-webpack-plugin');
 const ManifestPlugin = require('webpack-manifest-plugin');
 const extname = require('path-complete-extname');
-const { env, settings, core, themes, output, loadersDir } = require('./configuration.js');
+const { env, settings, core, flavours, output, loadersDir } = require('./configuration.js');
 const localePackPaths = require('./generateLocalePacks');
 
 function reducePacks (data, into = {}) {
@@ -20,7 +20,7 @@ function reducePacks (data, into = {}) {
     }
     const packFile = typeof pack === 'string' ? pack : pack.filename;
     if (packFile) {
-      map[data.name ? `themes/${data.name}/${entry}` : `core/${entry}`] = resolve(data.pack_directory, packFile);
+      map[data.name ? `flavours/${data.name}/${entry}` : `core/${entry}`] = resolve(data.pack_directory, packFile);
     }
     return map;
   }, into);
@@ -54,7 +54,7 @@ module.exports = {
       return localMap;
     }, {}),
     reducePacks(core),
-    Object.keys(themes).reduce((map, entry) => reducePacks(themes[entry], map), {})
+    Object.keys(flavours).reduce((map, entry) => reducePacks(flavours[entry], map), {})
   ),
 
   output: {