[activescaffoldlocalize commit] r88 - trunk/lib

[codesite...@google.com]

Author: edwin.moss
Date: Wed Dec 19 21:43:04 2007
New Revision: 88

Modified:
trunk/lib/localization.rb

Log:
Date and Time localization.

Modified: trunk/lib/localization.rb
==============================================================================
--- trunk/lib/localization.rb (original)
+++ trunk/lib/localization.rb Wed Dec 19 21:43:04 2007
@@ -86,6 +86,10 @@
def _(*args)
ActiveScaffold::Localization._(*args)
end
+
+ def __(key)
+ ActiveScaffold::Localization.lookup(key)
+ end
end

#TODO 2007-12-19 (EJM) Level=0 - Need to test this before...
@@ -104,16 +108,16 @@
def localize(format='default')
# unabashedly stolen from Globalite which unabashedly stole this
snippet from Globalize which unabashedly stole this snippet from
Tadayoshi Funaba's Date class
o = ''
- format =
ActiveScaffold::Localization.lookup(:date_helper)[:date_helper_time_formats][format.to_s.downcase.to_sym]
if ActiveScaffold::Localization.lookup(:date_helper)[:date_helper_time_formats][format.to_s.downcase.to_sym]
+ format =
__(:date_helper)[:date_helper_time_formats][format.to_s.downcase.to_sym]
if __(:date_helper)[:date_helper_time_formats][format.to_s.downcase.to_sym]
format.scan(/%[EO]?.|./o) do |c|
cc = c.sub(/^%[EO]?(.)$/o, '%\\1')
case cc
- when '%A'; o << ActiveScaffold::Localization.lookup(:date_helper)[:date_helper_day_names][wday]
- when '%a'; o << ActiveScaffold::Localization.lookup(:date_helper)[:date_helper_abbr_day_names][wday]
- when '%B'; o << ActiveScaffold::Localization.lookup(:date_helper)[:date_helper_month_names][mon]
- when '%b'; o << ActiveScaffold::Localization.lookup(:date_helper)[:date_helper_abbr_month_names][mon]
+ when '%A'; o << __(:date_helper)[:date_helper_day_names][wday]
+ when '%a'; o << __(:date_helper)[:date_helper_abbr_day_names][wday]
+ when '%B'; o << __(:date_helper)[:date_helper_month_names][mon]
+ when '%b'; o << __(:date_helper)[:date_helper_abbr_month_names][mon]
#when '%c'; o
<< :date_helper_time_formats.l[:default] ? :date_helper_date_formats.l[:default] : strftime('%Y-%m-%d')
- when '%p'; o << if hour < 12 then
ActiveScaffold::Localization.lookup(:date_helper)[:date_helper_am] else
ActiveScaffold::Localization.lookup(:date_helper)[:date_helper_pm] end
+ when '%p'; o << if hour < 12 then
__(:date_helper)[:date_helper_am] else
__(:date_helper)[:date_helper_pm] end
else; o << c
end
end
@@ -126,22 +130,22 @@
# Acts the same as #strftime, but returns a localized version of the
formatted date string.

def self.un_localize(value)
- Date.strptime(value, ActiveScaffold::Localization.lookup(:date_helper)[:date_helper_date_formats][:default])
+ Date.strptime(value, __(:date_helper)[:date_helper_date_formats][:default])
end

def localize(format='default')
# unabashedly stolen from Globalite which unabashedly stole this
snippet from Globalize which unabashedly stole this snippet from
Tadayoshi Funaba's Date class
o = ''
- format =
ActiveScaffold::Localization.lookup(:date_helper)[:date_helper_date_formats][format.to_s.downcase.to_sym]
if ActiveScaffold::Localization.lookup(:date_helper)[:date_helper_date_formats][format.to_s.downcase.to_sym]
+ format =
__(:date_helper)[:date_helper_date_formats][format.to_s.downcase.to_sym]
if __(:date_helper)[:date_helper_date_formats][format.to_s.downcase.to_sym]
format.scan(/%[EO]?.|./o) do |c|
cc = c.sub(/^%[EO]?(.)$/o, '%\\1')
case cc
- when '%A'; o << ActiveScaffold::Localization.lookup(:date_helper)[:date_helper_day_names][wday]
- when '%a'; o << ActiveScaffold::Localization.lookup(:date_helper)[:date_helper_abbr_day_names][wday]
- when '%B'; o << ActiveScaffold::Localization.lookup(:date_helper)[:date_helper_month_names][mon]
- when '%b'; o << ActiveScaffold::Localization.lookup(:date_helper)[:date_helper_abbr_month_names][mon]
+ when '%A'; o << __(:date_helper)[:date_helper_day_names][wday]
+ when '%a'; o << __(:date_helper)[:date_helper_abbr_day_names][wday]
+ when '%B'; o << __(:date_helper)[:date_helper_month_names][mon]
+ when '%b'; o << __(:date_helper)[:date_helper_abbr_month_names][mon]
#when '%c'; o
<< :date_helper_time_formats.l[:default] ? :date_helper_date_formats.l[:default] : strftime('%Y-%m-%d')
- when '%p'; o << if hour < 12
then :ActiveScaffold::Localization.lookup(:date_helper)[:date_helper_am]
else ActiveScaffold::Localization.lookup(:date_helper)[:date_helper_pm] end
+ when '%p'; o << if hour < 12 then
__(:date_helper)[:date_helper_am] else
__(:date_helper)[:date_helper_pm] end
else; o << c
end
end