radiant-event_calendar-extension 1.3.9 → 1.4.0

data/app/views/admin/event_venues/_event_venue.html.haml

@@ -5,7 +5,7 @@
         %h3.title
           = link_to event_venue.title, edit_admin_event_venue_url(event_venue)
         %p.description
-          = link_to "#{event_venue.events.count} #{pluralize(event_venue.events.count, 'event')}", admin_event_venue_events_url(event_venue)
+          = link_to "#{event_venue.events.count} #{pluralize(event_venue.events.count, t('event_venues_admin.index.event'))}", admin_event_venue_events_url(event_venue)
     - tbody.location_cell do
       %td.location
         = event_venue.address
@@ -16,4 +16,4 @@
     - tbody.modify_cell do
       %td.actions
         - confirmation = "Are you sure you want to delete entirely the event venue '#{event_venue.title}'?"
-        = link_to image('minus') + ' remove', remove_admin_event_venue_url(event_venue), :class => 'action'
+        = link_to image('minus') + " " + t('event_venues_admin.index.remove'), remove_admin_event_venue_url(event_venue), :class => 'action'

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

@@ -3,46 +3,46 @@
 
 .main
   %p.title
-    = f.label :title, "Venue or location title"
+    = f.label :title, t('event_venues_admin.form.title')
     = f.text_field :title, :class => 'textbox'
     - if or_choose && @venues.any?
-      = link_to "choose an existing place", '#', :class => 'swapper', :rel => 'toggle[venue,new_venue]'
+      = link_to t('event_venues_admin.form.choose'), '#', :class => 'swapper', :rel => 'toggle[venue,new_venue]'
     - else
       %span.note
-        We remember these details for you, so changes here affect every event occurring in this place
+        = t('event_venues_admin.form.choose_note')
       
   - if or_choose && @venues.any?
     %p.note
-      If you've used this place before, please 
-      = link_to "choose it from the list", '#', :class => 'swapper', :rel => 'toggle[venue,new_venue]'
-      so that you can update it globally
+      = t('event_venues_admin.form.choose_before')
+      = link_to t('event_venues_admin.form.choose_list'), '#', :class => 'swapper', :rel => 'toggle[venue,new_venue]'
+      = t('event_venues_admin.form.choose_after')
 
 .metadata
   %p.keywords
-    = f.label :keywords
+    = f.label :keywords, t('event_venues_admin.form.keywords')
     = f.text_field :keywords, :class => "textbox"
 
 .main
   %p.location
-    = f.label :location, "Location tag"
+    = f.label :location, t('event_venues_admin.form.location_tag')
     = f.text_field :location, :class => "textbox"
     %span.note
-      This is used to recognise the venue in a calendar feed. It can be postcode, grid reference or any distinctive string.
+      = t('event_venues_admin.form.location_tag_note')
 
   %p.address
     - if defined? TinyMceFilter
       = link_to image('mce', :alt=> 'toolbar icon'), '#', :class => 'toggleMCE', :rel => (@event ? "toggle[event_event_venue_attributes_address]" : "toggle[event_venue_address]")
-    = f.label :address, "Address or directions"
+    = f.label :address, t('event_venues_admin.form.address')
     = f.text_area :address, :class => 'textarea'
 
 .metadata
   %p.venue_postcode
-    = f.label :postcode, "Postcode or grid reference"
+    = f.label :postcode, t('event_venues_admin.form.postcode')
     = f.text_field :postcode, :class => 'textbox place'
     %span.note
-      This is only required if your address is unusual or you want these events to show on a map in a particular place.
+      = t('event_venues_admin.form.postcode_note')
 
   %p.url
-    = f.label :url, "Location url"
+    = f.label :url, t('event_venues_admin.form.url')
     = f.text_field :url, :class => 'textbox'
 

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

@@ -1,5 +1,5 @@
 - @page_title = @event_venue.title
