← Back to branch summary

~ubuntu-branches/ubuntu/quantal/ruby1.9.1/quantal

« back to all changes in this revision

Viewing changes to lib/irb/locale.rb

  • Committer: Bazaar Package Importer
  • Author(s): Lucas Nussbaum, Daigo Moriwaki, Lucas Nussbaum
  • Date: 2011-07-25 20:27:20 UTC
  • mfrom: (1.1.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20110725202720-9qfs7iam0ml7e1kc
Tags: 1.9.2.290-1
http://bugs.debian.org/628450
[ Daigo Moriwaki ]
* New upstream release.
* Removed debian/patches/110411_disable_osslv2.patch, which has been applied
  by the upstream.
* Added a patch: debian/patches/debian/patches/110716-bigdecimal,
  which was backported from the upstream (r30993)
  (CVE-2011-0188; Closes: 628450)

[ Lucas Nussbaum ]
* Build-depend on tcl-dev and tk-dev instead of {tcl,tk}8.4-dev.
* Update Lucas' email address.
* Add 110825-ossl-config.diff: backport changes to the OpenSSL
  extension to fix test failure.
* Add patch 110720_tcltk_disable_rpath.diff: disable rpath in tcltk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/irb/locale.rb
1
1
#
2
2
#   irb/locale.rb - internationalization module
3
3
#       $Release Version: 0.9.6$
4
 
#       $Revision: 30563 $
 
4
#       $Revision: 31201 $
5
5
#       by Keiju ISHITSUKA(keiju@ruby-lang.org)
6
6
#
7
7
# --
10
10
#
11
11
module IRB
12
12
  class Locale
13
 
    @RCS_ID='-$Id: locale.rb 30563 2011-01-16 12:34:36Z yugui $-'
 
13
    @RCS_ID='-$Id: locale.rb 31201 2011-03-28 13:40:53Z yugui $-'
14
14
 
15
15
    LOCALE_NAME_RE = %r[
16
16
      (?<language>[[:alpha:]]{2,3})
147
147
          full_path = File.join(libpath, lc_path)
148
148
          return full_path if File.readable?(full_path)
149
149
        end
150
 
        redo if Gem.try_activate(lc_path)
 
150
        redo if defined?(Gem) and Gem.try_activate(lc_path)
151
151
      end
152
152
      nil
153
153
    end