[DRE-commits] [ruby-stringex] 01/02: new-i18n.patch: fix to work against new versions of ruby-i18n

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-stringex.

commit 738f7ba911db41ae15949e44b8b341fd66dc8c61
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Jul 31 10:31:12 2015 -0300

    new-i18n.patch: fix to work against new versions of ruby-i18n
---
 debian/changelog              |  4 ++++
 debian/patches/new-i18n.patch | 29 +++++++++++++++++++++++++++++
 debian/patches/series         |  1 +
 3 files changed, 34 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e672197..33d53c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 ruby-stringex (2.5.2-3) UNRELEASED; urgency=medium
 
+  [ Cédric Boutillier ]
   * Fix the number of the bug closed with the previous upload in the changelog
     entry (760912 instead of 756460)
 
+  [ Antonio Terceiro ]
+  * new-i18n.patch: fix to work against new versions of ruby-i18n
+
  -- Cédric Boutillier <boutil at debian.org>  Wed, 10 Sep 2014 07:29:22 +0200
 
 ruby-stringex (2.5.2-2) unstable; urgency=medium
diff --git a/debian/patches/new-i18n.patch b/debian/patches/new-i18n.patch
new file mode 100644
index 0000000..4cd5a2f
--- /dev/null
+++ b/debian/patches/new-i18n.patch
@@ -0,0 +1,29 @@
+From ae20fc6fdc78d0c4c103ca1405b1b6a4c427d33f Mon Sep 17 00:00:00 2001
+From: Antonio Terceiro <terceiro at softwarelivre.org>
+Date: Fri, 31 Jul 2015 10:26:12 -0300
+Subject: [PATCH] Make tests pass against newer versions of i18n
+
+Also add safeguards so the code will still work against older versions.
+
+https://github.com/rsl/stringex/pull/175
+---
+ lib/stringex/localization/backend/i18n.rb | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/lib/stringex/localization/backend/i18n.rb b/lib/stringex/localization/backend/i18n.rb
+index 3518c7c..e7965f4 100644
+--- a/lib/stringex/localization/backend/i18n.rb
++++ b/lib/stringex/localization/backend/i18n.rb
+@@ -5,6 +5,12 @@ class I18n < Base
+         LOAD_PATH_BASE = File.join(File.expand_path(File.dirname(__FILE__)), '..', '..', '..', '..', 'locales')
+ 
+         class << self
++
++          def reset!
++            super
++            ::I18n.reload! if defined?(::I18n) && ::I18n.respond_to?(:reload!)
++          end
++
+           def locale
+             @locale || ::I18n.locale
+           end
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..455712c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+new-i18n.patch

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