From: Tom Hughes <tom@compton.nu>
Date: Thu, 20 Jun 2019 17:58:38 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2270'
X-Git-Tag: live~2552
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/80427b3e5e5ebeecbc0a57a1549a2a33e0c92199?hp=6b6345ecdba2589df96489b259651adb4c764362

Merge remote-tracking branch 'upstream/pull/2270'
---

diff --git a/config/locales/en.yml b/config/locales/en.yml
index d7127a4e9..0281703ab 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -103,6 +103,45 @@ en:
         description: "Description"
         languages: "Languages"
         pass_crypt: "Password"
+  datetime:
+    distance_in_words_ago:
+      about_x_hours:
+        one: about 1 hour ago
+        other: about %{count} hours ago
+      about_x_months:
+        one: about 1 month ago
+        other: about %{count} months ago
+      about_x_years:
+        one: about 1 year ago
+        other: about %{count} years ago
+      almost_x_years:
+        one: almost 1 year ago
+        other: almost %{count} years ago
+      half_a_minute: half a minute ago
+      less_than_x_seconds:
+        one: less than 1 second ago
+        other: less than %{count} seconds ago
+      less_than_x_minutes:
+        one: less than a minute ago
+        other: less than %{count} minutes ago
+      over_x_years:
+        one: over 1 year ago
+        other: over %{count} years ago
+      x_seconds:
+        one: 1 second ago
+        other: "%{count} seconds ago"
+      x_minutes:
+        one: 1 minute ago
+        other: "%{count} minutes ago"
+      x_days:
+        one: 1 day ago
+        other: "%{count} days ago"
+      x_months:
+        one: 1 month ago
+        other: "%{count} months ago"
+      x_years:
+        one: 1 year ago
+        other: "%{count} years ago"
   printable_name:
     with_id: "%{id}"
     with_version: "%{id}, v%{version}"