Merged r16324 from trunk to 3.2-stable.

Gemfile: pin i18n version 0.7.0.

i18n 0.8.0 causes error.

<pre>
Redmine::I18nTest#test_languages_options_should_ignore_locales_without_general_lang_name_key:
I18n::InvalidLocale: "foo" is not a valid locale
    lib/redmine/i18n.rb:58:in `ll'
    lib/redmine/i18n.rb:122:in `block in languages_options'
    lib/redmine/i18n.rb:122:in `map'
    lib/redmine/i18n.rb:122:in `languages_options'
    test/unit/lib/redmine/i18n_test.rb:203:in `test_languages_options_should_ignore_locales_without_general_lang_name_key'
</pre>

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16326 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/Gemfile b/Gemfile
index 2d9d7aaf3fb7b5b62c0024a1e9093ccbc3d588be..8fcc5881ff0182dfceca75753d4ee90287b4312d 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -18,6 +18,7 @@ gem "roadie-rails"
 gem "mimemagic"
 
 gem "nokogiri", "~> 1.6.8"
+gem "i18n", "~> 0.7.0"
 
 # Request at least rails-html-sanitizer 1.0.3 because of security advisories 
 gem "rails-html-sanitizer", ">= 1.0.3"