Avoid i18n collision with other finn plugins.

pull/6827/head
Felix Schäfer 14 years ago
parent d376ee3e71
commit 03c3f0468d
  1. 2
      app/views/meeting_contents/_show.html.erb
  2. 4
      config/locales/de.yml
  3. 4
      config/locales/en.yml

@ -3,7 +3,7 @@
<div class="contextual">
<%= link_to l(:button_edit), "#", :class => 'icon icon-edit', :accesskey => accesskey(:edit), :onclick => "Element.show(\"edit-#{content_type}\"); Element.hide(\"#{content_type}-text\"); return false;" if authorize_for(content_type.pluralize, 'update') && content.editable? %>
<%= link_to_if_authorized(l(:label_history), {:controller => content_type.pluralize, :action => 'history', :meeting_id => content.meeting}, :class => 'icon icon-history') %>
<%= content.locked? ? link_to_if_authorized(l(:label_open), {:controller => content_type.pluralize, :action => 'open', :meeting_id => content.meeting}, :method => :put, :class => 'icon icon-lock') : link_to_if_authorized(l(:label_close), {:controller => content_type.pluralize, :action => 'close', :meeting_id => content.meeting}, :method => :put, :class => 'icon icon-lock') %>
<%= content.locked? ? link_to_if_authorized(l(:label_meeting_open), {:controller => content_type.pluralize, :action => 'open', :meeting_id => content.meeting}, :method => :put, :class => 'icon icon-lock') : link_to_if_authorized(l(:label_meeting_close), {:controller => content_type.pluralize, :action => 'close', :meeting_id => content.meeting}, :method => :put, :class => 'icon icon-lock') %>
</div>
<h2><%=l :"label_#{content_type}" %></h2>
<% if authorize_for(content_type.pluralize, 'update') && content.editable? -%>

@ -5,8 +5,8 @@ de:
label_meeting_new: "Neues Meeting"
label_meeting_agenda: "Agenda"
label_meeting_minutes: "Protokoll"
label_close: "Schließen"
label_open: "Öffnen"
label_meeting_close: "Schließen"
label_meeting_open: "Öffnen"
field_participants: "Teilnehmer"
field_participants_invited: "Eingeladen"
field_participants_attended: "Anwesend"

@ -5,8 +5,8 @@ en:
label_meeting_new: "New Meeting"
label_meeting_agenda: "Agenda"
label_meeting_minutes: "Minutes"
label_close: "Close"
label_open: "Open"
label_meeting_close: "Close"
label_meeting_open: "Open"
field_participants: "Participants"
field_participants_invited: "Invitees"
field_participants_attended: "Attendants"

Loading…
Cancel
Save