radiant-event_calendar-extension 1.3.9 → 1.4.0

data/VERSION

@@ -1 +1 @@
-1.3.9
+1.4.0

data/app/controllers/events_controller.rb

@@ -95,8 +95,8 @@ class EventsController < SiteController
   def list_description
     return @description if @description
     parts = []
-    parts << (period ? period.description : "coming up")
-    parts << "in #{calendars.to_sentence}" if calendars
+    parts << (period ? period.description : t('event_page.coming_up'))
+    parts << I18n.t('event_page.in_calendars', :calendars => calendars.to_sentence) if calendars
     @description = parts.join(' ')
   end
   
@@ -154,31 +154,31 @@ class EventsController < SiteController
     [:year, :month, :mday, :category, :slug, :calendar_id]
   end
   
-  def day_names
-    return @day_names if @day_names
-    @day_names ||= Date::DAYNAMES.dup
-    @day_names.push(@day_names.shift) # Class::Date and ActiveSupport::CoreExtensions::Time::Calculations have different ideas of when is the start of the week. We've gone for the rails standard.  
-    @day_names
-  end
-
   def month_name(month)
     month_names[month]
   end
-
-  def month_names
-    @month_names ||= Date::MONTHNAMES.dup
-  end
-
+  
   def short_month_name(month)
     short_month_names[month]
   end
-
+  
+  def day_names
+    return @day_names if @day_names
+    @day_names ||= (I18n.t 'date.day_names').dup
+    @day_names.push(@day_names.shift) # Class::Date and ActiveSupport::CoreExtensions::Time::Calculations have different ideas of when is the start of the week. We've gone for the rails standard.  
+    @day_names
+  end
+  
+protected
+  
   def short_month_names
-    @short_month_names ||= Date::ABBR_MONTHNAMES.dup
+    @short_month_names ||= (I18n.t 'date.abbr_month_names').dup
   end
-
-private
-
+  
+  def month_names
+    @month_names ||= (I18n.t 'date.month_names').dup
+  end
+  
   # months can be passed around either as names or numbers
   # any date part can be 'now' or 'next' for ease of linking
   # and everything is converted to_i to save clutter later

data/app/models/event.rb

@@ -65,6 +65,10 @@ class Event < ActiveRecord::Base
 
   named_scope :by_end_date,  { :order => "end_date ASC" }
 
+  named_scope :limited_to, lambda { |limit|
+    { :limit => limit }
+  }
+  
   named_scope :at_venue, lambda { |venue| # EventVenue object
     { :conditions => ["event_venue_id = ?", venue.id] }
   }
@@ -115,7 +119,7 @@ class Event < ActiveRecord::Base
     stack = {}
     find(:all).each_with_object({}) do |event, stack|
       y = event.start_date.year
-      m = Date::MONTHNAMES[event.start_date.month]
+      m = (I18n.t 'date.month_names')[event.start_date.month]
       stack[y] ||= {}
       stack[y][m] ||= []
       stack[y][m].push event
@@ -168,15 +172,15 @@ class Event < ActiveRecord::Base
   end
   
   def date
-    start_date.to_datetime.strftime(date_format)
+    I18n.l start_date, :format => date_format
   end
   
   def month
-    Date::MONTHNAMES[start_date.month]
+    I18n.l start_date, :format => :calendar_month
   end
 
   def short_month
-    Date::ABBR_MONTHNAMES[start_date.month]
+    I18n.l start_date, :format => :calendar_short_month
   end
 
   def year
@@ -184,31 +188,31 @@ class Event < ActiveRecord::Base
   end
 
   def day
-    Date::DAYNAMES[start_date.day]
+    I18n.l start_date, :format => :calendar_day_name
   end
 
   def mday
-    start_date.mday
+    I18n.l start_date, :format => :calendar_day_of_month
   end
   
   def mday_padded
-    "%02d" % mday
+    mday
   end
   
   def short_date
-    start_date.to_datetime.strftime(short_date_format)
+    I18n.l start_date, :format => short_date_format
   end
   
   def start_time
-    start_date.to_datetime.strftime(start_date.min == 0 ? round_time_format : time_format).downcase
+    (I18n.l start_date, :format => (start_date.min == 0 ? round_time_format : time_format)).downcase
   end
 
   def end_time
