[DRE-commits] [SCM] ruby-activeldap.git branch, master, updated. debian/1.2.4-2-2-g943cd32

[=?UTF-8?Q?Marc=20Dequ=C3=A8nes=20?=(Duck)]

The following commit has been merged in the master branch:
commit 943cd32323bf99918f096903fa9b532b59a2141a
Author: Marc Dequènes (Duck) <Duck at DuckCorp.org>
Date:   Mon Feb 18 01:57:58 2013 +0100

    [fix] patch to fix misnamed japanese locale (s/jp/ja/) in loader

diff --git a/debian/changelog b/debian/changelog
index ec9d958..90e6a15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 ruby-activeldap (1.2.4-3) unstable; urgency=low
 
   * Fixed translation files not installed.
+  * Added patch to fix loading japanese translations.
 
  -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Mon, 18 Feb 2013 00:30:42 +0100
 
diff --git a/debian/patches/gettext_po_path b/debian/patches/gettext_misnamed_locale
similarity index 54%
copy from debian/patches/gettext_po_path
copy to debian/patches/gettext_misnamed_locale
index de997b8..a7ac4f8 100644
--- a/debian/patches/gettext_po_path
+++ b/debian/patches/gettext_misnamed_locale
@@ -1,14 +1,13 @@
 Index: ruby-activeldap/lib/active_ldap/get_text_support.rb
 ===================================================================
---- ruby-activeldap.orig/lib/active_ldap/get_text_support.rb	2013-02-18 00:29:52.000000000 +0100
-+++ ruby-activeldap/lib/active_ldap/get_text_support.rb	2013-02-18 01:43:07.658020919 +0100
-@@ -10,8 +10,7 @@
-       def included(base)
-         base.class_eval do
+--- ruby-activeldap.orig/lib/active_ldap/get_text_support.rb	2013-02-18 01:53:36.122949120 +0100
++++ ruby-activeldap/lib/active_ldap/get_text_support.rb	2013-02-18 01:54:26.370702741 +0100
+@@ -12,7 +12,7 @@
            include(GetText::Translation)
--          po_dir = File.join(File.dirname(__FILE__), "..", "..", "po")
--          po_dir = File.expand_path(po_dir)
-+          po_dir = "/usr/share/ruby-activeldap/po"
+           po_dir = "/usr/share/ruby-activeldap/po"
            GetText.add_text_domain('active-ldap', :path => po_dir, :type => :po)
-           GetText.default_available_locales = ['en', 'jp']
+-          GetText.default_available_locales = ['en', 'jp']
++          GetText.default_available_locales = ['en', 'ja']
            GetText.default_text_domain = "active-ldap"
+         end
+       end
diff --git a/debian/patches/series b/debian/patches/series
index 2905b8f..02b91b9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 gem_sux
 gettext_po_path
+gettext_misnamed_locale

-- 
ruby-activeldap.git