about summary refs log tree commit diff
path: root/config
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 /config
parente82adc250fc201f8d4638a22207183a4ebdc780e (diff)
Move Monsterfork locale modifications into own directories
Diffstat (limited to 'config')
-rw-r--r--config/initializers/locale.rb1
-rw-r--r--config/locales-monsterfork/en.yml16
-rw-r--r--config/locales-monsterfork/simple_form.en.yml3
-rw-r--r--config/locales/en.yml5
4 files changed, 20 insertions, 5 deletions
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