about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch
diff options
context:
space:
mode:
authorFire Demon <firedemon@creature.cafe>2020-07-15 20:07:55 -0500
committerFire Demon <firedemon@creature.cafe>2020-08-30 05:41:03 -0500
commit6abeb96a572b0bcd8bc18f84ef47e03d61e3eea4 (patch)
treea460f86353c31beb675cf402191fa0a02cf1596a /app/javascript/flavours/glitch
parent245e70626005e433c32fd0895015213658ea3b27 (diff)
[Localization] Add custom locale for Monsterfork additions and Monsterpit community flavor
Diffstat (limited to 'app/javascript/flavours/glitch')
-rw-r--r--app/javascript/flavours/glitch/locales/en-MP.js4
-rw-r--r--app/javascript/flavours/glitch/locales/en.js3
2 files changed, 5 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/locales/en-MP.js b/app/javascript/flavours/glitch/locales/en-MP.js
new file mode 100644
index 000000000..a84552467
--- /dev/null
+++ b/app/javascript/flavours/glitch/locales/en-MP.js
@@ -0,0 +1,4 @@
+import messages from 'flavours/glitch/locales/en';
+import messages_mp from 'mastodon/locales/en-MP.json';
+
+export default Object.assign({}, messages, messages_mp);
\ No newline at end of file
diff --git a/app/javascript/flavours/glitch/locales/en.js b/app/javascript/flavours/glitch/locales/en.js
index 11bdccfde..90e924d4a 100644
--- a/app/javascript/flavours/glitch/locales/en.js
+++ b/app/javascript/flavours/glitch/locales/en.js
@@ -1,5 +1,4 @@
 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}.',
@@ -65,4 +64,4 @@ const messages = {
   'advanced_options.threaded_mode.tooltip': 'Threaded mode enabled',
 };
 
-export default Object.assign({}, inherited, messages, monsterfork);
+export default Object.assign({}, inherited, messages);