Hello community,
here is the log from the commit of package rubygem-locale for openSUSE:Factory
checked in at 2015-09-24 06:14:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-locale (Old)
and /work/SRC/openSUSE:Factory/.rubygem-locale.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-locale"
Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-locale/rubygem-locale.changes
2015-05-16 19:01:21.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.rubygem-locale.new/rubygem-locale.changes
2015-09-24 06:14:30.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Sep 16 04:28:54 UTC 2015 - co...@suse.com
+
+- updated to version 2.1.2
+ see installed ChangeLog
+
+-------------------------------------------------------------------
Old:
----
locale-2.1.1.gem
New:
----
locale-2.1.2.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-locale.spec ++++++
--- /var/tmp/diff_new_pack.oxy6tR/_old 2015-09-24 06:14:30.000000000 +0200
+++ /var/tmp/diff_new_pack.oxy6tR/_new 2015-09-24 06:14:30.000000000 +0200
@@ -24,7 +24,7 @@
#
Name: rubygem-locale
-Version: 2.1.1
+Version: 2.1.2
Release: 0
%define mod_name locale
%define mod_full_name %{mod_name}-%{version}
++++++ locale-2.1.1.gem -> locale-2.1.2.gem ++++++
Files old/checksums.yaml.gz and new/checksums.yaml.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/doc/text/news.md new/doc/text/news.md
--- old/doc/text/news.md 2015-05-16 04:18:18.000000000 +0200
+++ new/doc/text/news.md 2015-09-15 15:53:46.000000000 +0200
@@ -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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/locale/driver/env.rb new/lib/locale/driver/env.rb
--- old/lib/locale/driver/env.rb 2015-05-16 04:18:18.000000000 +0200
+++ new/lib/locale/driver/env.rb 2015-09-15 15:53:46.000000000 +0200
@@ -57,6 +57,7 @@
# 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/locale/version.rb new/lib/locale/version.rb
--- old/lib/locale/version.rb 2015-05-16 04:18:18.000000000 +0200
+++ new/lib/locale/version.rb 2015-09-15 15:53:46.000000000 +0200
@@ -2,12 +2,12 @@
version - version information of Ruby-Locale
Copyright (C) 2008 Masao Mutoh
- Copyright (C) 2013 Kouhei Sutou <k...@clear-code.com>
+ Copyright (C) 2013-2015 Kouhei Sutou <k...@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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 2015-05-16 04:18:18.000000000 +0200
+++ new/metadata 2015-09-15 15:53:46.000000000 +0200
@@ -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 @@
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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/test/test_detect_general.rb
new/test/test_detect_general.rb
--- old/test/test_detect_general.rb 2015-05-16 04:18:18.000000000 +0200
+++ new/test/test_detect_general.rb 2015-09-15 15:53:46.000000000 +0200
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright (C) 2012 Kouhei Sutou <k...@clear-code.com>
+# Copyright (C) 2012-2015 Kouhei Sutou <k...@clear-code.com>
# Copyright (C) 2012 Hleb Valoshka
# Copyright (C) 2009-2010 Masao Mutoh
#
@@ -137,59 +137,136 @@
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"
-
- 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[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 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
-
- def test_language_strip
- 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
+ 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
+
+ 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 "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 "Shift_JIS", Locale.charset
+ end
+
+ test "LC_ALL=C" do
+ ENV["LC_ALL"] = "C"
+ ENV["LANGUAGE"] = "zh_CN.UTF-8:ja_JP" # ignored
+
+ assert_equal([Locale::Tag::Simple.new("en")],
+ Locale.current)
+ end
+
+ 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"
+
+ 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
