improvements to i18n, pgsql compat and validations

Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    refinerycms-calendar (2.0.1)
-      refinerycms-core (~> 2.0.3)
+    refinerycms-calendar (2.0.2)
+      refinerycms-core (~> 2.0)
 
 GEM
   remote: http://rubygems.org/
@@ -84,7 +84,6 @@ GEM
       activemodel (>= 3.0.0)
       activerecord (>= 3.0.0)
       paper_trail (~> 2)
-    growl (1.0.3)
     guard (1.0.3)
       ffi (>= 0.5.0)
       thor (>= 0.14.6)
@@ -98,6 +97,8 @@ GEM
       railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
     json (1.7.3)
+    libnotify (0.1.4)
+      ffi (>= 0.6.2)
     libwebsocket (0.1.3)
       addressable
     mail (2.4.4)
@@ -137,7 +138,8 @@ GEM
       rdoc (~> 3.4)
       thor (~> 0.14.6)
     rake (0.9.2.2)
-    rb-fsevent (0.9.1)
+    rb-inotify (0.8.8)
+      ffi (>= 0.5.0)
     rdoc (3.12)
       json (~> 1.4)
     refinerycms (2.0.3)
@@ -245,14 +247,14 @@ DEPENDENCIES
   coffee-rails
   factory_girl_rails
   generator_spec
-  growl (~> 1.0.3)
   guard-spork
   jquery-rails
   jruby-openssl
+  libnotify (~> 0.1.3)
   mysql2
   pg
   rb-fchange (~> 0.0.5)
-  rb-fsevent (>= 0.3.9)
+  rb-inotify (>= 0.5.1)
   rb-notifu (~> 0.0.4)
   refinerycms (~> 2.0.0)
   refinerycms-calendar!

Rakefile

@@ -8,9 +8,7 @@ end
 ENGINE_PATH = File.dirname(__FILE__)
 APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 
-if File.exists?(APP_RAKEFILE)
-  load 'rails/tasks/engine.rake'
-end
+load 'rails/tasks/engine.rake' if File.exists?(APP_RAKEFILE)
 
 require "refinerycms-testing"
 Refinery::Testing::Railtie.load_tasks

app/controllers/refinery/calendar/admin/events_controller.rb

@@ -7,7 +7,7 @@ class EventsController < ::Refinery::AdminController
         crudify :'refinery/calendar/event',
                 :xhr_paging => true,
                 :sortable => false,
-                :order => "'from' DESC"
+                :order => "start_at DESC"
 
         private
         def find_venues

app/controllers/refinery/calendar/events_controller.rb

@@ -2,7 +2,7 @@ module Refinery
   module Calendar
     class EventsController < ::ApplicationController
       def index
-        @events = Event.upcoming.order('refinery_calendar_events.from DESC')
+        @events = Event.upcoming.order('refinery_calendar_events.start_at DESC')
 
         # you can use meta fields from your model instead (e.g. browser_title)
         # by swapping @page for @event in the line below:
@@ -18,13 +18,13 @@ def show
       end
 
       def archive
-        @events = Event.archive.order('refinery_calendar_events.from DESC')
+        @events = Event.archive.order('refinery_calendar_events.start_at DESC')
         render :template => 'refinery/calendar/events/index'
       end
 
       protected
       def find_page
-        @page = ::Refinery::Page.where(:link_url => "/connect/events").first
+        @page = ::Refinery::Page.where(:link_url => "/events").first
       end
 
     end

app/models/refinery/calendar/event.rb

@@ -7,9 +7,11 @@ class Event < Refinery::Core::BaseModel
 
       belongs_to :venue
 
-      validates :title, :presence => true, :uniqueness => true
+      validates :title, :start_at, :end_at, :presence => true
 
-      attr_accessible :title, :from, :to, :registration_link,
+      validate :ends_after_it_starts
+
+      attr_accessible :title, :start_at, :end_at, :registration_link,
                       :venue_id, :excerpt, :description,
                       :featured, :position
 
@@ -18,17 +20,23 @@ class Event < Refinery::Core::BaseModel
                 :prefix => true,
                 :allow_nil => true
 
+      def ends_after_it_starts
+        if start_at && end_at && start_at > end_at
+          errors.add(:start_at, 'must come before the end date')
+        end
+      end
+
       class << self
         def upcoming
-          where('refinery_calendar_events.from >= ?', Time.now)
+          where('refinery_calendar_events.start_at >= ?', Time.now)
         end
 
         def featured
           where(:featured => true)
         end
 
         def archive
-          where('refinery_calendar_events.from < ?', Time.now)
+          where('refinery_calendar_events.start_at < ?', Time.now)
         end
       end
     end

app/views/refinery/calendar/admin/events/_form.html.erb

@@ -17,13 +17,13 @@
   </div>
 
   <div class='field'>