-- @page_title += ' - Calendar - ' + default_page_title
+- @page_title += ' - ' + t('event_venues_admin.defaults.title') + ' - ' + default_page_title
 
 - include_stylesheet "admin/event_calendar"
 - include_javascript "admin/event_calendar"
@@ -11,9 +11,9 @@
 - render_region :main do |main|
   - main.edit_header do
     %h1
-      Edit Location
+      =t('event_venues_admin.edit.title')
     %p
-      Remember that changes you make here will affect the display of every event in this location.
+      =t('event_venues_admin.edit.description')
 
   - main.edit_form do
     - form_for [:admin, @event_venue] do |f|
@@ -34,7 +34,7 @@
             = updated_stamp @event_venue
           - form_bottom.edit_buttons do
             %p.buttons
-              = f.submit "Update Venue", :name => "commit", :class => "button"
+              = f.submit t('event_venues_admin.edit.update'), :name => "commit", :class => "button"
               = save_model_and_continue_editing_button(@event_venue)
-              or
-              = link_to 'Cancel', admin_event_venues_url
+              = t('defaults.or')
+              = link_to t('defaults.cancel'), admin_event_venues_url

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

@@ -1,5 +1,5 @@
-- @page_title = 'Locations'
-- @page_title += ' - Calendar - ' + default_page_title
+- @page_title = t('event_venues_admin.index.title')
+- @page_title += ' - ' + t('event_venues_admin.defaults.title') + ' - ' + default_page_title
 
 - include_stylesheet "admin/event_calendar"
 
@@ -10,13 +10,14 @@
         - render_region :thead do |thead|
           - thead.title_header do
             %th.event 
-              %strong Place
+              %strong
+                = t('event_venues_admin.index.place')
           - thead.location_header do
-            %th.location Address
+            %th.location= t('event_venues_admin.index.address')
           - thead.url_header do
-            %th.keywords Website
+            %th.keywords= t('event_venues_admin.index.website')
           - thead.modify_header do
-            %th.modify Modify
+            %th.modify= t('event_venues_admin.index.modify')
     %tbody
       - if @event_venues.any?
         - @event_venues.each do |event_venue|
@@ -24,11 +25,11 @@
       - else
         %tr
           %td.note{:colspan => admin.event_venue.index.tbody.length} 
-            No places in the system yet. You can create one here or when you add an event. 
+            = t('event_venues_admin.index.no_places')
 
   - render_region :bottom do |bottom|
     - bottom.buttons do
       #actions
         = pagination_for @event_venues
         %ul
-          %li= link_to image('plus') + " " + "new venue", new_admin_event_venue_url
+          %li= link_to image('plus') + " " + t('event_venues_admin.index.new'), new_admin_event_venue_url

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

@@ -1,5 +1,5 @@
 - @page_title = 'Add a location'
-- @page_title += ' - Calendar - ' + default_page_title
+- @page_title += ' - ' + t('event_venues_admin.defaults.title') + ' - ' + default_page_title
 
 - include_stylesheet "admin/event_calendar"
 - include_javascript "admin/event_calendar"
@@ -12,9 +12,9 @@
 - render_region :main do |main|
   - main.edit_header do
     %h1
-      Add an event location
+      = t('event_venues_admin.new.title')
     %p
-      You can also do this whenever you enter a new event.
+      = t('event_venues_admin.new.text')
 
   - main.edit_form do
     - form_for [:admin, @event_venue] do |f|
@@ -35,7 +35,7 @@
             = updated_stamp @event_venue
           - form_bottom.edit_buttons do
             %p.buttons
-              = f.submit "Create Venue", :name => "commit", :class => "button"
+              = f.submit t('event_venues_admin.new.create'), :name => "commit", :class => "button"
               = save_model_and_continue_editing_button(@event_venue)
-              or
-              = link_to 'Cancel', admin_event_venues_url
+              = t('defaults.or')
+              = link_to t('defaults.cancel'), admin_event_venues_url

data/app/views/admin/event_venues/remove.html.haml

@@ -1,22 +1,23 @@
 - include_stylesheet "admin/event_calendar"
 
