about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-09-25 04:04:04 +0200
committerGitHub <noreply@github.com>2017-09-25 04:04:04 +0200
commit2c8e3fbbfbe26fb78418324ef14caf13ab207623 (patch)
tree5d33ed814964bba9fd11899087585bda02bd5669 /config
parentb982d549f440cfebadd5dc8d300a506df213bfee (diff)
Generate 500.html with assets:precompile, remove loading from Google Fonts (#5067)
Diffstat (limited to 'config')
-rw-r--r--config/i18n-tasks.yml1
-rw-r--r--config/locales/en.yml1
2 files changed, 2 insertions, 0 deletions
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index b51cf46df..b35e5c09a 100644
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -45,6 +45,7 @@ ignore_missing:
   - 'sessions.{browsers,platforms}.*'
   - 'terms.body_html'
   - 'application_mailer.salutation'
+  - 'errors.500'
 ignore_unused:
   - 'activemodel.errors.*'
   - 'activerecord.attributes.*'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 13280303c..cc440e1b0 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -310,6 +310,7 @@ en:
       content: Security verification failed. Are you blocking cookies?
       title: Security verification failed
     '429': Throttled
+    '500': We're sorry, but something went wrong.
     noscript_html: To use the Mastodon web application, please enable JavaScript. Alternatively, try one of the <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md">native apps</a> for Mastodon for your platform.
   exports:
     blocks: You block