From e9d795b6eae66a824409d5c280e48b61f954d80f Mon Sep 17 00:00:00 2001
From: Tse-Ching Ho <tsechingho@gmail.com>
Date: Thu, 3 Jun 2010 21:44:57 +0800
Subject: [PATCH] reflect the changes of "%{}" as interpolation syntax instead
 of deprecated "{{}}" in svenfuchs/i18n 0.4.0 release.

http://github.com/svenfuchs/i18n/commit/8894ee521ef5788c415b625a6daf522af4c416e0
---
 rails/locale/zh-CN.yml | 48 +++++++++++++++++++++---------------------
 rails/locale/zh-TW.yml | 48 +++++++++++++++++++++---------------------
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/rails/locale/zh-CN.yml b/rails/locale/zh-CN.yml
index af771ee33..627ed8c3c 100644
--- a/rails/locale/zh-CN.yml
+++ b/rails/locale/zh-CN.yml
@@ -26,37 +26,37 @@
       half_a_minute: "半分钟"
       less_than_x_seconds:
         one: "不到一秒"
-        other: "不到 {{count}} 秒"
+        other: "不到 %{count} 秒"
       x_seconds:
         one: "一秒"
-        other: "{{count}} 秒"
+        other: "%{count} 秒"
       less_than_x_minutes:
         one: "不到一分钟"
-        other: "不到 {{count}} 分钟"
+        other: "不到 %{count} 分钟"
       x_minutes:
         one: "一分钟"
-        other: "{{count}} 分钟"
+        other: "%{count} 分钟"
       about_x_hours:
         one: "大约一小时"
-        other: "大约 {{count}} 小时"
+        other: "大约 %{count} 小时"
       x_days:
         one: "一天"
-        other: "{{count}} 天"
+        other: "%{count} 天"
       about_x_months:
         one: "大约一个月"
-        other: "大约 {{count}} 个月"
+        other: "大约 %{count} 个月"
       x_months:
         one: "一个月"
-        other: "{{count}} 个月"
+        other: "%{count} 个月"
       about_x_years:
         one: "大约一年"
-        other: "大约 {{count}} 年"
+        other: "大约 %{count} 年"
       over_x_years:
         one: "一年多"
-        other: "{{count}} 年多"
+        other: "%{count} 年多"
       almost_x_years:
         one:   "接近一年"
-        other: "接近 {{count}} 年"
+        other: "接近 %{count} 年"
     prompts:
       year:   "年"
       month:  "月"
@@ -110,8 +110,8 @@
     errors:
       template: # ~ 2.3.5 backward compatible
         header:
-          one: "有 1 个错误发生导致「{{model}}」无法被保存。"
-          other: "有 {{count}} 个错误发生导致「{{model}}」无法被保存。"
+          one: "有 1 个错误发生导致「%{model}」无法被保存。"
+          other: "有 %{count} 个错误发生导致「%{model}」无法被保存。"
         body: "如下字段出现错误："
       messages:
         inclusion: "不包含于列表中"
@@ -121,27 +121,27 @@
         accepted: "必须是可被接受的"
         empty: "不能留空"
         blank: "不能为空字符"
-        too_long: "过长（最长为 {{count}} 个字符）"
-        too_short: "过短（最短为 {{count}} 个字符）"
-        wrong_length: "长度非法（必须为 {{count}} 个字符）"
+        too_long: "过长（最长为 %{count} 个字符）"
+        too_short: "过短（最短为 %{count} 个字符）"
+        wrong_length: "长度非法（必须为 %{count} 个字符）"
         taken: "已经被使用"
         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}}"
+        greater_than: "必须大于 %{count}"
+        greater_than_or_equal_to: "必须大于或等于 %{count}"
+        equal_to: "必须等于 %{count}"
+        less_than: "必须小于 %{count}"
+        less_than_or_equal_to: "必须小于或等于 %{count}"
         odd: "必须为单数"
         even: "必须为双数"
-        record_invalid: "校验失败: {{errors}}"
+        record_invalid: "校验失败: %{errors}"
   
   activemodel:
     errors:
       template:
         header:
