From 3367f3d12f8d1bc11bbc01f9f1be8cee01b21a44 Mon Sep 17 00:00:00 2001
From: Fire Demon <firedemon@creature.cafe>
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 ++-
 app/javascript/locales/monsterfork/en.json   | 3 +++
 app/javascript/mastodon/locales/en.json      | 1 -
 3 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 app/javascript/locales/monsterfork/en.json

(limited to 'app/javascript')

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);
diff --git a/app/javascript/locales/monsterfork/en.json b/app/javascript/locales/monsterfork/en.json
new file mode 100644
index 000000000..24f9989f8
--- /dev/null
+++ b/app/javascript/locales/monsterfork/en.json
@@ -0,0 +1,3 @@
+{
+  "status.edited": "{count, plural, one {# edit} other {# edits}} · last update: {updated_at}"
+}
\ No newline at end of file
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 7702c8be1..025ae6e7d 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -380,7 +380,6 @@
   "status.delete": "Delete",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
-  "status.edited": "{count, plural, one {# edit} other {# edits}} · last update: {updated_at}",
   "status.embed": "Embed",
   "status.favourite": "Favourite",
   "status.filtered": "Filtered",
-- 
cgit