-    <%= f.label :from -%>
-    <%= f.text_field :from, :class => 'datetime_range'  -%>
+    <%= f.label :start_at -%>
+    <%= f.text_field :start_at, :class => 'datetime_range'  -%>
   </div>
 
   <div class='field'>
-    <%= f.label :to -%>
-    <%= f.text_field :to, :class => 'datetime_range'  -%>
+    <%= f.label :end_at -%>
+    <%= f.text_field :end_at, :class => 'datetime_range'  -%>
   </div>
 
   <div class='field'>
@@ -32,8 +32,8 @@
   </div>
 
   <div class='field'>
-    <%= f.label :venue_id, 'Venue' %>
-    <%= f.collection_select :venue_id, @venues, :id, :name, { :include_blank => 'None' }, :class => 'chzn-select', :'data-placeholder' => 'Search Venues', :style => 'width: 300px;' %>
+    <%= f.label :venue_id, t('venue', :scope => "activerecord.attributes.refinery/calendar/event") %>
+    <%= f.collection_select :venue_id, @venues, :id, :name, { :include_blank => t('venue_none', :scope => "activerecord.attributes.refinery/calendar/event") }, :class => 'chzn-select', :'data-placeholder' => 'Search Venues', :style => 'width: 300px;' %>
   </div>
 
   <div class='field'>

app/views/refinery/calendar/admin/events/_records.html.erb

@@ -8,7 +8,7 @@
     <p>
       <% unless searching? %>
         <strong>
-          <%= t('.no_items_yet') %>
+          <%= t('.no_items_yet', :create => t('create_new', :scope => 'refinery.calendar.admin.events.actions')) %>
         </strong>
       <% else %>
         <%= t('no_results', :scope => 'refinery.admin.search') %>

app/views/refinery/calendar/admin/events/index.html.erb

@@ -1,5 +1,5 @@
 <section id='records'>
-  <h2>Calendar: Events</h2>
+  <h2><%= t('title', :scope => 'refinery.calendar.admin.events.records')  %></h2>
   <%= render 'records' %>
 </section>
 <aside id='actions'>

app/views/refinery/calendar/admin/venues/_records.html.erb

@@ -8,7 +8,7 @@
     <p>
       <% unless searching? %>
         <strong>
-          <%= t('.no_items_yet') %>
+          <%= t('.no_items_yet', :create => t('create_new', :scope => 'refinery.calendar.admin.venues.actions')) %>
         </strong>
       <% else %>
         <%= t('no_results', :scope => 'refinery.admin.search') %>

app/views/refinery/calendar/admin/venues/index.html.erb

@@ -1,5 +1,5 @@
 <section id='records'>
-  <h2>Calendar: Venues</h2>
+  <h2><%= t('title', :scope => 'refinery.calendar.admin.venues.records')  %></h2>
   <%= render 'records' %>
 </section>
 <aside id='actions'>

app/views/refinery/calendar/events/_event.html.erb

@@ -1,6 +1,6 @@
 <%= div_for event do -%>
-  <time class="date" datetime="<%= event.from %>">
-    <%= event.from.strftime('%b %d').html_safe %>
+  <time class="date" datetime="<%= event.start_at %>">
+    <%= event.start_at.strftime('%b %d').html_safe %>
   </time>
 
   <h1><%= link_to event.title, refinery.calendar_event_path(event) %></h1>

app/views/refinery/calendar/events/show.html.erb

@@ -1,20 +1,28 @@
-<% content_for :body_content_title do %>
+<% content_for :title do %>
   <%= @event.title %>
 <% end %>
 
 <% content_for :body_content_left do %>
-  <h4>Event details</h4>
+  <h4><%= t('event_details', :scope => 'refinery.calendar.events.show') %></h4>
   <h5><%= @event.venue_name %></h5>
 
-  <p>From <%= @event.from.strftime('%B %d, %Y %I:%M%p') %> to
-      <br><%= @event.to.strftime('%B %d, %Y %I:%M%p') %></p>
+  <p>
+    <time datetime="<%=l @event.start_at, :format => :default %>" class='posted_at'>
+      <%= t('start', :scope => 'refinery.calendar.events.show', :when => l(@event.start_at.to_datetime, :format => :long)) %>
+    </time>
+  </p>
+  <p>
+    <time datetime="<%=l @event.start_at, :format => :default %>" class='posted_at'>
+    <%= t('end', :scope => 'refinery.calendar.events.show', :when => l(@event.end_at.to_datetime, :format => :long)) %>
+    </time>
+  </p>
 
   <% if @event.registration_link.present? %>
-    <p><%= link_to 'Register for this event', @event.registration_link %></p>
+    <p><%= link_to t('register', :scope => 'refinery.calendar.events.show'), @event.registration_link %></p>
   <% end -%>
 
   <% if @event.venue_address.present? %>
