]> source.dussan.org Git - redmine.git/commit
Merged r16324 from trunk to 3.3-stable.
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Thu, 2 Feb 2017 07:27:16 +0000 (07:27 +0000)
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Thu, 2 Feb 2017 07:27:16 +0000 (07:27 +0000)
commitb03982e1b74fb9c78df9833d694ade7df3766ee0
tree0e0c30941db94f58822cd8662bc9e404116138f0
parentcca51a8c51c8a0f8615f94a8d4c5b36ab03c2068
Merged r16324 from trunk to 3.3-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.3-stable@16325 e93f8b46-1217-0410-a6f0-8f06a7374b81
Gemfile