X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/13289d404188bd397ee72852f66c415a2bb87066..3e65a59b7aa6d49cbecb09223c54e6eca352c39e:/vendor/rails-locales/zh-CN.yml

diff --git a/vendor/rails-locales/zh-CN.yml b/vendor/rails-locales/zh-CN.yml
index 09be871f4..bfe69e29a 100644
--- a/vendor/rails-locales/zh-CN.yml
+++ b/vendor/rails-locales/zh-CN.yml
@@ -178,49 +178,9 @@ zh-CN:
     select:
       prompt: "请选择"
 
-  activerecord:
-    errors:
-      template: # ~ 2.3.5 backward compatible
-        header:
-          one: "有 1 个错误发生导致「%{model}」无法被保存。"
-          other: "有 %{count} 个错误发生导致「%{model}」无法被保存。"
-        body: "如下字段出现错误："
-      full_messages:
-        format: "%{attribute} %{message}"
-      messages:
-        inclusion: "不包含于列表中"
-        exclusion: "是保留关键字"
-        invalid: "是无效的"
-        confirmation: "与确认值不匹配"
-        accepted: "必须是可被接受的"
-        empty: "不能留空"
-        blank: "不能为空字符"
-        too_long: "过长（最长为 %{count} 个字符）"
-        too_short: "过短（最短为 %{count} 个字符）"
-        wrong_length: "长度非法（必须为 %{count} 个字符）"
-        not_a_number: "不是数字"
-        not_an_integer: "必须是整数"
-        greater_than: "必须大于 %{count}"
-        greater_than_or_equal_to: "必须大于或等于 %{count}"
-        equal_to: "必须等于 %{count}"
-        less_than: "必须小于 %{count}"
-        less_than_or_equal_to: "必须小于或等于 %{count}"
-        odd: "必须为单数"
-        even: "必须为双数"
-        taken: "已经被使用"
-        record_invalid: "校验失败: %{errors}"
-
-  activemodel:
-    errors:
-      template:
-        header:
-          one: "有 1 个错误发生导致「%{model}」无法被保存。"
-          other: "有 %{count} 个错误发生导致「%{model}」无法被保存。"
-        body: "如下字段出现错误："
-
   errors:
     format: "%{attribute} %{message}"
-    messages:
+    messages: &errors_messages
       inclusion: "不包含于列表中"
       exclusion: "是保留关键字"
       invalid: "是无效的"
@@ -240,6 +200,22 @@ zh-CN:
       less_than_or_equal_to: "必须小于或等于 %{count}"
       odd: "必须为单数"
       even: "必须为双数"
+      taken: "已经被使用"
+      record_invalid: "验证失败: %{errors}"
+    template: &errors_template
+      header:
+        one: "有 1 个错误发生导致「%{model}」无法被保存。"
+        other: "有 %{count} 个错误发生导致「%{model}」无法被保存。"
+      body: "如下字段出现错误："
+
+  activerecord:
+    errors:
+      full_messages:
+        format: "%{attribute} %{message}"
+      messages:
+        <<: *errors_messages
+      template:
+        <<: *errors_template
 
   helpers:
     select: