[DRE-commits] [redmine] 03/07: avoid using cached language list created by earlier versions

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository redmine.

commit 145e72b916131b30f9e5b26ce7b391ff62092338
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun Nov 30 20:42:53 2014 -0200

    avoid using cached language list created by earlier versions
---
 debian/changelog                                     |  3 +++
 ...nvalidate-language-cache-from-older-versions.diff | 20 ++++++++++++++++++++
 debian/patches/series                                |  1 +
 3 files changed, 24 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a38a92b..d9ab2ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ redmine (3.0~20140825-2) UNRELEASED; urgency=medium
     when they are installed.
   * debian/patches/drop-update_all.patch: apply upstream patch to fix upgrades
     from wheezy (Closes: #765466)
+  * debian/patches/invalidate-language-cache-from-older-versions.diff: avoid
+    using cached language list created by earlier versions, which is in a
+    incompatible data structure (Closes: #764230)
 
  -- Antonio Terceiro <terceiro at debian.org>  Tue, 04 Nov 2014 09:00:37 -0200
 
diff --git a/debian/patches/invalidate-language-cache-from-older-versions.diff b/debian/patches/invalidate-language-cache-from-older-versions.diff
new file mode 100644
index 0000000..8acfb3c
--- /dev/null
+++ b/debian/patches/invalidate-language-cache-from-older-versions.diff
@@ -0,0 +1,20 @@
+Description: Make sure that invalid cache from older versions is not used for languages_options
+Author: Jean-Philippe Lang <jp_lang at yahoo.fr>
+Origin: upstream
+Bug-Debian: https://bugs.debian.org/764230
+Applied-Upstream: https://www.redmine.org/projects/redmine/repository/revisions/13544
+Reviewed-by: Antonio Terceiro <terceiro at debian.org>
+Last-Update: 2014-11-30
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/lib/redmine/i18n.rb
++++ b/lib/redmine/i18n.rb
+@@ -92,7 +92,7 @@ module Redmine
+     #
+     # The result is cached to prevent from loading all translations files.
+     def languages_options
+-      ActionController::Base.cache_store.fetch "i18n/languages_options" do
++      ActionController::Base.cache_store.fetch "i18n/languages_options/#{Redmine::VERSION}" do
+         valid_languages.map {|lang| [ll(lang.to_s, :general_lang_name), lang.to_s]}.sort {|x,y| x.first <=> y.first }
+       end
+     end
diff --git a/debian/patches/series b/debian/patches/series
index 55010be..75d67f8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@
 2020_load_awesome_nested_set.patch
 gemfile-adjustments.patch
 drop-update_all.patch
+invalidate-language-cache-from-older-versions.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/redmine.git