bai-rubyglot 0.1.0 → 0.1.0.1

data/libraries/rubyglot/i18n.rb

@@ -23,7 +23,8 @@ module RubyGlot #:nodoc:
       @@dictionary
     end
 
-    def lookup(string_to_lookup, context = :default, *args)
+    def lookup(string_to_lookup, *args)
+      context = args.first.is_a?(Symbol) ? args.delete_at(0) : :default
       localized = @@dictionary.entries[string_to_lookup][context.to_sym][:localized] rescue string_to_lookup
       sprintf(localized, *args)
     end

data/rakefile

@@ -1,4 +1,4 @@
-%w(rubygems rake/gempackagetask spec/rake/spectask erb libraries/rubyglot pp).each { |x| require x }
+%w(rubygems rake/gempackagetask spec/rake/spectask erb libraries/rubyglot).each { |x| require x }
 
 Spec::Rake::SpecTask.new("specs") do |t|
   t.spec_opts << '--format' << 'specdoc' << '--colour'
@@ -11,9 +11,24 @@ namespace :rubyglot do
     scan, storage = ENV["SCAN"], ENV["STORAGE"]
     locales = ENV["LOCALES"] ? ENV["LOCALES"].split(",") : ["en_US.UTF-8"]
 
-    template = File.read(File.join("templates", "dictionary.erb"))
+    template = %{require "rubyglot/dictionary_definition"
 
-    @strings = get_localizable_strings(scan)
+module RubyGlot
+  module Definitions
+    include DictionaryDefinition
+
+    dictionary "<%= @locale %>" do |d|
+<% @entries.each do |entry| -%>
+      d.entry "<%= entry %>", {
+        :default => { :localized => "<%= entry %>", :state => "active" }
+      }
+<% end -%>
+    end
+  end
+end
+}
+
+    @entries = get_localizable_strings(scan)
 
     locales.each do |locale|
       @locale = locale
@@ -26,7 +41,24 @@ namespace :rubyglot do
     scan     = ENV["SCAN"]
     storage  = ENV["STORAGE"]
     locales  = ENV["LOCALES"] ? ENV["LOCALES"].split(",") : Dir.glob("#{ENV['STORAGE']}/*.rb").collect { |f| File.basename(f).gsub(".rb", "") }
-    template = File.read(File.join("templates", "dictionary.erb"))
+    template = %{require "rubyglot/dictionary_definition"
+
+module RubyGlot
+  module Definitions
+    include DictionaryDefinition
+
+    dictionary "<%= @locale %>" do |d|
+<% @entries.each do |entry| -%>
+      d.entry "<%= entry[0] %>", {
+<% (array = entry[1].to_a).each do |k, v| -%>
+        :<%= k %> => { :localized => "<%= v[:localized] %>", :state => "<%= v[:state] %>" }<%= "," unless k == array.last[0] %>
+<% end -%>
+      }
+<% end -%>
+    end
+  end
+end
+}
 
     locales.each do |locale|
       RubyGlot.current_locale = locale

data/rubyglot.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "rubyglot"
-  s.version = "0.1.0"
+  s.version = "0.1.0.1"
   s.date = "2008-07-07"
   s.summary = "Ruby internationalization."
   s.email = "beawesomeinstead@yahoo.com"
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.authors = ["beawesomeinstead"]
   s.has_rdoc = false
   s.require_paths = ["libraries"]
-  s.files = ["libraries", "libraries/rubyglot", "libraries/rubyglot/dictionary.rb", "libraries/rubyglot/i18n.rb", "libraries/rubyglot/dictionary_definition.rb", "libraries/rubyglot.rb", "rakefile", "rubyglot.gemspec", "specifications", "specifications/i18n_spec.rb", "specifications/spec_helper.rb", "readme", "templates", "templates/dictionary.erb", "readme", "rakefile", "rubyglot.gemspec"]
+  s.files = ["libraries", "libraries/rubyglot", "libraries/rubyglot/dictionary.rb", "libraries/rubyglot/i18n.rb", "libraries/rubyglot/dictionary_definition.rb", "libraries/rubyglot.rb", "rakefile", "rubyglot.gemspec", "specifications", "specifications/i18n_spec.rb", "specifications/spec_helper.rb", "readme", "readme", "rakefile", "rubyglot.gemspec"]
 end
 
 # Dir.glob("**/*") + ["readme", "rakefile", "rubyglot.gemspec"]

data/specifications/i18n_spec.rb

@@ -13,21 +13,21 @@ describe RubyGlot do
 
   it "should translate strings with namespace (Original/English)" do
     RubyGlot.current_locale = "en_US.UTF-8"
-    localize("lolcatz", "dogs").should == "loldogs"
+    localize("lolcatz", :dogs).should == "loldogs"
   end
 
   it "should translate strings with namespace (Original/Russian)" do
     RubyGlot.current_locale = "ru_RU.UTF-8"
-    localize("lolcatz", "dogs").should == "смешные собачки"
+    localize("lolcatz", :dogs).should == "смешные собачки"
   end
 
   it "should translate strings with number formatting (Original/English)" do
     RubyGlot.current_locale = "en_US.UTF-8"
-    localize("lol %03d dogs", "dogs", 16).should == "lol 016 dogs"
+    localize("lol %03d dogs", :dogs, 16).should == "lol 016 dogs"
   end
 
   it "should translate strings with number formatting (Original/Russian)" do
     RubyGlot.current_locale = "ru_RU.UTF-8"
-    localize("lol %03d dogs", "dogs", 16).should == "лол 0016 собачек"
+    localize("lol %03d dogs", :dogs, 16).should == "лол 0016 собачек"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bai-rubyglot
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.0.1
 platform: ruby
 authors: 
 - beawesomeinstead
@@ -34,8 +34,6 @@ files:
 - specifications/i18n_spec.rb
 - specifications/spec_helper.rb
 - readme
-- templates
-- templates/dictionary.erb
 has_rdoc: false
 homepage: http://github.com/beawesomeinstead/rubyglot/wikis
 post_install_message: 

data/templates/dictionary.erb

@@ -1,17 +0,0 @@
-require "rubyglot/dictionary_definition"
-
-module RubyGlot
-  module Definitions
-    include DictionaryDefinition
-
-    dictionary "<%= @locale %>" do |d|
-<% @entries.each do |entry| -%>
-      d.entry "<%= entry[0] %>", {
-<% (array = entry[1].to_a).each do |k, v| -%>
-        :<%= k %> => { :localized => "<%= v[:localized] %>", :state => "<%= v[:state] %>" }<%= "," unless k == array.last[0] %>
-<% end -%>
-      }
-<% end -%>
-    end
-  end
-end