-    <p><%= link_to 'View it on a map', "http://maps.google.com/maps?f=q&source=s_q&hl=en&geocode=&q=#{CGI::escape(@event.venue.address)}&ie=UTF8&z=16" %></p>
+    <p><%= link_to t('view_on_map', :scope => 'refinery.calendar.events.show'), "http://maps.google.com/maps?f=q&source=s_q&hl=en&geocode=&q=#{CGI::escape(@event.venue.address)}&ie=UTF8&z=16" %></p>
   <% end -%>
 
   <div class="event_description">

config/locales/de.yml

@@ -0,0 +1,69 @@
+de:
+  refinery:
+    plugins:
+      venues:
+        title: Veranstaltungsort
+      calendar:
+        title: Events
+    calendar:
+      admin:
+        shared:
+          links:
+            manage_events: Events verwalten
+            manage_venues: Orte verwalten
+        venues:
+          actions:
+            create_new: Ort hinzufügen
+            reorder: Orte umsortieren
+            reorder_done: Umsortieren erledigt
+          records:
+            title: Veranstaltungsorte
+            sorry_no_results: Es sind momentan keine vorhanden
+            no_items_yet: 'Es sind noch keine Veranstaltungsorte vorhanden. Klicken Sie auf "%{create}", um Ihren erstem Veranstaltungsort hinzuzufügen.'
+          venue:
+            view_live_html: Diesen Ort Live betrachten <br/><em>(öffnet sich in einem neuen Fenster)</em>
+            edit: Diesen Ort bearbeiten
+            delete: Diesen Ort bearbeiten
+        events:
+          actions:
+            create_new: Event hinzufügen
+            reorder: Events umsortieren
+            reorder_done: Umsortieren erledigt
+          records:
+            title: Events
+            sorry_no_results: Es sind momentan keine Events vorhanden
+            no_items_yet: 'Es sind noch keine Events vorhanden. Klicken Sie auf "%{create}", um Ihr erstes Event hinzuzufügen.'
+          event:
+            view_live_html: Dieses Event live betrachten <br/><em>(Öffnet sich in einem neuen Fenster)</em>
+            edit: Dieses Event bearbeiten
+            delete: Dies Event löschen
+      venues:
+        show:
+          other: Andere Veranstaltungsorte
+      events:
+        show:
+          other: Andere Events
+          event_details: Detaills
+          start: 'Beginn %{when}'
+          end: 'Bis %{when}'
+          view_on_map: Auf einer Karte anschauen
+          register: Für dieses Event anmelden
+  activerecord:
+    attributes:
+      refinery/calendar/venue:
+        name: Name
+        address: Addresse
+        url: Url
+        phone: Telefon
+      refinery/calendar/event:
+        title: Titel
+        from: Von
+        to: Bis
+        registration_link: Registrierungs Link
+        venue: Veranstaltungsort
+        venue_none: Keine Angabe
+        excerpt: Kurzbeschreibung
+        description: Beschreibung
+        featured: Spezial
+
+

config/locales/en.yml

@@ -45,6 +45,11 @@ en:
       events:
         show:
           other: Other Events
+          event_details: Details
+          start: 'From %{when}'
+          end: 'To %{when}'
+          view_on_map: View on Map
+          register: Register for this Event
   activerecord:
     attributes:
       refinery/calendar/venue:
@@ -54,8 +59,8 @@ en:
         phone: Phone
       refinery/calendar/event:
         title: Title
-        from: From
-        to: To
+        start_at: From
+        end_at: To
         registration_link: Registration Link
         excerpt: Excerpt
         description: Description

config/locales/es.yml

@@ -52,8 +52,8 @@ es:
         phone: Phone
       refinery/calendar/event:
         title: Title
-        from: From
-        to: To
+        start_at: From
+        end_at: To
         registration_link: Registration Link
         excerpt: Excerpt
         description: Description

config/locales/fr.yml

@@ -50,8 +50,8 @@ fr:
         phone: Phone
       refinery/calendar/event:
         title: Title
-        from: From
-        to: To
+        start_at: From
+        end_at: To
         registration_link: Registration Link
         excerpt: Excerpt
         description: Description

config/locales/nb.yml

@@ -52,8 +52,8 @@ nb:
         phone: Phone
       refinery/calendar/event:
         title: Title
-        from: From
-        to: To
+        start_at: From
+        end_at: To
         registration_link: Registration Link
         excerpt: Excerpt
         description: Description

config/locales/nl.yml

@@ -52,8 +52,8 @@ nl:
         phone: Phone
       refinery/calendar/event:
         title: Title
-        from: From
-        to: To
+        start_at: From
+        end_at: To
         registration_link: Registration Link
         excerpt: Excerpt
         description: Description

db/migrate/1_create_calendar_events.rb

@@ -3,8 +3,8 @@ class CreateCalendarEvents < ActiveRecord::Migration
   def up
     create_table :refinery_calendar_events do |t|
       t.string :title
-      t.date :from
-      t.date :to
+      t.datetime :start_at
+      t.datetime :end_at
       t.string :registration_link
       t.string :excerpt
       t.text :description