From 3367f3d12f8d1bc11bbc01f9f1be8cee01b21a44 Mon Sep 17 00:00:00 2001 From: Fire Demon Date: Mon, 13 Jul 2020 21:59:36 -0500 Subject: Move Monsterfork locale modifications into own directories --- app/javascript/flavours/glitch/locales/en.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/javascript/flavours/glitch') 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); -- cgit