From 9f78156206a017ecb04d7d112074f3bf4c6ffe18 Mon Sep 17 00:00:00 2001
From: zhitomirskiyi <ilya@joindiaspora.com>
Date: Sun, 13 Feb 2011 15:09:05 -0800
Subject: [PATCH] broke out the en activerecord validations translations to
 their respective file

---
 config/locales/diaspora/en-AU.yml | 28 ++++++++++++++++++++++++++++
 config/locales/diaspora/en-GB.yml | 28 ++++++++++++++++++++++++++++
 config/locales/diaspora/en-US.yml | 28 ++++++++++++++++++++++++++++
 config/locales/diaspora/en.yml    | 23 -----------------------
 4 files changed, 84 insertions(+), 23 deletions(-)
 create mode 100644 config/locales/diaspora/en-AU.yml
 create mode 100644 config/locales/diaspora/en-GB.yml
 create mode 100644 config/locales/diaspora/en-US.yml

diff --git a/config/locales/diaspora/en-AU.yml b/config/locales/diaspora/en-AU.yml
new file mode 100644
index 000000000..7519fc5ef
--- /dev/null
+++ b/config/locales/diaspora/en-AU.yml
@@ -0,0 +1,28 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+"en-AU":
+  activerecord:
+      errors:
+          models:
+              user:
+                  attributes:
+                      person:
+                          invalid: "is invalid."
+                      username:
+                          taken: "is already taken."
+                      email:
+                          taken: "is already taken."
+              person:
+                  attributes:
+                      diaspora_handle:
+                          taken: "is already taken."
+              contact:
+                  attributes:
+                      person_id:
+                          taken: "must be unique among this user's contacts."
+              request:
+                  attributes:
+                      from_id:
+                          taken: "is a duplicate of a pre-existing request."
diff --git a/config/locales/diaspora/en-GB.yml b/config/locales/diaspora/en-GB.yml
new file mode 100644
index 000000000..e94da4f0f
--- /dev/null
+++ b/config/locales/diaspora/en-GB.yml
@@ -0,0 +1,28 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+"en-GB":
+  activerecord:
+      errors:
+          models:
+              user:
+                  attributes:
+                      person:
+                          invalid: "is invalid."
+                      username:
+                          taken: "is already taken."
+                      email:
+                          taken: "is already taken."
+              person:
+                  attributes:
+                      diaspora_handle:
+                          taken: "is already taken."
+              contact:
+                  attributes:
+                      person_id:
+                          taken: "must be unique among this user's contacts."
+              request:
+                  attributes:
+                      from_id:
+                          taken: "is a duplicate of a pre-existing request."
diff --git a/config/locales/diaspora/en-US.yml b/config/locales/diaspora/en-US.yml
new file mode 100644
index 000000000..55523b72a
--- /dev/null
+++ b/config/locales/diaspora/en-US.yml
@@ -0,0 +1,28 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+"en-US":
+  activerecord:
+      errors:
+          models:
+              user:
+                  attributes:
+                      person:
+                          invalid: "is invalid."
+                      username:
+                          taken: "is already taken."
+                      email:
+                          taken: "is already taken."
+              person:
+                  attributes:
+                      diaspora_handle:
+                          taken: "is already taken."
+              contact:
+                  attributes:
+                      person_id:
+                          taken: "must be unique among this user's contacts."
+              request:
+                  attributes:
+                      from_id:
+                          taken: "is a duplicate of a pre-existing request."
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 317c87ced..7dbb4b7eb 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -50,29 +50,6 @@ en:
   _contact: "Contact"
   _contacts: "Contacts"
 
-  activemodel:
-      errors:
-          models:
-              user:
-                  attributes:
-                      person:
-                          invalid: "is invalid."
-                      username:
-                          taken: "is already taken."
-                      email:
-                          taken: "is already taken."
-              person:
-                  attributes:
-                      diaspora_handle:
-                          taken: "is already taken."
-              contact:
-                  attributes:
-                      person_id:
-                          taken: "must be unique among this user's contacts."
-              request:
-                  attributes:
-                      from_id:
-                          taken: "is a duplicate of a pre-existing request."
   application:
       helper:
           unknown_person: "unknown person"