-    end_date.to_datetime.strftime(end_date.min == 0 ? round_time_format : time_format).downcase if end_date
+    (I18n.l end_date, :format => (end_date.min == 0 ? round_time_format : time_format)).downcase if end_date
   end
   
   def last_day
-    end_date.to_datetime.strftime(date_format)if end_date
+    I18n.l end_date, :format => date_format if end_date
   end
   
   def duration
@@ -221,7 +225,7 @@ class Event < ActiveRecord::Base
 
   def starts
     if all_day?
-      "all day"
+      t('event_page.all_day')
     else
       start_time
     end
@@ -229,7 +233,7 @@ class Event < ActiveRecord::Base
   
   def finishes
     if all_day?
-      "all day"
+      t('event_page.all_day')
     else
       end_time
     end
@@ -237,29 +241,36 @@ class Event < ActiveRecord::Base
 
   def summarize_start
     if one_day?
-      "all day on #{date}"
+      I18n.t 'event_page.all_day_on', :date => date
     elsif all_day?
-      "from #{date}"
+      I18n.t 'event_page.from_date', :date => date
     else
-      "#{start_time} on #{date}"
+      I18n.t 'event_page.on_date', :time => start_time, :date => date
     end
   end
-  
+
   def summarize_period
-    period = []
+    period = ""
     if one_day?
-      period << "all day on #{date}"
+      period = (I18n.t 'event_page.summarize_period_one_day', :date => date)
     elsif all_day?
-      period << "from #{date} to #{end_date.to_datetime.strftime(date_format)}"
+      period = (I18n.t 'event_page.summarize_period_all_day',
+                        :from_date => date,
+                        :to_date => (I18n.l end_date, :format => date_format))
     elsif within_day?
-      period << "#{start_time}"
-      period << "to #{end_time}" if end_time
-      period << "on #{date}"
+      if end_time
+        period = (I18n.t 'event_page.summarize_period_within_day_with_end_time',
+          :start_time => start_time, :end_time => end_time, :date => date)
+      else
+        period = (I18n.t 'event_page.summarize_period_within_day',
+          :start_time => start_time, :date => date)
+      end
     else
-      period << "#{start_time} on #{date}"
-      period << "to #{end_time} on #{end_date.to_datetime.strftime(date_format)}"
+      period = (I18n.t 'event_page.summarize_period_spanning_days',
+        :start_time => start_time, :end_time => end_time, :date => date,
+        :end_date => (I18n.l end_date, :format => date_format))
     end
-    period.join(' ')
+    period
   end
   
   def url
@@ -415,19 +426,19 @@ protected
   end
     
   def date_format
-    Radiant::Config['event_calendar.date_format'] || "%-1d %B"
+    Radiant::Config['event_calendar.date_format'] || (I18n.t 'date.formats.event_calendar_date_format')
   end
   
   def short_date_format
-    Radiant::Config['event_calendar.short_date_format'] || "%-1d/%m/%Y"
+    Radiant::Config['event_calendar.short_date_format'] || (I18n.t 'date.formats.event_calendar_short_date_format')
   end
   
   def time_format
-    Radiant::Config['event_calendar.time_format'] || "%-1I:%M%p"
+    Radiant::Config['event_calendar.time_format'] || (I18n.t 'time.formats.event_calendar_time_format')
   end
   
   def round_time_format
-    Radiant::Config['event_calendar.round_time_format'] || "%-1I%p"
+    Radiant::Config['event_calendar.round_time_format'] || (I18n.t 'time.formats.event_calendar_round_time_format')
   end
   
 end

data/app/models/event_calendar_page.rb

@@ -5,11 +5,7 @@ class EventCalendarPage < Page
 
   attr_accessor :filters, :calendar_parameters, :calendar_filters, :calendar_year, :calendar_month, :calendar_page, :calendar_category, :calendar_slug, :calendar_period
 
-  description %{ Create a viewer for calendar data. }
-
-  def self.sphinx_indexes
-    []
-  end
+  description I18n.t 'event_page.description'
 
   def cache?
     true
@@ -37,8 +33,8 @@ class EventCalendarPage < Page
           @calendar_year = part
         elsif part.match(/^\d+$/)
           @calendar_day = part