-%h1 Remove location
+%h1
+  = t('event_venues_admin.remove.title')
 
 %p 
-  Are you sure you want to 
+  = t('event_venues_admin.remove.confirm')
   %strong.warning 
-    remove permanently
-  the location
+    = t('event_venues_admin.remove.warning')
+  = t('event_venues_admin.remove.the_location')
   = link_to @event_venue.title + '?', edit_admin_event_venue_url(@event_venue)
 
   - if @event_venue.events.any?
     %br
-    It is associated with 
+    = t('event_venues_admin.remove.associated')
     = @event_venue.events.count
-    = pluralize(@event_venue.events.count, 'event')
-    that will remain in the calendar without a location:
+    = pluralize(@event_venue.events.count, t('event_venues_admin.remove.event'))
+    = t('event_venues_admin.remove.remain')
   - else
-    It has no events.
+    = t('event_venues_admin.remove.no_events')
 
 - if @event_venue.events.any?
   %ul
@@ -28,6 +29,6 @@
         
 - form_for [:admin, @event_venue], :html => {:method => :delete} do
   %p.buttons
-    %input.button{:type=>"submit", :value=>"Delete location"}
-    or
-    = link_to 'Cancel', admin_event_venues_url
+    %input.button{:type=>"submit", :value=>t('event_venues_admin.remove.delete')}
+    = t('defaults.or')
+    = link_to t('defaults.cancel'), admin_event_venues_url

data/app/views/admin/events/_event.html.haml

@@ -8,7 +8,7 @@
     - tbody.date_cell do
       %td.datemark
         %a{:href => admin_event_url(master_event), :class => event.occurrence? ? 'occurrence' : 'master'}
-          %span.month= Date::ABBR_MONTHNAMES[event.start_date.month]
+          %span.month= (I18n.t 'date.abbr_month_names')[event.start_date.month]
           %span.day= event.mday_padded
     - tbody.title_cell do
       %td.event

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

@@ -21,17 +21,17 @@
     - render_region :form do |form|
       - form.edit_event do
         %p.title
-          = f.label :title, "Title"
+          = f.label :title, t('event_admin.form.title')
           = f.text_field :title, :class => 'textbox', :disabled => imported
             
       - form.edit_date do
         %p.start_date
-          = f.label :start_date, "Start date and time"
+          = f.label :start_date, t('event_admin.form.start')
           = f.text_field :start_date, :class => 'textbox date time', :disabled => imported
           = f.check_box :all_day, :disabled => imported
-          = f.label :all_day, 'All-day event?', :class => 'minor'
+          = f.label :all_day, t('event_admin.form.all_day'), :class => 'minor'
         %p.end_date
-          = f.label :end_date, "end date and time"
+          = f.label :end_date, t('event_admin.form.end')
           = f.text_field :end_date, :class => 'textbox date time', :disabled => imported
 
         .recurrence
@@ -39,49 +39,50 @@
           
             %p.recurrence
               = rf.check_box 'active', :class => 'toggle', :rel => "toggle[recurrence_detail]", :disabled => imported
-              = rf.label :active, 'Repeats', :class => 'minor'
+              = rf.label :active, t('event_admin.form.repeats'), :class => 'minor'
               %span.note
-                (this is for separate similar events. For events that span several days you only need to set the start and end.)
+                = t('event_admin.form.repeat_note')
 
             %p#recurrence_detail
               %span#recurrence_interval
-                = rf.label :interval, "Repeats every"
+                = rf.label :interval, t('event_admin.form.repeats_every')
                 = rf.text_field :interval, :class => 'textbox short'
               %span#recurrence_period
                 = rf.label :period, " "
-                = rf.select :period, [['day', 'daily'], ['week', 'weekly'], ['month', 'monthly'], ['year', 'yearly']], {}, :class => 'textbox'
+                = rf.select :period, [[t('defaults.day'), 'daily'], [t('defaults.week'), 'weekly'], [t('defaults.month'), 'monthly'], [t('defaults.year'), 'yearly']], {}, :class => 'textbox'
               %span#recurrence_basis
                 = rf.label :basis, " "
