From b7e65a004f4b02a732282c34c6c08ff3ae28ffc0 Mon Sep 17 00:00:00 2001
From: MitarashiDango <MitarashiDango@users.noreply.github.com>
Date: Sun, 8 Oct 2017 01:32:03 +0900
Subject: [PATCH] Japanese translation (relative time) (#5251)

---
 .../mastodon/locales/defaultMessages.json     | 25 +++++++++++++++++++
 app/javascript/mastodon/locales/ja.json       |  5 ++++
 2 files changed, 30 insertions(+)

diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index 1e7fef6be6..7e8447e4f6 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -132,6 +132,31 @@
     ],
     "path": "app/javascript/mastodon/components/missing_indicator.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "now",
+        "id": "relative_time.just_now"
+      },
+      {
+        "defaultMessage": "{number}s",
+        "id": "relative_time.seconds"
+      },
+      {
+        "defaultMessage": "{number}m",
+        "id": "relative_time.minutes"
+      },
+      {
+        "defaultMessage": "{number}h",
+        "id": "relative_time.hours"
+      },
+      {
+        "defaultMessage": "{number}d",
+        "id": "relative_time.days"
+      }
+    ],
+    "path": "app/javascript/mastodon/components/relative_timestamp.json"
+  },
   {
     "descriptors": [
       {
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 11356c6dbb..ce797a7c70 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -160,6 +160,11 @@
   "privacy.public.short": "公開",
   "privacy.unlisted.long": "公開TLで表示しない",
   "privacy.unlisted.short": "未収載",
+  "relative_time.days": "{number}日前",
+  "relative_time.hours": "{number}時間前",
+  "relative_time.just_now": "今",
+  "relative_time.minutes": "{number}分前",
+  "relative_time.seconds": "{number}秒前",
   "reply_indicator.cancel": "キャンセル",
   "report.placeholder": "コメント",
   "report.submit": "通報する",
-- 
GitLab