-        elsif Date::MONTHNAMES.include?(part.titlecase)
-          @calendar_month = Date::MONTHNAMES.index(part.titlecase)
+        elsif (I18n.t 'date.month_names').include?(part.titlecase)
+          @calendar_month = (I18n.t 'date.month_names').index(part.titlecase)
         elsif Calendar.categories.include?(part)
           @calendar_category = part
         elsif Calendar.slugs.include?(part)
@@ -87,12 +83,12 @@ class EventCalendarPage < Page
   alias_method_chain :url, :parts
 
   def month_names
-    @month_names ||= Date::MONTHNAMES.dup
+    @month_names ||= (I18n.t 'date.month_names').dup
   end
   
   def day_names
     unless @day_names
-      @day_names = Date::DAYNAMES.dup
+      @day_names = (I18n.t 'date.day_names').dup
       @day_names.push(@day_names.shift) # Class::Date and ActiveSupport::CoreExtensions::Time::Calculations have different ideas of when is the start of the week. we've gone for the rails standard.
     end
     @day_names

data/app/views/admin/calendars/_form.html.haml

@@ -9,54 +9,54 @@
       - form.edit_name do
         .title
           %p.title
-            = f.label :name
+            = f.label :name, t('calendar_admin.form.name')
             = f.text_field :name, :class => "textbox"
 
       - form.edit_ical do
         - f.fields_for :ical do |ical_f| 
           %p.url
-            = ical_f.label :url, "Subscription url (optional)"
+            = ical_f.label :url, t('calendar_admin.form.subscription_url')
             = ical_f.text_field :url, :class => "textbox"
 
           .drawer
             .drawer_contents#subscription
 
               %div.username
-                = ical_f.label :username, 'Username', :class => 'minor'
+                = ical_f.label :username, t('calendar_admin.form.username'), :class => 'minor'
                 = ical_f.text_field :username, :class => "textbox"
 
               %div.password
-                = ical_f.label :password, 'Password', :class => 'minor'
+                = ical_f.label :password, t('calendar_admin.form.password'), :class => 'minor'
                 = ical_f.text_field :password, :class => "textbox"
 
               %div.refreshment
                 = ical_f.check_box :refresh_interval
-                = ical_f.label :refresh_interval, 'Refresh automatically?', :class => 'minor'
+                = ical_f.label :refresh_interval, t('calendar_admin.form.auto_refresh'), :class => 'minor'
                 
             .drawer_handle
               %a.toggle{:href=>'#subscription', :rel=>"toggle[subscription]", :class=>"more"}
-                more
+                = t('calendar_admin.form.more')
 
       - form.edit_filing do
         .filing
           %p.calendar_category
-            = f.label :category
+            = f.label :category, t('calendar_admin.form.category')
             = f.text_field :category, :class => "textbox"
           %p.calendar_slug
-            = f.label :slug
+            = f.label :slug, t('calendar_admin.form.slug')
             = f.text_field :slug, :class => "textbox"
 
       - form.edit_description do
         .description
           %p.description
-            = f.label :description, "Description"
+            = f.label :description, t('calendar_admin.form.description')
             = f.text_area 'description', :size => '40x6', :class => "textarea"
 
   - render_region :form_bottom do |form_bottom|
     - form_bottom.edit_metadata do
       .metadata
         %p.keywords
-          = f.label :keywords
+          = f.label :keywords, t('calendar_admin.form.keywords')
           = f.text_field :keywords, :class => "textbox"
 
     - form_bottom.edit_timestamp do
@@ -66,5 +66,5 @@
       %p.buttons
         = save_model_button @calendar
         = save_model_and_continue_editing_button @calendar
-        or
-        = link_to "Cancel", admin_calendars_url
+        = t('defaults.or')
+        = link_to t('defaults.cancel'), admin_calendars_url

data/app/views/admin/calendars/edit.html.haml

@@ -1,12 +1,11 @@
 - @page_title = @calendar.name
-- @page_title += ' - Calendar - ' + default_page_title
+- @page_title += ' - ' + t('calendar_admin.defaults.title') + ' - ' + default_page_title
 
 - include_stylesheet('admin/event_calendar')
 
 - render_region :main do |main|
   - main.edit_header do
