about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/locales/en.js
diff options
context:
space:
mode:
authorFire Demon <firedemon@creature.cafe>2020-07-13 21:59:36 -0500
committerFire Demon <firedemon@creature.cafe>2020-08-30 05:41:03 -0500
commit3367f3d12f8d1bc11bbc01f9f1be8cee01b21a44 (patch)
tree1daa46b9043bed052bb3d0a6fc96ce9c577d4dda /app/javascript/flavours/glitch/locales/en.js
parente82adc250fc201f8d4638a22207183a4ebdc780e (diff)
Move Monsterfork locale modifications into own directories
Diffstat (limited to 'app/javascript/flavours/glitch/locales/en.js')
-rw-r--r--app/javascript/flavours/glitch/locales/en.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/locales/en.js b/app/javascript/flavours/glitch/locales/en.js
index 90e924d4a..11bdccfde 100644
--- a/app/javascript/flavours/glitch/locales/en.js
+++ b/app/javascript/flavours/glitch/locales/en.js
@@ -1,4 +1,5 @@
 import inherited from 'mastodon/locales/en.json';
+import monsterfork from 'locales/monsterfork/en.json';
 
 const messages = {
   'getting_started.open_source_notice': 'Glitchsoc is free open source software forked from {Mastodon}. You can contribute or report issues on GitHub at {github}.',
@@ -64,4 +65,4 @@ const messages = {
   'advanced_options.threaded_mode.tooltip': 'Threaded mode enabled',
 };
 
-export default Object.assign({}, inherited, messages);
+export default Object.assign({}, inherited, messages, monsterfork);