diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-12-16 13:40:28 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-12-16 13:40:28 +0000 |
| commit | cdde98cfe4705f73d103ab37453186d9b69234db (patch) | |
| tree | 1d587b6c20269ab43a178da9aeecf8ee7fba914d | |
| parent | 38b21c1f091f78adc3cba8bea93467a0adf3bc42 (diff) | |
| parent | 65a961c4e74ca56f50468f1194e0d080169ce04a (diff) | |
Merge branch 'rails-3-develop' into release/0.16
| -rw-r--r-- | lib/i18n_fixes.rb | 2 | ||||
| -rw-r--r-- | locale/fr/app.po | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/i18n_fixes.rb b/lib/i18n_fixes.rb index 9f0849e75..64c370477 100644 --- a/lib/i18n_fixes.rb +++ b/lib/i18n_fixes.rb @@ -35,7 +35,7 @@ def gettext_interpolate(string, values) pattern, key = $1, $1.to_sym if !values.include?(key) - raise I18n::MissingInterpolationArgument.new(pattern, string) + raise I18n::MissingInterpolationArgument.new(pattern, string, values) else v = values[key].to_s if safe && !v.html_safe? diff --git a/locale/fr/app.po b/locale/fr/app.po index b72f71dea..5b22e2172 100644 --- a/locale/fr/app.po +++ b/locale/fr/app.po @@ -634,7 +634,7 @@ msgid "Date:" msgstr "Date:" msgid "Dear {{name}}," -msgstr "Cher {{nom}}," +msgstr "Cher {{name}}," msgid "Dear {{public_body_name}}," msgstr "Cher {{public_body_name}}," |