diff options
| author | ncls7615 <himasoto@gmail.com> | 2017-12-11 09:43:21 +0900 |
|---|---|---|
| committer | ncls7615 <himasoto@gmail.com> | 2017-12-11 09:43:21 +0900 |
| commit | a98b0a47ef19f587da60907b68c5c5edfde432a0 (patch) | |
| tree | 50a37fa1dc6aafb1210a441dd989605a646d3e21 /app/javascript/flavours/vanilla | |
| parent | 0e567977923f2e7827192da0990d529859033f1a (diff) | |
| parent | 26c9b9fa276fd629789fd06f65a5d698b182f67a (diff) | |
Merge branch 'master' of https://github.com/glitch-soc/mastodon into glitch-langfiles
# Conflicts: # app/javascript/glitch/locales/ja.json
Diffstat (limited to 'app/javascript/flavours/vanilla')
| -rw-r--r-- | app/javascript/flavours/vanilla/names.yml | 6 | ||||
| -rw-r--r-- | app/javascript/flavours/vanilla/theme.yml | 10 |
2 files changed, 13 insertions, 3 deletions
diff --git a/app/javascript/flavours/vanilla/names.yml b/app/javascript/flavours/vanilla/names.yml new file mode 100644 index 000000000..8816fcb3a --- /dev/null +++ b/app/javascript/flavours/vanilla/names.yml @@ -0,0 +1,6 @@ +en: + flavours: + vanilla: Vanilla Mastodon + skins: + vanilla: + default: Default diff --git a/app/javascript/flavours/vanilla/theme.yml b/app/javascript/flavours/vanilla/theme.yml index 67fd9723e..491ea173b 100644 --- a/app/javascript/flavours/vanilla/theme.yml +++ b/app/javascript/flavours/vanilla/theme.yml @@ -20,13 +20,17 @@ pack: settings: share: share.js +# (OPTIONAL) The directory which contains localization files for +# the flavour, relative to this directory. +locales: ../../mastodon/locales + # (OPTIONAL) The directory which contains the pack files. -# Defaults to the theme directory (`app/javascript/themes/[theme]`), -# but in the case of the vanilla Mastodon theme the pack files are +# Defaults to this directory (`app/javascript/flavour/[flavour]`), +# but in the case of the vanilla Mastodon flavour the pack files are # somewhere else. pack_directory: app/javascript/packs -# (OPTIONAL) By default the theme will fallback to the default theme +# (OPTIONAL) By default the theme will fallback to the default flavour # if a particular pack is not provided. You can specify different # fallbacks here, or disable fallback behaviours altogether by # specifying a `null` value. |