radiant-event_calendar-extension 1.3.9 → 1.4.0

data/event_calendar_extension.rb

@@ -1,5 +1,5 @@
 class EventCalendarExtension < Radiant::Extension
-  version "1.3.9"
+  version "1.4.0"
   description "An event calendar extension that administers events locally or draws them from any ical or CalDAV publishers (Google Calendar, .Mac, Darwin Calendar Server, etc.)"
   url "http://github.com/radiant/radiant-event_calendar-extension"
 
@@ -26,14 +26,20 @@ class EventCalendarExtension < Radiant::Extension
       admin.event_venue = Radiant::AdminUI.load_default_event_venue_regions
     end
     
+    if admin.respond_to? :dashboard
+      admin.dashboard.index.add :main, "coming_events"
+    else
+      Rails.logger.warn "NO DASHBOARD!"
+    end
+    
     if respond_to?(:tab)
-      tab("Calendar") do
-        add_item("Events", '/admin/event_calendar')
-        add_item("Calendars", '/admin/event_calendar/calendars')
-        add_item("Locations", '/admin/event_calendar/event_venues')
+      tab('calendar') do
+        add_item('events', '/admin/event_calendar')
+        add_item('calendars', '/admin/event_calendar/calendars')
+        add_item('locations', '/admin/event_calendar/event_venues')
       end
     else
-      admin.tabs.add "Calendar", '/admin/event_calendar', :after => "Snippets", :visibility => [:all]
+      admin.tabs.add 'calendar', '/admin/event_calendar', :after => "Snippets", :visibility => [:all]
     end
 
   end

data/lib/calendar_period.rb

@@ -64,12 +64,15 @@ class CalendarPeriod
   # descriptions
   
   def to_s
-    "#{distance_of_time_in_words(start, finish)} from #{start}"
+    I18n.t 'calendar_period.to_s',
+           :distance_of_time_in_words => distance_of_time_in_words(start, finish),
+           :start => (I18n.l start, :format => :default)
   end
   
   def inspect
-    detailed = "%-1I:%M%p %d/%m/%Y"
-    %{#{describe_start(detailed)} to #{describe_finish(detailed)}}
+    I18n.t 'calendar_period.inspect',
+           :describe_start => describe_start(:calendar_period_describe_detailed),
+           :describe_finish => describe_finish(:calendar_period_describe_detailed)
   end
   
   [:day, :week, :month, :year].each do |period|
@@ -81,36 +84,38 @@ class CalendarPeriod
   def describe_start(date_format=nil)
     if start
       unless date_format
-        date_format = "%d %B"
-        date_format += " %Y" unless start.year == Time.now.year
+        date_format = :calendar_period_describe
+        date_format = :calendar_period_describe_with_year unless start.year == Time.now.year
       end
-      start.to_datetime.strftime(date_format)
+      I18n.l start, :format => date_format
     end
   end
 
   def describe_finish(date_format=nil)
     if finish
       unless date_format
-        date_format = "%d %B"
-        date_format += " %Y" unless finish.year == Time.now.year
+        date_format = :calendar_period_describe
+        date_format = :calendar_period_describe_with_year unless finish.year == Time.now.year
       end
-      finish.to_datetime.strftime(date_format)
+      I18n.l finish, :format => date_format
     end
   end
   
   def description
-    return "on #{start.mday} #{monthname} #{start.year}" if is_day?
-    return "in week #{start.cweek} of #{start.year}" if is_week?
-    return "in #{monthname} #{start.year}" if is_month?
-    return "in #{start.year}" if is_year?
-    return "from #{describe_start} onwards" unless finish
-    return "until #{describe_finish}" unless start
-    "between #{describe_start} and #{describe_finish}"
+    return I18n.t 'calendar_period.description_day',
+             :day => I18n.l(start, :format => "%d"),
+             :monthname => I18n.l(start ? start : finish, :format => "%B"),
+             :year => I18n.l(start, :format => "%Y") if is_day?
+    return I18n.l start, :format => :calendar_period_description_week if is_week?
+    return I18n.l start, :format => :calendar_period_description_month if is_month?
+    return I18n.l start, :format => :calendar_period_description_year if is_year?
+    return I18n.t 'calendar_period.onwards', :describe_start => describe_start unless finish
+    return I18n.t 'calendar_period.until', :describe_finish => describe_finish unless start
+    I18n.t 'calendar_period.between', :describe_finish => describe_finish, :describe_start => describe_start
   end
   
   def monthname
-    i = start ? start.month : finish.month
-    Date::MONTHNAMES[i]
+    I18n.l(start ? start : finish, :format => "%B")
   end
     
   # to expand the period to full calendar months

data/lib/event_calendar_tags.rb

@@ -225,12 +225,12 @@ module EventCalendarTags
     <pre><code><r:calendars:each>...</r:calendars:each></code></pre>
   }
   tag 'calendars' do |tag|
