locale 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b5067e4483f70b673adc2c10098cc668729dedf
-  data.tar.gz: 6de826d9a0bd161fca2c6657d57c7f02d89281b4
+  metadata.gz: 530d2db4f5bc7f68d06654f0a8ec730479e79860
+  data.tar.gz: 72a52587e7410335944d6ac1ab1a769633598c58
 SHA512:
-  metadata.gz: 8f4211d7f06ddac481fd9a5720e7ac8508680a462f76df1e5f58eff532f5c9e9d86c58cc3cf5a27454b15ec32a0e7c95c76d09abd0992e916fb2f45c66529ace
-  data.tar.gz: 38a271195b5a9c8b143f178d8e0f69b478d87fba5941097408d3771be46607c662bd8c7c0ee60211cf1a1ec227bdd25e68c3d75f048c01a103f3637ee8b48d64
+  metadata.gz: 1f3cf2b1775cd5245c7e72ac837e2ec81af7db1b89abeb6771d74393bddde9d28ca4c1d0f73d2a615a474325c726ba37edebcce9551ba84d08b1c97941b244c2
+  data.tar.gz: c2c19cd4920438188f0f9cb7dff4cff07e1e87b8a15c3feb07bd49e9e3c7a4badfc6e950d5477f85e75a8a4134dc24a929782b4a2449d1f7b174dde471b8aef8

data/doc/text/news.md

@@ -1,5 +1,17 @@
 # News
 