-          one: "有 1 个错误发生导致「{{model}}」无法被保存。"
-          other: "有 {{count}} 个错误发生导致「{{model}}」无法被保存。"
+          one: "有 1 个错误发生导致「%{model}」无法被保存。"
+          other: "有 %{count} 个错误发生导致「%{model}」无法被保存。"
         body: "如下字段出现错误："
   
 
diff --git a/rails/locale/zh-TW.yml b/rails/locale/zh-TW.yml
index bc4a61620..353a37400 100644
--- a/rails/locale/zh-TW.yml
+++ b/rails/locale/zh-TW.yml
@@ -26,37 +26,37 @@
       half_a_minute: "半分鐘"
       less_than_x_seconds:
         one: "不到一秒"
-        other: "不到 {{count}} 秒"
+        other: "不到 %{count} 秒"
       x_seconds:
         one: "一秒"
-        other: "{{count}} 秒"
+        other: "%{count} 秒"
       less_than_x_minutes:
         one: "不到一分鐘"
-        other: "不到 {{count}} 分鐘"
+        other: "不到 %{count} 分鐘"
       x_minutes:
         one: "一分鐘"
-        other: "{{count}} 分鐘"
+        other: "%{count} 分鐘"
       about_x_hours:
         one: "大約一小時"
-        other: "大約 {{count}} 小時"
+        other: "大約 %{count} 小時"
       x_days:
         one: "一天"
-        other: "{{count}} 天"
+        other: "%{count} 天"
       about_x_months:
         one: "大約一個月"
-        other: "大約 {{count}} 個月"
+        other: "大約 %{count} 個月"
       x_months:
         one: "一個月"
-        other: "{{count}} 個月"
+        other: "%{count} 個月"
       about_x_years:
         one: "大約一年"
-        other: "大約 {{count}} 年"
+        other: "大約 %{count} 年"
       over_x_years:
         one: "一年多"
-        other: "{{count}} 年多"
+        other: "%{count} 年多"
       almost_x_years:
         one:   "接近一年"
-        other: "接近 {{count}} 年"
+        other: "接近 %{count} 年"
     prompts:
       year:   "年"
       month:  "月"
@@ -110,8 +110,8 @@
     errors:
       template: # ~ 2.3.5 backward compatible
         header:
-          one: "有 1 個錯誤發生使得「{{model}}」無法被儲存。"
-          other: "有 {{count}} 個錯誤發生使得「{{model}}」無法被儲存。"
+          one: "有 1 個錯誤發生使得「%{model}」無法被儲存。"
+          other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。"
         body: "下面欄位有問題："
       messages:
         inclusion: "沒有包含在列表中"
@@ -121,27 +121,27 @@
         accepted: "必須是可被接受的"
         empty: "不能留空"
         blank: "不能是空白字元"
-        too_long: "過長（最長是 {{count}} 個字）"
-        too_short: "過短（最短是 {{count}} 個字）"
-        wrong_length: "字數錯誤（必須是 {{count}} 個字）"
+        too_long: "過長（最長是 %{count} 個字）"
+        too_short: "過短（最短是 %{count} 個字）"
+        wrong_length: "字數錯誤（必須是 %{count} 個字）"
         taken: "已經被使用"
         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}}"
+        greater_than: "必須大於 %{count}"
+        greater_than_or_equal_to: "必須大於或等於 %{count}"
+        equal_to: "必須等於 %{count}"
+        less_than: "必須小於 %{count}"
+        less_than_or_equal_to: "必須小於或等於 %{count}"
         odd: "必須是奇數"
         even: "必須是偶數"
-        record_invalid: "校驗失敗: {{errors}}"
+        record_invalid: "校驗失敗: %{errors}"
   
   activemodel:
     errors:
       template:
         header:
-          one: "有 1 個錯誤發生使得「{{model}}」無法被儲存。"
-          other: "有 {{count}} 個錯誤發生使得「{{model}}」無法被儲存。"
+          one: "有 1 個錯誤發生使得「%{model}」無法被儲存。"
+          other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。"
         body: "下面欄位有問題："