Move Monsterfork locale modifications into own directories

7 files changed, 25 insertions, 7 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);
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",
diff --git a/config/initializers/locale.rb b/config/initializers/locale.rb
index fed182a71..aa271dc56 100644
--- a/config/initializers/locale.rb
+++ b/config/initializers/locale.rb
@@ -5,3 +5,4 @@ I18n.load_path += Dir[Rails.root.join('app', 'javascript', 'flavours', '*', 'nam
 I18n.load_path += Dir[Rails.root.join('app', 'javascript', 'skins', '*', '*', 'names.{rb,yml}').to_s]
 I18n.load_path += Dir[Rails.root.join('app', 'javascript', 'skins', '*', '*', 'names', '*.{rb,yml}').to_s]
 I18n.load_path += Dir[Rails.root.join('config', 'locales-glitch', '*.{rb,yml}').to_s]
+I18n.load_path += Dir[Rails.root.join('config', 'locales-monsterfork', '*.{rb,yml}').to_s]
diff --git a/config/locales-monsterfork/en.yml b/config/locales-monsterfork/en.yml
new file mode 100644
index 000000000..e0f9cead8
--- /dev/null
+++ b/config/locales-monsterfork/en.yml
@@ -0,0 +1,16 @@
+---
+en:
+  about:
+    available_content: Connected servers
+    available_content_html: 'Users and content from these servers can be interacted with from here:'
+  admin:
+    dashboard:
+      feature_hcaptcha: hCaptcha
+    domain_allows:
+      hidden: Exclude from public server list
+    settings:
+      domain_allows:
+        title: Show allowed domains
+      registrations:
+        errors:
+          captcha_fail: Captcha verification failed
\ No newline at end of file
diff --git a/config/locales-monsterfork/simple_form.en.yml b/config/locales-monsterfork/simple_form.en.yml
new file mode 100644
index 000000000..3e7775159
--- /dev/null
+++ b/config/locales-monsterfork/simple_form.en.yml
@@ -0,0 +1,3 @@
+---
+en:
+  simple_form:
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1073b51d9..40adfc21e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -35,8 +35,6 @@ en:
     status_count_before: Who authored
     tagline: Follow friends and discover new ones
     terms: Terms of service
-    available_content: Connected servers
-    available_content_html: 'Users and content from these servers can be interacted with from here:'
     unavailable_content: Moderated servers
     unavailable_content_description:
       domain: Server
@@ -358,7 +356,6 @@ en:
       created_msg: Domain has been successfully allowed for federation
       destroyed_msg: Domain has been disallowed from federation
       undo: Disallow federation with domain
-      hidden: Exclude from public server list
     domain_blocks:
       add_new: Add new domain block
       created_msg: Domain block is now being processed
@@ -511,8 +508,6 @@ en:
       default_noindex:
         desc_html: Affects all users who have not changed this setting themselves
         title: Opt users out of search engine indexing by default
-      domain_allows:
-        title: Show allowed domains
       domain_blocks:
         all: To everyone
         disabled: To no one