+## <a id="2-1-2">2.1.2</a>: 2015-09-15
+
+### Improvements
+
+  * Improved GNU gettext compatibility: Ignored `LANGUAGE` environment
+    variable when either `LC_ALL`, `LC_MESSAGES` or `LANG` is C.
+    [GitHub#6] [Reported by Hleb Valoshka]
+
+### Thanks
+
+  * Hleb Valoshka
+
 ## <a id="2-1-1">2.1.1</a>: 2015-05-16
 
 ### Improvements

data/lib/locale/driver/env.rb

@@ -57,6 +57,7 @@ module Locale
       # Gets the locales from environment variables. (LANGUAGE > LC_ALL > LC_MESSAGES > LANG)
       # * Returns: an Array of the locale as Locale::Tag::Posix or nil.
       def locales
+        return nil if (ENV["LC_ALL"] || ENV["LC_MESSAGES"] || ENV["LANG"]) == "C"
         locales = ENV["LANGUAGE"]
         if (locales != nil and locales.size > 0)
           locs = locales.split(/:/).collect{|v| Locale::Tag::Posix.parse(v)}.compact

data/lib/locale/version.rb

@@ -2,12 +2,12 @@
   version - version information of Ruby-Locale
 
   Copyright (C) 2008 Masao Mutoh
-  Copyright (C) 2013 Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2013-2015 Kouhei Sutou <kou@clear-code.com>
 
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 =end
 module Locale
-  VERSION = "2.1.1"
+  VERSION = "2.1.2"
 end
 

data/test/test_detect_general.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2015  Kouhei Sutou <kou@clear-code.com>
 # Copyright (C) 2012  Hleb Valoshka
 # Copyright (C) 2009-2010  Masao Mutoh
 #
@@ -137,59 +137,136 @@ class TestDetectGeneral < Test::Unit::TestCase
     assert_equal "UTF-8", Locale.charset
   end
 
-  def test_language
-    ENV["LC_ALL"] = "ja_JP.Shift_JIS"
-    ENV["LANGUAGE"] = "zh_CN.UTF-8:ja_JP"
+  sub_test_case "#language" do
+    test "LC_ALL" do
+      ENV["LC_ALL"] = "ja_JP.Shift_JIS"
+      ENV["LANGUAGE"] = "zh_CN.UTF-8:ja_JP"
 
-    tags = Locale.current
-    assert_equal Locale::Tag::Posix, tags[0].class
-    assert_equal Locale::Tag::Posix, tags[1].class
+      tags = Locale.current
+      assert_equal Locale::Tag::Posix, tags[0].class
+      assert_equal Locale::Tag::Posix, tags[1].class
 
-    assert_equal "zh", tags.language
-    assert_equal "CN", tags.region
-    assert_equal "UTF-8", tags.charset
+      assert_equal "zh", tags.language
+      assert_equal "CN", tags.region
+      assert_equal "UTF-8", tags.charset
 
-    assert_equal "zh", tags[0].language
-    assert_equal "CN", tags[0].region
-    assert_equal "UTF-8", tags[0].charset
+      assert_equal "zh", tags[0].language
+      assert_equal "CN", tags[0].region
+      assert_equal "UTF-8", tags[0].charset
 
-    assert_equal "ja", tags[1].language
-    assert_equal "JP", tags[1].region
-    assert_equal nil, tags[1].charset
+      assert_equal "ja", tags[1].language
+      assert_equal "JP", tags[1].region
+      assert_equal nil, tags[1].charset
 
-    assert_equal Locale::TagList.new([Locale::Tag::Posix.new("zh", "CN", "UTF-8"), 
-	           Locale::Tag::Posix.new("ja", "JP")]), tags
+      assert_equal Locale::TagList.new([Locale::Tag::Posix.new("zh", "CN", "UTF-8"),
+                   Locale::Tag::Posix.new("ja", "JP")]), tags
 
-    assert_equal "Shift_JIS", Locale.charset
-  end
+      assert_equal "Shift_JIS", Locale.charset
+    end
 
-  def test_language_strip
-    ENV["LC_ALL"] = "ja_JP.Shift_JIS"
-    ENV["LANGUAGE"] = nil
+    test "LC_ALL=C" do
+      ENV["LC_ALL"] = "C"
+      ENV["LANGUAGE"] = "zh_CN.UTF-8:ja_JP" # ignored
 
-    tags = Locale.current
-    assert_equal 1, tags.size
-    assert_equal Locale::Tag::Posix, tags[0].class
-    assert_equal "ja", tags.language
-    assert_equal "ja", tags[0].language
-    Locale.clear
-    ENV["LANGUAGE"] = ""
+      assert_equal([Locale::Tag::Simple.new("en")],
+                   Locale.current)
+    end
 
-    tags = Locale.current
-    assert_equal 1, tags.size
-    assert_equal Locale::Tag::Posix, tags[0].class
-    assert_equal "ja", tags.language
-    assert_equal "ja", tags[0].language
-    Locale.clear
-    ENV["LANGUAGE"] = "zh_CN.UTF-8:ja_JP"
+    test "LC_MESSAGES=C" do
+      ENV["LC_MESSAGES"] = "C"
+      ENV["LANGUAGE"] = "zh_CN.UTF-8:ja_JP" # ignored
+
+      assert_equal([Locale::Tag::Simple.new("en")],
+                   Locale.current)
+    end
+
+    test "LANG=C" do
+      ENV["LANG"] = "C"
+      ENV["LANGUAGE"] = "zh_CN.UTF-8:ja_JP" # ignored
+
+      assert_equal([Locale::Tag::Simple.new("en")],
+                   Locale.current)
+    end
+
+    test "LC_ALL and LC_MESSAGES=C" do
+      ENV["LC_ALL"] = "ja_JP.Shift_JIS"
+      ENV["LC_MESSAGES"] = "C"
+      ENV["LANGUAGE"] = "zh_CN.UTF-8:ja_JP"
 
-    tags = Locale.current
-    assert_equal 2, tags.size
-    assert_equal Locale::Tag::Posix, tags[0].class
-    assert_equal Locale::Tag::Posix, tags[1].class
-    assert_equal "zh", tags.language
-    assert_equal "zh", tags[0].language
-    assert_equal "ja", tags[1].language
+      assert_equal([
+                     Locale::Tag::Posix.new("zh", "CN", "UTF-8"),
+                     Locale::Tag::Posix.new("ja", "JP"),
+                   ],
+                   Locale.current)
+    end
+
+    test "LC_ALL and LANG=C" do
+      ENV["LC_ALL"] = "ja_JP.Shift_JIS"
+      ENV["LANG"] = "C"
+      ENV["LANGUAGE"] = "zh_CN.UTF-8:ja_JP"
+
+      assert_equal([
+                     Locale::Tag::Posix.new("zh", "CN", "UTF-8"),
+                     Locale::Tag::Posix.new("ja", "JP"),
+                   ],
+                   Locale.current)
+    end
+
+    test "LC_ALL=C and LC_MESSAGES" do
+      ENV["LC_ALL"] = "C"
+      ENV["LC_MESSAGES"] = "ja_JP.Shift_JIS"
+      ENV["LANGUAGE"] = "zh_CN.UTF-8:ja_JP" # ignored
+
+      assert_equal([Locale::Tag::Simple.new("en")],
+                   Locale.current)
+    end
+
+    test "LC_ALL=C and LANG" do
+      ENV["LC_ALL"] = "C"
+      ENV["LANG"] = "ja_JP.Shift_JIS"
+      ENV["LANGUAGE"] = "zh_CN.UTF-8:ja_JP" # ignored
+
+      assert_equal([Locale::Tag::Simple.new("en")],
+                   Locale.current)
+    end
+
+    test "LC_MESSAGES=C and LANG" do
+      ENV["LC_MESSAGES"] = "C"
+      ENV["LANG"] = "ja_JP.Shift_JIS"
+      ENV["LANGUAGE"] = "zh_CN.UTF-8:ja_JP" # ignored
+
+      assert_equal([Locale::Tag::Simple.new("en")],
+                   Locale.current)
+    end
+
+    test "strip" do
+      ENV["LC_ALL"] = "ja_JP.Shift_JIS"
+      ENV["LANGUAGE"] = nil
+
+      tags = Locale.current
+      assert_equal 1, tags.size
+      assert_equal Locale::Tag::Posix, tags[0].class
+      assert_equal "ja", tags.language
+      assert_equal "ja", tags[0].language
+      Locale.clear
+      ENV["LANGUAGE"] = ""
+
+      tags = Locale.current
+      assert_equal 1, tags.size
+      assert_equal Locale::Tag::Posix, tags[0].class
+      assert_equal "ja", tags.language
+      assert_equal "ja", tags[0].language
+      Locale.clear
+      ENV["LANGUAGE"] = "zh_CN.UTF-8:ja_JP"
+
+      tags = Locale.current
+      assert_equal 2, tags.size
+      assert_equal Locale::Tag::Posix, tags[0].class
+      assert_equal Locale::Tag::Posix, tags[1].class
+      assert_equal "zh", tags.language
+      assert_equal "zh", tags[0].language
+      assert_equal "ja", tags[1].language
+    end
   end
 
   def test_no_charset

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locale
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-16 00:00:00.000000000 Z
+date: 2015-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake