knjrbfw 0.0.85 → 0.0.86

data/VERSION

@@ -1 +1 @@
-0.0.85
+0.0.86

data/knjrbfw.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjrbfw}
-  s.version = "0.0.85"
+  s.version = "0.0.86"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-08-14}
+  s.date = %q{2012-08-17}
   s.description = %q{Including stuff for HTTP, SSH and much more.}
   s.email = %q{k@spernj.org}
   s.extra_rdoc_files = [
@@ -257,6 +257,7 @@ Gem::Specification.new do |s|
     "spec/db_spec.rb",
     "spec/db_spec_encoding_test_file.txt",
     "spec/knjrbfw_spec.rb",
+    "spec/locales_spec.rb",
     "spec/objects_spec.rb",
     "spec/process_meta_spec.rb",
     "spec/process_spec.rb",

data/lib/knj/locales.rb

@@ -1,11 +1,20 @@
 #This module can be used to handel various language-stuff.
 module Knj::Locales
+  LANG_CONVERTIONS = {
+    "en" => "en_GB"
+  }
+  
   #Returns the primary locale, secondary locale and the two put together.
   #===Examples
   # Knj::Locales.lang #=> {"first" => "en", "second" => "GB", "full" => "en_GB"}
   def self.lang
-    match = self.locale.to_s.match(/^([a-z]{2})_([A-Z]{2})/)
-    raise "Could not understand language: #{self.locale}." if !match
+    locale_str = self.locale.to_s
+    
+    #Sometimes language can be 'en'. Convert that to 'en_GB' if that is so.
+    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
         
     return {
       "first" => match[1],
@@ -51,6 +60,8 @@ module Knj::Locales
   # Knj::Locales.number_out(123456.68) #=> "123,456.68"
   def self.number_out(num_str, dec = 2)
     lc = Knj::Locales.localeconv
+    
+    require "php4r"
     return Php4r.number_format(num_str, dec, lc["decimal_point"], lc["thousands_sep"])
   end
   

data/spec/locales_spec.rb

@@ -0,0 +1,9 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "Locales" do
+  it "should do convertions of short formats" do
+    Thread.current[:locale] = "en"
+    res = Knj::Locales.lang
+    raise "Result wasnt as expected: '#{res}'." if res["first"] != "en" or res["second"] != "GB" or res["full"] != "en_GB"
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: knjrbfw
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.85
+  version: 0.0.86
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-14 00:00:00 +02:00
+date: 2012-08-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -373,6 +373,7 @@ files:
 - spec/db_spec.rb
 - spec/db_spec_encoding_test_file.txt
 - spec/knjrbfw_spec.rb
+- spec/locales_spec.rb
 - spec/objects_spec.rb
 - spec/process_meta_spec.rb
 - spec/process_spec.rb
@@ -394,7 +395,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3419271110613537450
+      hash: 1505749877110619661
       segments: 
       - 0
       version: "0"