genki-merb_babel 0.1.1.2 → 0.1.1.3

data/Rakefile

@@ -5,7 +5,7 @@ require 'merb-core'
 require 'merb-core/tasks/merb'
 
 GEM_NAME = "merb_babel"
-GEM_VERSION = "0.1.1.2"
+GEM_VERSION = "0.1.1.3"
 AUTHOR = "Matt Aimonetti"
 EMAIL = "mattaimonetti@gmail.com"
 HOMEPAGE = "http://github.com/mattetti/merb_babel/"
@@ -23,7 +23,7 @@ spec = Gem::Specification.new do |s|
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
-  s.add_dependency('merb', '>= 1.0.7.1')
+  s.add_dependency('merb-core', '>= 1.0')
   s.add_dependency('locale', '>= 0.9.0')
   s.require_path = 'lib'
   s.files = %w(LICENSE README.markdown Rakefile TODO) + Dir.glob("{lib,spec}/**/*")

data/lib/merb_babel/m_l10n.rb

@@ -113,7 +113,10 @@ module ML10n
         table_for["AbbrDayNames", object.wday, "%a"]
       end
       format.gsub!(/%A/) do
-        table_for["AbbrMonthNames", object.mon - 1, "%A"]
+        table_for["DayNames", object.wday, "%A"]
+      end
+      format.gsub!(/%b/) do
+        table_for["AbbrMonthNames", object.mon - 1, "%b"]
       end
       format.gsub!(/%B/) do
         table_for["MonthNames", object.mon - 1, "%B"]

data/lib/merb_babel/m_locale.rb

@@ -1,5 +1,3 @@
-require 'merb_babel/locale_detector'
-require 'locale'
 
 # The MLocale module helps you set up a locale, language, country
 # You don't have to use a locale, in some cases you might just want to use the language
@@ -78,6 +76,15 @@ module MLocale
       /(.+)\-([a-z]{2})/i
     end
     
+    # You can extend this method in application.rb
+    # example:
+    #
+    #   def set_locale
+    #     super
+    #     session[:language] = language
+    #   end
+    #
+    #
     # takes a locale as in fr-FR or en-US
     def set_locale
       if locale =~ locale_regexp
@@ -93,4 +100,4 @@ module MLocale
     def set_language
       request.env[:language] = language.downcase
     end
-end
+end

data/lib/merb_babel.rb

@@ -14,6 +14,9 @@ if defined?(Merb::Plugins)
   require File.join(File.dirname(__FILE__) / "merb_babel" / "m_locale")
   require File.join(File.dirname(__FILE__) / "merb_babel" / "m_l10n")
   require File.join(File.dirname(__FILE__) / "merb_babel" / "m_i18n")
+  require File.join(File.dirname(__FILE__) / "merb_babel" / 'locale_detector')
+  gem "locale"
+  require 'locale'
   
   Merb::BootLoader.before_app_loads do
     # require code that must be loaded before the application

data/spec/lang/en.yml

@@ -20,3 +20,6 @@ night:
 
 DateFormat:
   AbbrDayNames: ["S", "M", "T", "W", "T", "F", "S"]
+  DayNames: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday]
+  AbbrMonthNames: [Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec]
+  MonthNames: [January, February, March, April, May, June, July, August, September, October, November, December]

data/spec/lang/ja.yml

@@ -20,4 +20,7 @@ night:
 
 DateFormat:
   AbbrDayNames: ["日", "月", "火", "水", "木", "金", "土"]
+  DayNames: [日曜日, 月曜日, 火曜日, 水曜日, 木曜日, 金曜日, 土曜日]
+  AbbrMonthNames: [１, ２, ３, ４, ５, ６, ７, ８, ９, １０, １１, １２]
+  MonthNames: [１月, ２月, ３月, ４月, ５月, ６月, ７月, ８月, ９月, １０月, １１月, １２月]
   AmPm: ["午前", "午後"]

data/spec/m_i18n_spec.rb

@@ -62,6 +62,10 @@ describe '#babelize' do
     @c.t("%a/%d", date, :language => 'en').should == "T/01"
     @c.t("%a/%d", date, :language => 'en', :country => 'UK').should == "T/01"
     @c.t("%a/%d", date, :language => 'ja').should == "木/01"
+    @c.t("%A", date, :language => 'ja').should == "木曜日"
+    @c.t("%b", date, :language => 'en').should == "Jan"
+    @c.t("%B", date, :language => 'en').should == "January"
+    @c.t("%B", date, :language => 'ja').should == "１月"
   end
 
   it "should localize time" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: genki-merb_babel
 version: !ruby/object:Gem::Version 
-  version: 0.1.1.2
+  version: 0.1.1.3
 platform: ruby
 authors: 
 - Matt Aimonetti
@@ -9,17 +9,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-17 00:00:00 -08:00
+date: 2009-01-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: merb
+  name: merb-core
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.7.1
+        version: "1.0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: locale