@@ -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"] lib/merb_babel/m_l10n.rb @@ -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] spec/lang/en.yml @@ -20,4 +20,7 @@ night: DateFormat: AbbrDayNames: ["日", "月", "火", "水", "木", "金", "土"] + DayNames: [日曜日, 月曜日, 火曜日, 水曜日, 木曜日, 金曜日, 土曜日] + AbbrMonthNames: [１, ２, ３, ４, ５, ６, ７, ８, ９, １０, １１, １２] + MonthNames: [１月, ２月, ３月, ４月, ５月, ６月, ７月, ８月, ９月, １０月, １１月, １２月] AmPm: ["午前", "午後"] spec/lang/ja.yml @@ -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 spec/m_i18n_spec.rb da900f171dcd54baade52a073d7e562cbe5b1582 takiuchi genki@s21g.com http://github.com/mattetti/merb_babel/commit/d5841e2de8eef500b1b1c93f2ef924f31808af08 d5841e2de8eef500b1b1c93f2ef924f31808af08 2009-01-16T16:15:00-08:00 2009-01-16T11:43:50-08:00 Fixed a bug in localization of dates and times. Signed-off-by: Matt Aimonetti <mattaimonetti@gmail.com> e321fda2b359d0ea16c1978a2058f425417e1757 Matt Aimonetti mattaimonetti@gmail.com