about summary refs log tree commit diff
path: root/app/javascript/flavours/vanilla
diff options
context:
space:
mode:
authorbeatrix <beatrix.bitrot@gmail.com>2017-12-10 15:41:22 -0500
committerGitHub <noreply@github.com>2017-12-10 15:41:22 -0500
commit26c9b9fa276fd629789fd06f65a5d698b182f67a (patch)
tree8480daa3428db3a2443ba45949a4182481e5ec16 /app/javascript/flavours/vanilla
parent282f48ddd1868fcd8fa2887bbaf13036c949c22d (diff)
parent64b839b76907e87c57d71762a81a9a8660f1df83 (diff)
Merge pull request #246 from glitch-soc/theme-intl8n
Internationalization for flavours and skins
Diffstat (limited to 'app/javascript/flavours/vanilla')
-rw-r--r--app/javascript/flavours/vanilla/names.yml6
-rw-r--r--app/javascript/flavours/vanilla/theme.yml10
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.