-    %h1 
-      Edit Calendar
+    %h1= t('calendar_admin.edit.header')
 
   - main.edit_form do
     - form_for :calendar, @calendar, :url => admin_calendar_path(@calendar), :html => { :method => "put", :multipart => true } do |f|

data/app/views/admin/calendars/index.html.haml

@@ -1,5 +1,5 @@
-- @page_title = 'Calendars'
-- @page_title += ' - Calendar - ' + default_page_title
+- @page_title = t('calendar_admin.index.title')
+- @page_title += ' - ' + t('calendar_admin.defaults.title') + ' - ' + default_page_title
 
 - include_stylesheet 'admin/event_calendar'
 = render_region :top 
@@ -10,14 +10,14 @@
       %tr
         - render_region :thead do |thead|
           - thead.name_header do
-            %th Name
+            %th.key= t('calendar_admin.index.name')
 
           - thead.url_header do
-            %th URL (category/slug)
+            %th.key= t('calendar_admin.index.url')
 
           - thead.refresh_header do
-            %th Last Refresh
-            %th Refresh automatically?
+            %th.key= t('calendar_admin.index.last_refresh')
+            %th.key= t('calendar_admin.index.auto_refresh')
 
           - thead.action_header do
             %th 
@@ -30,7 +30,7 @@
               %td.subscription-title
                 = link_to image('calendar', :alt => ''), admin_calendar_url(calendar)
                 = link_to calendar.name, admin_calendar_url(calendar)
-                = "(#{calendar.events.count || '0'} events)"
+                = "(#{calendar.events.count || '0'} " + t('calendar_admin.index.events') + ")"
 
             - tbody.url_cell do
               %td.url
@@ -46,7 +46,7 @@
                   n/a
               %td.autorefresh
                 - if calendar.ical
-                  = calendar.ical.refresh_automatically? ? "yes" : "no"
+                  = calendar.ical.refresh_automatically? ? t('calendar_admin.index.yes') : t('calendar_admin.index.no')
                 - else
                   n/a
             - tbody.action_cell do
@@ -65,4 +65,4 @@
     #actions
       = pagination_for @calendars
       %ul
-        %li= link_to image('plus') + " " + "new calendar", new_admin_calendar_url
+        %li= link_to image('plus') + " " + t('calendar_admin.index.new'), new_admin_calendar_url

data/app/views/admin/calendars/new.html.haml

@@ -1,12 +1,11 @@
-- @page_title = 'New calendar'
-- @page_title += ' - Calendar - ' + default_page_title
+- @page_title = t('calendar_admin.new.title')
+- @page_title += ' - ' + t('calendar_admin.defaults.title') + ' - ' + default_page_title
 
 - include_stylesheet('admin/event_calendar')
 
 - render_region :main do |main|
   - main.edit_header do
-    %h1 
-      New Calendar
+    %h1= t('calendar_admin.new.header')
 
   - main.edit_form do
     - form_for :calendar, @calendar, :url => admin_calendars_path do |f|

data/app/views/admin/calendars/show.html.haml

@@ -7,22 +7,22 @@
 
 %div#calendar_help
   %h3
-    subscribe to this calendar
+    t('calendar_admin.show.subscribe')subscribe to this calendar
   %ul
     %li
       %strong
-        address:
+        t('calendar_admin.show.address'):
       = link_to @calendar.ical.url
     %li
       %strong
-        username:
+        t('calendar_admin.show.username'):
       = link_to @calendar.ical.username
     %li
       %strong
-        password:
+        t('calendar_admin.show.password'):
       = link_to @calendar.ical.password
   %p
-    This may be part of a master calendar with several individual calendars. In that case there will be a different address that lets you access all the calendars at once. Consult your site administrator if unsure.
+    t('calendar.show.detail_text')
 
 %table#events.index{:cellspacing=>"0", :border=>"0", :cellpadding=>"0"}
   = render :partial => 'events/list_head'
@@ -33,4 +33,4 @@
     - else
       %tr
         %td.note{:colspan => admin.event.index.tbody.length} 
-          No Events
+          t('calendar_admin.show.no_events')