knjrbfw 0.0.109 → 0.0.110

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d06f3b8fb5858475c706b0e96d0ea84aaaee46b3
-  data.tar.gz: cb0362507a02efffa70730b48f54d22359a1b08b
+  metadata.gz: c894f6dac2d6899c0d42d2874968ed41d5878145
+  data.tar.gz: cbeeb680377f41ec8783cf6cf266532d86de000c
 SHA512:
-  metadata.gz: 917af3f60ef434040379f871279a53914242397bb03b124d185e4638a6f96cbe01e9fb9031d8ca00947d95c4d0067f9d55022bcf51cfff36f5fd2589b7bdcf7a
-  data.tar.gz: 971453c478c195c3d79876293050aed6c1883d26b12b0061a74650e60c760e61e6d5b17cf4897f947d4ec44dab0172a6867115713caebbec81faa4b30dde9697
+  metadata.gz: 8173fec01b767f6e7865ee7fd7b6270471eee04803457d6547d24cd9bfad8b6b417c5397ef78185638dd06b90d4de99a4b57645a12d51bb48715aff663ae4f1c
+  data.tar.gz: 126e0ebe86a1c640a4c75d41ffaad9e6ba6585b75aa3c0c6e27d10cca5de585f73812395bf011b1cedaf74933568aaa762f3e071333abc2cadd93e7ac32a9c0c

data/Gemfile.lock

@@ -51,7 +51,7 @@ GEM
       http2
       string-strtr
     rack (1.5.2)
-    rake (10.2.2)
+    rake (10.3.2)
     rdoc (4.1.1)
       json (~> 1.4)
     rmagick (2.13.2)

data/VERSION

@@ -1 +1 @@
-0.0.109
+0.0.110

data/knjrbfw.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "knjrbfw"
-  s.version = "0.0.109"
+  s.version = "0.0.110"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = "2014-04-13"
+  s.date = "2014-05-23"
   s.description = "Including stuff for HTTP, SSH and much more."
   s.email = "k@spernj.org"
   s.extra_rdoc_files = [

data/lib/knj/locales.rb

@@ -18,7 +18,10 @@ module Knj::Locales
     locale_str = Knj::Locales::LANG_CONVERTIONS[locale_str] if Knj::Locales::LANG_CONVERTIONS.key?(locale_str)
     
     match = locale_str.match(/^([a-z]{2})_([A-Z]{2})/)
-    raise "Could not understand language: '#{locale_str}'." if !match
+    if !match
+      match = locale_str.match(/^[a-z]{2}$/)
+      raise "Could not understand language: '#{locale_str}'." unless match
+    end
         
     return {
       "first" => match[1],
@@ -82,6 +85,8 @@ module Knj::Locales
     
     if Thread.current[:locale]
       return Thread.current[:locale]
+    elsif ::Kernel.const_defined?(:I18n) && !I18n.locale.to_s.strip.empty?
+      return I18n.locale
     elsif ENV["LANGUAGE"]
       return ENV["LANGUAGE"]
     elsif ENV["LANG"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knjrbfw
 version: !ruby/object:Gem::Version
-  version: 0.0.109
+  version: 0.0.110
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-13 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wref