-                = rf.select :basis, [['forever', 'unbounded'],['until', 'limit'], ['for', 'count']], {}, :class => 'textbox basis'
+                = rf.select :basis, [[t('defaults.forever'), 'unbounded'],[t('defaults.until'), 'limit'], [t('defaults.for'), 'count']], {}, :class => 'textbox basis'
               %span#recurrence_unbounded
               %span#recurrence_limit
                 = rf.label :limiting_date, " "
                 = rf.text_field :limiting_date, :class => 'textbox date'
               %span#recurrence_count
-                = rf.label :limiting_count, "this many times:", :class => 'inline'
+                = rf.label :limiting_count, t('event_admin.form.many_times'), :class => 'inline'
                 = rf.text_field :limiting_count, :class => 'textbox short'
 
       - form.edit_description do
         %p.description
           - if !imported && defined? TinyMceFilter
             = link_to image('mce', :alt=> 'toolbar icon'), '#', :class => 'toggleMCE', :rel => 'toggle[event_description]'
-          = f.label :description, "Description"
+          = f.label :description, t('event_admin.form.description')
           = f.text_area :description, :class => 'textarea', :style => "width: 100%; height: 8em;", :disabled => imported
 
   - render_region :form_bottom do |form_bottom|
     - form_bottom.edit_metadata do
       .metadata
         %p.keywords
-          = f.label :keywords
+          = f.label :keywords, t('event_admin.form.keywords')
           = f.text_field :keywords, :class => "textbox"
         %p.calendar
-          = f.label :calendar_id, "Calendar"
+          = f.label :calendar_id, t('event_admin.form.calendar')
           = f.select :calendar_id, Calendar.all.map {|c| [c.name, c.id]}, {:include_blank => true}, :class => 'textbox', :disabled => imported
           %br
           %span.note
-            This is optional but can be used to file your events or to mix local events into a subscribed calendar.
+            = t('event_admin.form.calendar_note')
+            
         %p.url
-          = f.label :url, "Event url"
+          = f.label :url, t('event_admin.form.event_url')
           = f.text_field :url, :class => 'textbox', :disabled => imported
 
     - form_bottom.edit_venue do
@@ -96,13 +97,13 @@
         -if @venues.any?
           #venue.main
             %p#existing_venue
-              = f.label :event_venue_id, "Choose a location"
+              = f.label :event_venue_id, t('event_admin.form.choose_location')
               = f.select :event_venue_id, @venues.map {|v| [v.title, v.id]}, {:include_blank => true}, :class => 'textbox', :disabled => imported
               - if imported
-                = link_to "edit this location", admin_event_venue_url(@event.event_venue)
+                = link_to t('event_admin.form.edit_location'), admin_event_venue_url(@event.event_venue)
                 to add title, description and directions
               - else
-                = link_to "add a new location", new_admin_event_venue_url, :class => 'swapper', :rel => "toggle[#{toggle_precedence.join(',')}]"
+                = link_to t('event_admin.form.new_location'), new_admin_event_venue_url, :class => 'swapper', :rel => "toggle[#{toggle_precedence.join(',')}]"
         #new_venue
           - @event.build_event_venue unless @event.event_venue
           - f.fields_for :event_venue, @event.event_venue do |ef|
@@ -116,5 +117,5 @@
       %p.buttons
         = save_model_button(@event)
         = save_model_and_continue_editing_button(@event)
-        or
-        = link_to 'Cancel', admin_events_url
+        = t('defaults.or')
+        = link_to t('defaults.cancel'), admin_events_url

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

@@ -1,5 +1,5 @@
 - @page_title = @event.title
-- @page_title += ' - Calendar - ' + default_page_title
+- @page_title += ' - ' + t('event_admin.defaults.title') + ' - ' + default_page_title
 
 - include_stylesheet "admin/event_calendar"
 - include_javascript "admin/event_calendar"
