From 8ee1af95306e4016644ddfd257929eb61851d8fa Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Wed, 26 Apr 2017 09:16:30 +0900
Subject: Move a locale files for ActiveRecord (#2461)

ref #2162 and fix #2460
---
 config/activerecord.en.yml         | 12 ------------
 config/activerecord.ja.yml         | 12 ------------
 config/locales/activerecord.en.yml | 12 ++++++++++++
 config/locales/activerecord.ja.yml | 12 ++++++++++++
 4 files changed, 24 insertions(+), 24 deletions(-)
 delete mode 100644 config/activerecord.en.yml
 delete mode 100644 config/activerecord.ja.yml
 create mode 100644 config/locales/activerecord.en.yml
 create mode 100644 config/locales/activerecord.ja.yml

(limited to 'config')

diff --git a/config/activerecord.en.yml b/config/activerecord.en.yml
deleted file mode 100644
index c3354fa25..000000000
--- a/config/activerecord.en.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-en:
-  activerecord:
-    errors:
-      models:
-        account:
-          attributes:
-            username:
-              invalid: only letters, numbers and underscores
-        status:
-          attributes:
-            reblog:
-              taken: of status already exists
diff --git a/config/activerecord.ja.yml b/config/activerecord.ja.yml
deleted file mode 100644
index 6e6b48496..000000000
--- a/config/activerecord.ja.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-ja:
-  activerecord:
-    errors:
-      models:
-        account:
-          attributes:
-            username:
-              invalid: アルファベット・数値・アンダーバー(_)で入力してください
-        status:
-          attributes:
-            reblog:
-              taken: のブーストはすでに存在します
diff --git a/config/locales/activerecord.en.yml b/config/locales/activerecord.en.yml
new file mode 100644
index 000000000..c3354fa25
--- /dev/null
+++ b/config/locales/activerecord.en.yml
@@ -0,0 +1,12 @@
+en:
+  activerecord:
+    errors:
+      models:
+        account:
+          attributes:
+            username:
+              invalid: only letters, numbers and underscores
+        status:
+          attributes:
+            reblog:
+              taken: of status already exists
diff --git a/config/locales/activerecord.ja.yml b/config/locales/activerecord.ja.yml
new file mode 100644
index 000000000..6e6b48496
--- /dev/null
+++ b/config/locales/activerecord.ja.yml
@@ -0,0 +1,12 @@
+ja:
+  activerecord:
+    errors:
+      models:
+        account:
+          attributes:
+            username:
+              invalid: アルファベット・数値・アンダーバー(_)で入力してください
+        status:
+          attributes:
+            reblog:
+              taken: のブーストはすでに存在します
-- 
cgit