bcardarella-decoder 0.5.1 → 0.6.1

data/README.rdoc

@@ -2,7 +2,7 @@
 
 = Usage
 
- >> Decoder.i18n = :eng
+ >> Decoder.i18n = :en
  >> country = Decoder::Countries[:US]
  >> country.to_s
  => "United States"
@@ -13,7 +13,7 @@
  Currently the yaml files are still quite incomplete. Please fork and populate!
  
 = i18n
- When adding a new language please use the ISO 639-2 Code 3-letter standard.
+ When adding a new language please use the ISO 639-1 Code 2-letter standard.
  You can find the appropriate code for a given language here:
  http://www.loc.gov/standards/iso639-2/php/code_list.php
 

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.6.1

data/decoder.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{decoder}
-  s.version = "0.5.1"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Cardarella"]
-  s.date = %q{2009-09-01}
+  s.date = %q{2009-09-04}
   s.description = %q{Decoder}
   s.email = %q{bcardarella@gmail.com}
   s.extra_rdoc_files = [
@@ -28,10 +28,7 @@ Gem::Specification.new do |s|
      "lib/countries/countries.rb",
      "lib/countries/country.rb",
      "lib/decoder.rb",
-     "lib/i18n/countries/eng.yml",
-     "lib/i18n/states/au/eng.yml",
-     "lib/i18n/states/ca/eng.yml",
-     "lib/i18n/states/us/eng.yml",
+     "lib/locales/en.yml",
      "lib/states/state.rb",
      "test/common_methods_test.rb",
      "test/countries/countries_test.rb",

data/lib/countries/countries.rb

@@ -7,17 +7,17 @@ module Decoder
     end
     
     def load_yaml
-      self.countries = YAML.load_file(yaml_file_name)
+      self.countries = YAML.load_file(yaml_file_name)[Decoder.i18n]
     end
     
     def yaml_file_name
-      "#{File.dirname(__FILE__)}/../i18n/countries/#{Decoder.i18n}.yml"
+      "#{File.dirname(__FILE__)}/../locales/#{Decoder.i18n}.yml"
     end
     
     def [](_code)
       _code   = _code.to_s.upcase
       country = countries[_code]
-      Decoder::Country.new(:code => _code, :name => country)
+      Decoder::Country.new(:code => _code, :name => country[:name])
     end
     
     def self.[](_code)

data/lib/countries/country.rb

@@ -13,11 +13,11 @@ module Decoder
     end
     
     def load_yaml
-      self.states = YAML.load_file(yaml_file_name)
+      self.states = YAML.load_file(yaml_file_name)[Decoder.i18n][self.code][:states]
     end
     
     def yaml_file_name
-      "#{File.dirname(__FILE__)}/../i18n/states/#{code.downcase}/#{Decoder.i18n}.yml"
+      "#{File.dirname(__FILE__)}/../locales/#{Decoder.i18n}.yml"
     end
     
     def [](_code)

data/lib/decoder.rb

@@ -5,7 +5,7 @@ require 'states/state'
 
 module Decoder
   def self.i18n
-    @i18n ||= :eng
+    @i18n ||= :en
   end
   
   def self.i18n=(code)