about summary refs log tree commit diff
path: root/config/locales
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-12-18 19:47:11 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-12-18 19:47:11 +0100
commit5ae1b39ec9b4d5269d2f01aeaa4304252b694519 (patch)
tree7b9f058c315189d2e557830b4108b5755ede5603 /config/locales
parentaed25932b528f16861c4e016cbeb7a3de6231fe7 (diff)
Adjusting public display of statuses to look similar to logged-in UI,
fix #361 with rich OEmbed display via iframe, fix #237 by hiding sensitive
content behind a spoiler on public pages
Diffstat (limited to 'config/locales')
-rw-r--r--config/locales/en.yml19
1 files changed, 19 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 50a1f0e95..f58ce9a71 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -26,6 +26,20 @@ en:
     resend_confirmation: Resend confirmation instructions
     reset_password: Reset password
     set_new_password: Set new password
+  datetime:
+    distance_in_words:
+      about_x_hours: "%{count}h"
+      about_x_months: "%{count}mo"
+      about_x_years: "%{count}y"
+      almost_x_years: "%{count}y"
+      half_a_minute: Just now
+      less_than_x_minutes: "%{count}m"
+      less_than_x_seconds: Just now
+      over_x_years: "%{count}y"
+      x_days: "%{count}d"
+      x_minutes: "%{count}m"
+      x_months: "%{count}mo"
+      x_seconds: "%{count}s"
   generic:
     changes_saved_msg: Changes successfully saved!
     powered_by: powered by %{link}
@@ -53,8 +67,13 @@ en:
     edit_profile: Edit profile
     preferences: Preferences
   stream_entries:
+    click_to_show: Click to show
     favourited: favourited a post by
     is_now_following: is now following
+    sensitive_content: Sensitive content
+  time:
+    formats:
+      default: "%b %d, %Y, %H:%M"
   users:
     invalid_email: The e-mail address is invalid
   will_paginate: