[DRE-commits] [ruby-locale] 03/03: Read data from /usr/share

[Hleb Valoshka]

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

tsfgnu-guest pushed a commit to branch patch-queue/master
in repository ruby-locale.

commit 596bb536f82c8659f93fee519273805149e0fece
Author: Hleb Valoshka <375gnu at gmail.com>
Date:   Tue Sep 15 19:25:41 2015 +0300

    Read data from /usr/share
---
 lib/locale.rb               | 6 ++++++
 lib/locale/info/language.rb | 2 +-
 lib/locale/info/region.rb   | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/locale.rb b/lib/locale.rb
index d746f33..3ef3c24 100644
--- a/lib/locale.rb
+++ b/lib/locale.rb
@@ -42,6 +42,12 @@ module Locale
     end
   end
 
+  module_function
+  def root #:nodoc:
+    Dir[File.join(File.dirname(__FILE__), '../../../share/ruby-locale'),
+        File.join(File.dirname(__FILE__), 'locale'),
+        '/usr/share/ruby-locale' ].first
+  end
   # Initialize Locale library. 
   # Usually, you don't need to call this directly, because
   # this is called when Locale's methods are called.
diff --git a/lib/locale/info/language.rb b/lib/locale/info/language.rb
index 45d25ce..c272e9e 100644
--- a/lib/locale/info/language.rb
+++ b/lib/locale/info/language.rb
@@ -90,7 +90,7 @@ module Locale
     @@lang_two_codes = Hash.new
     @@lang_three_codes = Hash.new
 
-    Zlib::GzipReader.open(File.dirname(__FILE__) + "/../data/languages.tab.gz") do |gz|
+    Zlib::GzipReader.open(File.join(Locale.root, "data/languages.tab.gz")) do |gz|
       gz.readlines.each do |l|
         l.force_encoding('UTF-8') if l.respond_to?(:force_encoding)
         unless l =~ /^\s*$/
diff --git a/lib/locale/info/region.rb b/lib/locale/info/region.rb
index daf1924..8a25095 100644
--- a/lib/locale/info/region.rb
+++ b/lib/locale/info/region.rb
@@ -37,7 +37,7 @@ module Locale
     end
 
     @@regions = Hash.new
-    Zlib::GzipReader.open(File.dirname(__FILE__) + "/../data/regions.tab.gz") do |gz|
+    Zlib::GzipReader.open(File.join(Locale.root,  "data/regions.tab.gz")) do |gz|
       gz.readlines.each do |l|
         l.force_encoding('UTF-8') if l.respond_to?(:force_encoding)
         unless l =~ /^\s*$/

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