@@ -7,7 +7,7 @@
 - render_region :main do |main|
   - main.edit_header do
     %h1 
-      Edit Event
+      = t('event_admin.edit.header')
 
   - main.edit_form do
     - form_for :event, @event, :url => admin_event_path(@calendar), :html => { :method => "put", :multipart => true } do |f|

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

@@ -1,6 +1,6 @@
-- @page_title = 'Events'
-- @page_title += " at #{@event_venue.title}" if @event_venue
-- @page_title += ' - Calendar - ' + default_page_title
+- @page_title = t('event_admin.index.title')
+- @page_title += t('defaults.at') + "#{@event_venue.title}" if @event_venue
+- @page_title += ' - ' + t('event_admin.defaults.title') + ' - ' + default_page_title
 
 - include_stylesheet "admin/event_calendar"
 
@@ -14,21 +14,21 @@
           - thead.title_header do
             %th.event 
               %strong 
-                Events
+                = t('event_admin.index.events')
                 - if @event_venue
                   at 
                   = @event_venue.title
-                  = link_to "(show all)", admin_events_url
+                  = link_to t('event_admin.index.show_all'), admin_events_url
           - thead.calendar_header do
-            %th.calendar Calendar
+            %th.calendar= t('event_admin.index.calendar')
           - thead.time_header do
-            %th.date Time
+            %th.date= t('event_admin.index.time')
           - thead.location_header do
-            %th.location Location
+            %th.location= t('event_admin.index.location')
           - thead.keywords_header do
-            %th.keywords Keywords
+            %th.keywords= t('event_admin.index.keywords')
           - thead.modify_header do
-            %th.modify Modify
+            %th.modify= t('event_admin.index.modify')
   
     %tbody
       - if @events.any?
@@ -37,11 +37,11 @@
       - else
         %tr
           %td.note{:colspan => admin.event.index.tbody.length} 
-            No events to display
+            =t('event_admin.index.no_events')
 
   - render_region :bottom do |bottom|
     - bottom.buttons do
       #actions
         = pagination_for @events
         %ul
-          %li= link_to image('plus') + " " + "new event", new_admin_event_url
+          %li= link_to image('plus') + " " + t('event_admin.index.new'), new_admin_event_url

data/app/views/admin/events/remove.html.haml

@@ -1,16 +1,15 @@
-%h1 Delete event
+%h1
+  = t('event_admin.remove.title')
 
 %p 
-  Are you sure you want to 
+  = t('event_admin.remove.message')
   %strong.warning 
-    remove permanently
-  the event 
+    = t('event_admin.remove.warning')
+  = t('event_admin.remove.event')
   = link_to(@event.title, edit_admin_event_url(@event)) + '?'
   
-
-
 - form_for [:admin, @event], :html => {:method => :delete} do
   %p.buttons
-    %input.button{:type=>"submit", :value=>"Delete event"}/
-    or
-    = link_to 'Cancel', admin_events_url
+    %input.button{:type=>"submit", :value=>t('event_admin.remove.submit')}/
+    = t('defaults.or')
+    = link_to t('defaults.cancel'), admin_events_url

data/app/views/events/_event.html.haml

@@ -20,16 +20,19 @@
         = render :partial => 'events/keywords', :locals => {:event => event}
           
       %p.practicalities
-        = event.summarize_start
+        %span.date
+          = event.summarize_start
         - if event.event_venue
-          = t('at')
-          - if event.event_venue.url
-            = link_to event.event_venue.title, event.event_venue.url, :class => 'location'
-          - else
-            = event.event_venue.title
-          = event.event_venue.address
+          %span.location
+            = t('event_page.at')
+            - if event.event_venue.url
+              = link_to event.event_venue.title, event.event_venue.url, :class => 'location'
+            - else
+              = event.event_venue.title
+            = event.event_venue.address
         - elsif event.location
-          = event.location
+          %span.location
+            = event.location
       - unless repeating
         = event.description_paragraph