Merge pull request #17 from finnlabs/feature/rails3_fix_translations

Fixed translations

app/views/meeting_contents/_form.html.erb

@@ -15,7 +15,7 @@ See doc/COPYRIGHT.rdoc for more details.
 
 <p><%= f.text_area :text, :cols => 100, :rows => 25, :class => 'wiki-edit', :accesskey => accesskey(:edit) %></p>
 <%= f.hidden_field :lock_version %>
-<p><label for="<%= content_type %>_comment"><%= l(:field_comments) %></label><br /><%= f.text_field :comment, :size => 120 %></p>
+<p><label for="<%= content_type %>_comment"><%= Meeting.human_attribute_name(:comments) %></label><br /><%= f.text_field :comment, :size => 120 %></p>
 <p><%= submit_tag l(:button_save) %> 
 <%= link_to_remote l(:label_preview), 
                     {:url => {:controller => content_type.pluralize, :action => 'preview', :meeting_id => content.meeting},

app/views/meeting_contents/history.html.erb

@@ -20,9 +20,9 @@ See doc/COPYRIGHT.rdoc for more details.
     <th>#</th>
     <th></th>
     <th></th>
-    <th><%= l(:field_updated_on) %></th>
+    <th><%= Meeting.human_attribute_name(:updated_on) %></th>
-    <th><%= l(:field_author) %></th>
+    <th><%= Meeting.human_attribute_name(:author) %></th>
-    <th><%= l(:field_comments) %></th>
+    <th><%= Meeting.human_attribute_name(:comments) %></th>
 </tr></thead>
 <tbody>
 <% show_diff = @content_versions.size > 1 %>

app/views/meeting_mailer/content_for_review.html.erb

@@ -15,9 +15,9 @@ See doc/COPYRIGHT.rdoc for more details.
 
 <ul>
 <li><%=t :label_meeting_date_time %>: <%= format_date @meeting.start_date %> <%= format_time @meeting.start_time, false %>-<%= format_time @meeting.end_time, false %></li>
-<li><%=t :field_location %>: <%= @meeting.location %></li>
+<li><%=Meeting.human_attribute_name(:location) %>: <%= @meeting.location %></li>
-<li><%=t :field_participants_invited %>: <%= @meeting.participants.invited.sort.join("; ") %></li>
+<li><%=Meeting.human_attribute_name(:participants_invited) %>: <%= @meeting.participants.invited.sort.join("; ") %></li>
-<li><%=t :field_participants_attended %>: <%= @meeting.participants.attended.sort.join("; ") %></li>
+<li><%=Meeting.human_attribute_name(:participants_attended) %>: <%= @meeting.participants.attended.sort.join("; ") %></li>
 </ul>
 
 <p><%=raw t(:"text_review_#{@content_type}", :author => h(User.current), :link => link_to(@meeting.title, @meeting_url)) %></p>

app/views/meeting_mailer/content_for_review.text.erb

@@ -2,8 +2,8 @@
 <%= @meeting.author %>
 
 <%=t :label_meeting_date_time %>: <%= format_date @meeting.start_date %> <%= format_time @meeting.start_time, false %>-<%= format_time @meeting.end_time, false %>
-<%=t :field_location %>: <%= @meeting.location %>
+<%= Meeting.human_attribute_name(:location) %>: <%= @meeting.location %>
-<%=t :field_participants_invited %>: <%= @meeting.participants.invited.sort.join("; ") %>
+<%= Meeting.human_attribute_name(:participants_invited) %>: <%= @meeting.participants.invited.sort.join("; ") %>
-<%=t :field_participants_attended %>: <%= @meeting.participants.attended.sort.join("; ") %>
+<%= Meeting.human_attribute_name(:participants_attended) %>: <%= @meeting.participants.attended.sort.join("; ") %>
 
 <%=t(:"text_review_#{@content_type}", :author => User.current, :link => t(:"text_#{@content_type}_for_meeting", :meeting => @meeting.title) + " (#{@meeting_url})") %>

app/views/meetings/_form.html.erb

@@ -17,12 +17,12 @@ See doc/COPYRIGHT.rdoc for more details.
   <p><%= f.text_field :location, :size => 60 %></p>
   <p><%= f.text_field :start_date, :required => true, :size => 10 %><%= calendar_for('meeting_start_date') %> <%= time_select "meeting", "start_time", :ignore_date => true, :minute_step => 5 %> <%= Time.zone %></p>
   <p><%= f.text_field :duration, :required => true, :size => 5 %><em>(<%=l :text_in_hours %>)</em>
-  <div><label><%=l :field_participants %></label>
+  <div><label><%=Meeting.human_attribute_name(:participants) %></label>
     <table class="list">
       <thead><tr>
-        <th><%=l :field_name %></th>
+        <th><%=Meeting.human_attribute_name(:name) %></th>
-        <th><%=l :field_participants_invited %></th>
+        <th><%=Meeting.human_attribute_name(:participants_invited) %></th>
-        <th><%=l :field_participants_attended %></th>
+        <th><%=Meeting.human_attribute_name(:participants_attended) %></th>
       </tr></thead>
       <tbody>
         <% @meeting.all_possible_participants.sort.each do |user| -%>

app/views/meetings/index.html.erb

@@ -30,9 +30,9 @@ See doc/COPYRIGHT.rdoc for more details.
         <%= link_to h(meeting.title), :controller => 'meetings', :action => 'show', :id => meeting %>
       </dt>
       <dd class="meeting" id="meeting-<%= meeting.id %>">
-        <p><strong><%= l(:field_location) %></strong>: <%=h meeting.location %></p>
+        <p><strong><%= Meeting.human_attribute_name(:location) %></strong>: <%=h meeting.location %></p>
-        <p><strong><%= l(:field_participants_invited) %></strong> (<%= meeting.participants.select(&:invited).count %>): <%= format_participant_list meeting.participants.select(&:invited) %></p>
+        <p><strong><%= Meeting.human_attribute_name(:participants_invited) %></strong> (<%= meeting.participants.select(&:invited).count %>): <%= format_participant_list meeting.participants.select(&:invited) %></p>
-        <p><strong><%= l(:field_participants_attended) %></strong> (<%= meeting.participants.select(&:attended).count %>): <%= format_participant_list meeting.participants.select(&:attended) %></p>
+        <p><strong><%= Meeting.human_attribute_name(:participants_attended) %></strong> (<%= meeting.participants.select(&:attended).count %>): <%= format_participant_list meeting.participants.select(&:attended) %></p>
       </dd>
     <% end -%>
     </dl>

app/views/meetings/show.html.erb

@@ -23,14 +23,14 @@ See doc/COPYRIGHT.rdoc for more details.
   <%= avatar(@meeting.author, :size => "64") %>
   <p class="author"><%= authoring @meeting.created_at, @meeting.author %></p>
   <div class="splitcontentleft">
-  <p><strong><%= l(:field_start_time) %></strong>: <%= format_date @meeting.start_date %> <%= format_time @meeting.start_time, false %> - <%= format_time @meeting.end_time, false %> <%= Time.zone %></p>
+  <p><strong><%= Meeting.human_attribute_name(:start_time) %></strong>: <%= format_date @meeting.start_date %> <%= format_time @meeting.start_time, false %> - <%= format_time @meeting.end_time, false %> <%= Time.zone %></p>
   </div>
   <div class="splitcontentright">
-  <p><strong><%= l(:field_location) %></strong>: <%=h @meeting.location %></p>
+  <p><strong><%= Meeting.human_attribute_name(:location) %></strong>: <%=h @meeting.location %></p>
   </div>
   <div style="clear:both;"> </div>
-  <p><strong><%= l(:field_participants_invited) %></strong>: <%= format_participant_list @meeting.participants.invited %></p>
+  <p><strong><%= Meeting.human_attribute_name(:participants_invited) %></strong>: <%= format_participant_list @meeting.participants.invited %></p>
-  <p><strong><%= l(:field_participants_attended) %></strong>: <%= format_participant_list @meeting.participants.attended %></p>
+  <p><strong><%= Meeting.human_attribute_name(:participants_attended) %></strong>: <%= format_participant_list @meeting.participants.attended %></p>
 </div>
 
 <%= render_tabs [{:name => 'agenda', :action => :create_meeting_agendas, :partial => 'meeting_contents/show', :label => :label_meeting_agenda, :content => @meeting.agenda || @meeting.build_agenda, :content_type => "meeting_agenda"},

config/locales/de.yml

@@ -1,5 +1,18 @@
 # German strings go here for Rails i18n
 de:
+  activerecord:
+    attributes:
+      meeting:
+        duration: "Dauer"
+        location: "Ort/Raum"
+        participants: "Teilnehmer"
+        participants_attended: "Anwesend"
+        participants_invited: "Eingeladen"
+        start_time: "Anfangszeit"
+
+  description_attended: "teilgenommen"
+  description_invite: "eingeladen"
+
   label_meeting: "Besprechung"
   label_meeting_plural: "Besprechungen"
   label_meeting_new: "Neue Besprechung"
@@ -8,13 +21,12 @@ de:
   label_meeting_close: "Schließen"
   label_meeting_open: "Öffnen"
   label_meeting_agenda_close: "Agenda schließen um mit dem Protokoll zu beginnen"
-  label_notify: "Zur Einsicht verschicken"
   label_meeting_date_time: "Datum/Uhrzeit"
-  field_participants: "Teilnehmer"
+  label_notify: "Zur Einsicht verschicken"
-  field_participants_invited: "Eingeladen"
+
-  field_participants_attended: "Anwesend"
+  notice_successful_notification: "Benachrichtigung erfolgreich gesendet"
-  field_start_time: "Anfangszeit"
+  notice_timezone_missing: Keine Zeitzone eingestellt und daher %{zone} angenommen. Um Ihre Zeitzone einzustellen, clicken Sie bitte hier.
-  project_module_meetings: "Besprechungen"
+
   permission_create_meetings: "Besprechungen erstellen"
   permission_edit_meetings: "Besprechungen bearbeiten"
   permission_delete_meetings: "Besprechungen löschen"
@@ -24,20 +36,12 @@ de:
   permission_send_meeting_agendas_notification: "Benachrichtigungen für Agenden verschicken"
   permission_create_meeting_minutes: "Protokolle anlegen/bearbeiten"
   permission_send_meeting_minutess_notification: "Benachrichtigungen für Protokolle verschicken"
+
+  project_module_meetings: "Besprechungen"
+
+  text_agenda_for_meeting: 'Agenda für die Besprechung "%{meeting}"'
   text_in_hours: "in Stunden"
   text_meeting_agenda_open_are_you_sure: "Nicht-gespeicherte Inhalte des Protokolls werden durch diese Aktion verworfen! Weitermachen?"
+  text_minutes_for_meeting: 'Protokoll für die Besprechungen "%{meeting}"'
   text_review_meeting_agenda: "%{author} hat die %{link} zur Einsicht freigegeben:"
-  text_agenda_for_meeting: 'Agenda für die Besprechung "%{meeting}"'
   text_review_meeting_minutes: "%{author} hat das %{link} zur Einsicht freigegeben:"
-  text_minutes_for_meeting: 'Protokoll für die Besprechungen "%{meeting}"'
-  notice_successful_notification: "Benachrichtigung erfolgreich gesendet"
-  description_invite: eingeladen
-  description_attended: teilgenommen
-
-  activerecord:
-    attributes:
-      meeting:
-        location: "Ort/Raum"
-        duration: "Dauer"
-
-  notice_timezone_missing: Keine Zeitzone eingestellt und daher %{zone} angenommen. Um Ihre Zeitzone einzustellen, clicken Sie bitte hier.

config/locales/en.yml

@@ -1,5 +1,18 @@
 # English strings go here for Rails i18n
 en:
+  activerecord:
+    attributes:
+      meeting:
+        location: "Location"
+        duration: "Duration"
+        participants: "Participants"
+        participants_attended: "Attendants"
+        participants_invited: "Invitees"
+        start_time: "Time"
+
+  description_attended: "attended"
+  description_invite: "invited"
+
   label_meeting: "Meeting"
   label_meeting_plural: "Meetings"
   label_meeting_new: "New Meeting"
@@ -8,13 +21,12 @@ en:
   label_meeting_close: "Close"
   label_meeting_open: "Open"
   label_meeting_agenda_close: "Close the agenda to begin the Minutes"
-  label_notify: "Send for review"
   label_meeting_date_time: "Date/Time"
-  field_participants: "Participants"
+  label_notify: "Send for review"
-  field_participants_invited: "Invitees"
+
-  field_participants_attended: "Attendants"
+  notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here.
-  field_start_time: "Time"
+  notice_successful_notification: "Notification sent successfully"
-  project_module_meetings: "Meetings"
+
   permission_create_meetings: "Create meetings"
   permission_edit_meetings: "Edit meetings"
   permission_delete_meetings: "Delete meetings"
@@ -24,20 +36,12 @@ en:
   permission_send_meeting_agendas_notification: "Send review notification for agendas"
   permission_create_meeting_minutes: "Manage minutes"
   permission_send_meeting_minutess_notification: "Send review notification for minutes"
+
+  project_module_meetings: "Meetings"
+
+  text_agenda_for_meeting: 'agenda for the meeting "%{meeting}"'
   text_in_hours: "in hours"
   text_meeting_agenda_open_are_you_sure: "Unsaved content in the minutes will be lost! Continue?"
+  text_minutes_for_meeting: 'minutes for the meeting "%{meeting}"'
   text_review_meeting_agenda: "%{author} has put the %{link} up for review:"
-  text_agenda_for_meeting: 'agenda for the meeting "%{meeting}"'
   text_review_meeting_minutes: "%{author} has put the %{link} up for review:"
-  text_minutes_for_meeting: 'minutes for the meeting "%{meeting}"'
-  notice_successful_notification: "Notification sent successfully"
-  description_invite: invited
-  description_attended: attended
-
-  activerecord:
-    attributes:
-      meeting:
-        location: "Location"
-        duration: "Duration"
-
-  notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here.