-    tag.locals.calendars ||= set_calendars(tag)
     tag.expand
   end
   
   tag 'calendars:each' do |tag|
     result = []
+    tag.locals.calendars ||= set_calendars(tag)
     tag.locals.calendars.each do |cal|
       tag.locals.calendar = cal
       result << tag.expand
@@ -558,7 +558,7 @@ module EventCalendarTags
     }
     tag "event:#{attribute}" do |tag|
       date = tag.locals.event.send("#{attribute}_date")
-      date.strftime(tag.attr['format'] || "%H:%M")
+      I18n.l date, :format => tag.attr['format'] || "%H:%M"
     end
     desc %{ 
       Renders the #{attribute} date (or time) of the current event as ordinal day, month.
@@ -568,7 +568,13 @@ module EventCalendarTags
     }
     tag "event:#{attribute}_date" do |tag|
       date = tag.locals.event.send("#{attribute}_date")
-      %{#{date.mday.ordinalize} #{Date::MONTHNAMES[date.month]}}
+      # checkout  for i18n http://info.michael-simons.eu/2009/02/12/localizing-dates-and-time-with-rails-i18n-using-procs/
+      case I18n.locale
+        when :en
+          %{#{date.mday.ordinalize} #{Date::MONTHNAMES[date.month]}}
+        default
+          I18n.l date, :format => "%d. %M"
+      end
     end
   end
 
@@ -588,7 +594,7 @@ module EventCalendarTags
     </code></pre> 
   }
   tag "event:date" do |tag|
-    tag.locals.event.start_date.strftime(tag.attr['format'] || "%m/%d/%Y")
+    I18n.l tag.locals.event.start_date, :format => tag.attr['format'] || "%m/%d/%Y"
   end
 
   desc %{ 
@@ -600,7 +606,7 @@ module EventCalendarTags
     <pre><code><r:event:weekday [short="true"] /></code></pre> 
   }
   tag "event:weekday" do |tag|
-    tag.attr['short'] == 'true' ? Date::ABBR_DAYNAMES[tag.locals.event.start_date.wday] : Date::DAYNAMES[tag.locals.event.start_date.wday]
+    tag.attr['short'] == 'true' ? (I18n.l tag.locals.event.start_date, :format => "%a") :  (I18n.l tag.locals.event.start_date, :format => "%A" )
   end
 
   desc %{ 
@@ -649,7 +655,7 @@ module EventCalendarTags
     <pre><code><r:event:month /></code></pre> 
   }
   tag "event:month" do |tag|
-    Date::MONTHNAMES[tag.locals.event.start_date.month]
+    I18n.l tag.locals.event.start_date, :format => "%B"
   end
 
   desc %{ 
@@ -846,7 +852,7 @@ module EventCalendarTags
         cell_class += " eventful"
         cell_class += " eventful_weekend" if weekend?(day)
         cell_class += events_today.map{|e| " #{e.slug}"}.join
-        event_list << %{<ul>} << events_today.map { |e| %{<li><span class="time">#{e.nice_start_time}:</span> #{e.title}</li>} }.join << "</ul>"
+        event_list << %{<ul>} << events_today.map { |e| %{<li><span class="time">#{e.start_time}:</span> #{e.title}</li>} }.join << "</ul>"
       else
         cell_class += " uneventful"
       end

data/radiant-event_calendar-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-event_calendar-extension}
-  s.version = "1.3.9"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["spanner"]
-  s.date = %q{2011-04-13}
+  s.date = %q{2011-05-04}
   s.description = %q{An event calendar extension that administers events locally or draws them from any ical or CalDAV publishers (Google Calendar, .Mac, Darwin Calendar Server, etc.)}
   s.email = %q{will@spanner.org}
   s.extra_rdoc_files = [
@@ -65,6 +65,7 @@ Gem::Specification.new do |s|
      "app/views/events/index.html.haml",
      "app/views/events/index.ics.erb",
      "app/views/events/index.rss.builder",
+     "config/locales/de.yml",
      "config/locales/en.yml",
      "config/routes.rb",
      "db/migrate/001_create_calendar_and_events.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-event_calendar-extension
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: false
   segments: 
   - 1
-  - 3
-  - 9
-  version: 1.3.9
+  - 4
+  - 0
+  version: 1.4.0
 platform: ruby
 authors: 
 - spanner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-13 00:00:00 +01:00
+date: 2011-05-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -148,6 +148,7 @@ files:
 - app/views/events/index.html.haml
 - app/views/events/index.ics.erb
 - app/views/events/index.rss.builder
+- config/locales/de.yml
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/001_create_calendar_and_events.rb