active_scaffold 3.3.3 → 3.4.0

data/app/views/active_scaffold_overrides/_field_search.html.erb

@@ -25,8 +25,7 @@ form_tag url_options, options %>
   </ol>
   <p class="form-footer">
     <%= submit_tag as_(:search), :class => "submit" %>
-    <%= link_to as_(:reset), url_for(url_options.merge(:search => '')), :class => 'as_cancel', :remote => true, :data => {:refresh => true} %>
+    <%= link_to as_(:reset), url_for(url_options.merge(:search => '')), :class => 'as_cancel reset', :remote => true, :data => {:refresh => true} %>
     <%= loading_indicator_tag(:action => :search) %>
   </p>
 </form>
-<%= javascript_tag("ActiveScaffold.focus_first_element_of_form('#{element_form_id(:action => 'search')}');") %>

data/app/views/active_scaffold_overrides/_form.html.erb

@@ -7,20 +7,22 @@
   <% columns.each :for => @record, :crud_type => (:read if show_unauthorized_columns) do |column| %>
   <% column_css_class = column.css_class unless column.css_class.nil? || column.css_class.is_a?(Proc) %>
   <% renders_as = column_renders_as(column) %>
-  <% authorized = show_unauthorized_columns ? @record.authorized_for?(:crud_type => form_action, :column => column.name) : true unless renders_as == :subsection %>
+  <% authorized = show_unauthorized_columns || renders_as == :subsection ? @record.authorized_for?(:crud_type => form_action, :column => column.name) : true %>
   <% if renders_as == :subsection -%>
+  <% if authorized %>
     <% subsection_id = sub_section_id(:sub_section => column.label) %>
   <li class="sub-section <%= column_css_class %>">
     <h5><%= column.label %></h5>
     <%= render :partial => 'form', :locals => { :columns => column, :subsection_id => subsection_id, :form_action => form_action, :scope => scope } %>
     <%= link_to_visibility_toggle(subsection_id, {:default_visible => !column.collapsed}) -%>
   </li>
+  <% end %>
   <% elsif renders_as == :subform and authorized -%>
-  <li class="sub-form <%= active_scaffold_config_for(column.association.klass).subform.layout %>-sub-form <%= column_css_class %> <%=column.name%>-sub-form" id="<%= sub_form_id(:association => column.name) %>">
+  <%= content_tag :li, active_scaffold_subform_attributes(column, column_css_class) do %>
     <%= render_column(column, @record, renders_as, scope) %>
-  </li>
+  <% end %>
   <% else -%>
-  <li class="form-element <%= 'required' if column.required? %> <%= column_css_class %>">
+  <li class="form-element <%= 'required' if column.required? %> <%= column.form_ui %> <%= column_css_class %>">
     <%= render_column(column, @record, renders_as, scope, !authorized) %>
   </li>
   <% end -%>

data/app/views/active_scaffold_overrides/_form_association.html.erb

@@ -1,9 +1,10 @@
 <%
+ActiveSupport::Deprecation.warn "Relying on @record to render form_asssociation partial with no parent_record local variable is deprecated", caller(1) unless local_assigns[:parent_record]
 parent_record ||= @record # save @record, some partial can change @record TODO remove when changing @record is removed
 associated = column.singular_association? ? [parent_record.send(column.name)].compact : parent_record.send(column.name).to_a
-associated = associated.sort_by {|r| r.new_record? ? 99999999999 : r.id} unless column.association.options.has_key?(:order)
+#associated = associated.sort_by {|r| r.new_record? ? 99999999999 : r.id} unless column.association.options.has_key?(:order)
 if column.show_blank_record?(associated)
-  show_blank_record = build_associated(column, parent_record)
+  show_blank_record = build_associated(column.association, parent_record)
 end
 disable_required_for_new = @disable_required_for_new
 @disable_required_for_new = !!show_blank_record unless (column.singular_association? && column.required?)
@@ -12,7 +13,7 @@ subform_div_id = "#{sub_form_id(:association => column.name, :id => parent_recor
 <h5><%= column.label -%></h5>
 <div id ="<%= subform_div_id %>" <%= 'style="display: none;"'.html_safe if column.collapsed -%>>
 <%# HACK to be able to delete all associated records %>
-  <%= hidden_field_tag "#{active_scaffold_input_options(column, scope)[:name]}[0]", '' if column.plural_association? %>
+  <%= hidden_field_tag "#{active_scaffold_input_options(column, scope, :object => parent_record)[:name]}[0]", '' if column.plural_association? %>
   <%= render :partial => subform_partial_for_column(column), :locals => {:column => column, :parent_record => parent_record, :associated => associated, :show_blank_record => show_blank_record, :scope => scope} %>
   <%= render :partial => 'form_association_footer', :locals => {:parent_record => parent_record, :column => column, :associated => associated, :scope => scope} -%>
 </div>

data/app/views/active_scaffold_overrides/_form_association_footer.html.erb

@@ -6,15 +6,15 @@ rescue ActiveScaffold::ControllerNotFound
 end
 @record = parent_record
 
-show_add_existing = column_show_add_existing(column)
-show_add_new = column_show_add_new(column, associated, @record)
+show_add_existing = column_show_add_existing(column, parent_record)
+show_add_new = column_show_add_new(column, associated, parent_record)
 
 return unless show_add_new or show_add_existing
 
 temporary_id = generated_id(parent_record) if parent_record.new_record?
 controller_path = active_scaffold_controller_for(parent_record.class).controller_path
-edit_associated_url = params_for(:controller => controller_path, :action => 'edit_associated', :child_association => column.name, :associated_id => '--ID--', :scope => scope, :id => parent_record.id, :generated_id => temporary_id, :parent_controller => controller.controller_path) if show_add_existing
-add_new_url = params_for(:controller => controller_path, :action => 'edit_associated', :child_association => column.name, :scope => scope, :id => parent_record.id, :generated_id => temporary_id, :parent_controller => controller.controller_path) if show_add_new
+edit_associated_url = params_for(:controller => controller_path, :action => 'edit_associated', :child_association => column.name, :associated_id => '--ID--', :scope => scope, :id => parent_record.to_param, :generated_id => temporary_id, :parent_controller => controller.controller_path) if show_add_existing
+add_new_url = params_for(:controller => controller_path, :action => 'edit_associated', :child_association => column.name, :scope => scope, :id => parent_record.to_param, :generated_id => temporary_id, :parent_controller => controller.controller_path) if show_add_new
 
 -%>
 <div class="footer-wrapper">
@@ -38,7 +38,7 @@ add_new_url = params_for(:controller => controller_path, :action => 'edit_associ
       <% if remote_controller and remote_controller.respond_to? :uses_record_select? and remote_controller.uses_record_select? -%>
         <%= link_to_record_select as_(:add_existing), remote_controller.controller_path, :onselect => "ActiveScaffold.record_select_onselect(#{url_for(edit_associated_url).to_json}, #{active_scaffold_id.to_json}, id);" -%>
       <% else -%>
-        <% select_options = options_from_collection_for_select(sorted_association_options_find(column.association), :id, :to_label)
+        <% select_options = options_from_collection_for_select(sorted_association_options_find(column.association, nil, parent_record), :to_param, :to_label)
            add_existing_id = "#{sub_form_id(:association => column.name, :id => parent_record.id || temporary_id || 99999999999)}-add-existing"
            add_existing_label = column.plural_association? ? :add_existing : :replace_existing %>
         <%= select_tag 'associated_id', '<option value="">'.html_safe + as_(:_select_) + '</option>'.html_safe + select_options %>

data/app/views/active_scaffold_overrides/_form_association_record.html.erb

@@ -1,6 +1,6 @@
 <%
   record_column = column
-  Rails.logger.warn "Relying on @record to render form_asssociation_record partial with no :object is deprecated, called from #{caller(1).detect {|l| l =~ /\.erb:/ }.gsub(/(.*:\d+):.*/, '\1')}" unless local_assigns[:form_association_record]
+  ActiveSupport::Deprecation.warn "Relying on @record to render form_asssociation_record partial with no :object is deprecated", caller(1) unless local_assigns[:form_association_record]
   record = form_association_record ||= @record # TODO remove me, backwards compatibility, no :collection neither object in render
   @record = record # TODO remove me, backward compatibility, helpers using @record
   readonly = (record.readonly? or not record.authorized_for?(:crud_type => :update))
@@ -9,7 +9,7 @@
   locked ||= false
   config = active_scaffold_config_for(record.class)
   scope = column_scope(record_column, scope, record)
-  options = active_scaffold_input_options(config.columns[record.class.primary_key], scope)
+  options = active_scaffold_input_options(config.columns[record.class.primary_key], scope, :object => record)
   tr_id = "association-#{options[:id]}"
 
   if config.subform.layout == :vertical
@@ -19,7 +19,7 @@
     error_tag ||= :div
     error_inner_tag ||= nil
     default_col_class = ['form-element']
-    flatten = true unless local_assigns.has_key? :flatten
+    flatten ||= false
   else
     record_tag ||= :tbody
     row_tag ||= :tr
@@ -44,7 +44,7 @@
 <%= content_tag row_tag, :id => tr_id, :class => "association-record#{' association-record-new' if record.new_record?}#{' locked' if locked}" do %>
 <% config.subform.columns.each :for => record.class, :crud_type => :read, :flatten => flatten do |column| %>
 <%
-  if column.is_a? ActiveScaffold::DataStructures::ActionColumns
+  if column.respond_to? :each
     columns_groups << column
     next
   end
@@ -52,8 +52,10 @@
   next unless in_subform?(column, parent_record)
   columns_length += 1
   show_actions = true
-  column = column.clone
-  column.form_ui ||= :select if column.association
+  if column.association && column.form_ui.nil?
+    column = column.clone
+    column.form_ui ||= :select
+  end
   
   col_class = default_col_class.clone
   col_class << 'required' if column.required?

data/app/views/active_scaffold_overrides/_horizontal_subform_header.html.erb

@@ -2,16 +2,17 @@
   <tr>
     <%
     active_scaffold_config_for(record_class).subform.columns.each :for => record_class, :crud_type => :read do |column|
-      next if column.is_a? ActiveScaffold::DataStructures::ActionColumns
+      next unless column.is_a? ActiveScaffold::DataStructures::Column
       next unless in_subform?(column, parent_record)
       hidden = column_renders_as(column) == :hidden
       -%>
       <th class="<%= "#{column.name}-column #{'required' if column.required?} #{'hidden' if hidden}" %>">
-        <label><%= column.label unless hidden %></label>
+        <label><%= subform_label(column, hidden) %></label>
         <% if column.description.present? -%>
           <span class="description"><%= column.description %></span>
         <% end -%>
       </th>
     <% end -%>
+    <th></th>
   </tr>
 </thead>

data/app/views/active_scaffold_overrides/_list.html.erb

@@ -4,7 +4,7 @@
     <tr>
       <td class="messages-container">
         <p class="error-message message server-error" style="display:none;">
-          <%= as_(:internal_error).html_safe %>
+          <%= as_(:internal_error).html_safe %><span class="error-500"><%= as_(:error_500).html_safe %></span>
           <a href="#" class="close" title="<%= as_(:close).html_safe %>"><%= as_(:close).html_safe %></a>
         </p>
         <div id="<%= active_scaffold_messages_id -%>" class="action-messages">
@@ -23,13 +23,15 @@
     </tr>
   </thead>
   <%= render :partial => 'list_messages', :locals => {:columns => columns} %>
-  <tbody class="records" id="<%= active_scaffold_tbody_id %>">
+  <tbody class="records" id="<%= active_scaffold_tbody_id %>" data-refresh-record="<%= url_for(params_for(:action => :index, :id => '--ID--')) %>">
     <% if !@page.empty? -%>
-      <%= render :partial => 'list_record', :collection => @page.items, :locals => {:hidden => false, :columns => columns, :action_links => active_scaffold_config.action_links.member, :data_refresh => url_for(params_for(:action => :row, :id => '--ID--', :_method => :get))} %>
-    <% end -%>
-    <% if columns.any? {|c| c.calculation?} -%>
-      <%= render :partial => 'list_calculations', :locals => {:columns => columns} %>
+      <%= render :partial => 'list_record', :collection => @page.items, :locals => {:hidden => false, :columns => columns, :action_links => active_scaffold_config.action_links.member} %>
     <% end -%>
   </tbody>
+  <% if columns.any? {|c| c.calculation?} -%>
+  <tfoot>  
+    <%= render :partial => 'list_calculations', :locals => {:columns => columns} %>
+  </tfoot>
+  <% end -%>
 </table>
 <%= render :partial => 'list_pagination' %>

data/app/views/active_scaffold_overrides/_list_column_headings.html.erb

@@ -1,12 +1,9 @@
 <%
 sorting = active_scaffold_config.list.user.sorting
-sorting_stages = ['reset', 'ASC', 'DESC']
 default_sorting = active_scaffold_config.list.user.default_sorting
-default_sorting_stages = ['ASC', 'DESC']
 -%>
 <% columns.each do |column| -%>
-  <% stages = default_sorting.sorts_on?(column) ? default_sorting_stages : sorting_stages -%>
-  <%= render_column_heading(column, sorting, stages.after(sorting.direction_of(column)) || 'ASC') %>
+  <%= render_column_heading(column, sorting, sorting.next_sorting_of(column, default_sorting.sorts_on?(column))) %>
 <% end -%>
 <th class="actions">
 </th>

data/app/views/active_scaffold_overrides/_list_pagination.html.erb

@@ -1,11 +1,11 @@
-<% if active_scaffold_config.list.pagination -%>
 <div class="active-scaffold-footer">
-<% unless @page.pager.infinite? -%>
+<% if active_scaffold_config.list.pagination != :infinite -%>
   <div class="active-scaffold-found"><span class="active-scaffold-records"><%= @page.pager.count -%></span> <%=as_(:found, :count => @page.pager.count) %></div>
 <% end -%>
-  <div class="active-scaffold-pagination">
+<% if active_scaffold_config.list.pagination -%>
+  <div class="active-scaffold-pagination<%= " auto-paginate" if active_scaffold_config.list.auto_pagination %>">
     <%= render :partial => 'list_pagination_links', :locals => { :current_page => @page } if @page.pager.infinite? || @page.pager.number_of_pages > 1 %>
   </div>
+<% end -%>
   <br /><!-- to clear this block -->
 </div>
-<% end -%>

data/app/views/active_scaffold_overrides/_list_pagination_links.html.erb

@@ -1,5 +1,5 @@
 <% unless current_page.nil? -%>
-  <% url_options = params_for(:action => :index) -%>
+  <% url_options = pagination_url_options -%>
   <% options = {'data-page-history' => controller_id, :remote => true, :method => :get} -%>
 
   <%= loading_indicator_tag :action => :pagination %>

data/app/views/active_scaffold_overrides/_list_record.html.erb

@@ -1,11 +1,11 @@
 <%
-record = list_record if list_record # compat with render :partial :collection
+record = list_record if local_assigns[:list_record] # compat with render :partial :collection
 columns ||= list_columns
 tr_class = cycle("", "even-record") + ' ' + list_row_class(record)
 action_links ||= active_scaffold_config.action_links.member
-data_refresh ||= url_for(params_for(:action => :row, :id => '--ID--', :_method => :get))
+data_refresh ||= record.to_param
 -%>
-<tr class="record <%= tr_class %>" id="<%= element_row_id(:action => :list, :id => record.id) %>" data-refresh="<%= data_refresh.sub('--ID--', record.id.to_s) %>">
+<tr class="record <%= tr_class %>" id="<%= element_row_id(:action => :list, :id => record.id) %>" data-refresh="<%= data_refresh %>">
   <% columns.each do |column| %>
     <% authorized = record.authorized_for?(:crud_type => :read, :column => column.name) -%>
     <% column_value = authorized ? get_column_value(record, column) : active_scaffold_config.list.empty_field_text -%>

data/app/views/active_scaffold_overrides/_refresh_list.js.erb

@@ -1,4 +1,11 @@
-<% if active_scaffold_config.list.refresh_with_header -%>
+<% if @auto_pagination -%>
+<% if @page.items.present? -%>
+ActiveScaffold.append('<%= active_scaffold_tbody_id %>', '<%= escape_javascript(render(:partial => 'list_record', :collection => @page.items, :locals => {:hidden => false, :columns => list_columns, :action_links => active_scaffold_config.action_links.member})) %>');
+<% if @page.pager.infinite? || @page.number < @page.pager.number_of_pages -%>
+ActiveScaffold.auto_load_page('<%= url_for main_path_to_return %>', {auto_pagination: true, page: <%= @page.number + 1 %>});
+<% end %>
+<% end %>
+<% elsif active_scaffold_config.list.refresh_with_header -%>
 ActiveScaffold.replace('<%= active_scaffold_id %>', '<%= escape_javascript(render('list_with_header')) %>');
 <% else -%>
 ActiveScaffold.replace_html('<%= active_scaffold_content_id %>', '<%= escape_javascript(render('list')) %>');

data/app/views/active_scaffold_overrides/_search.html.erb

@@ -2,33 +2,27 @@
 <% url_options =  params_for(:action => :index).delete_if{|k,v| k == 'search'} -%>
 <%=
 options = {:id => element_form_id(:action => 'search'),
-           :class => "as_form search",
+           :class => "as_form search#{' live' if live_search}",
            :remote => true,
+           :'data-loading' => true,
            :method => :get}
-options['data-loading'] = true unless live_search
   form_tag url_options, options %>
-  <%= text_field_tag :search, search_params, :class => 'text-input', :id => search_input_id, :size => 50, :autocomplete => :off %>
-  <%= submit_tag as_(:search), :class => "submit" %>
-  <%= link_to as_(:reset), url_for(url_options.merge(:search => '')), :class => 'as_cancel', :remote => true, :data => {:refresh => true} %>
+  <%= search_field_tag :search, search_params, :class => 'text-input', :id => search_input_id, :size => 50, :autocomplete => :off, :placeholder => as_(live_search ? :live_search : :search_terms) %>
+  <%= submit_tag as_(:search), :class => "submit", :style => ('display:none;' if live_search) %>
+  <%= link_to as_(:reset), url_for(url_options.merge(:search => '')), :class => 'as_cancel reset', :remote => true, :data => {:refresh => true} %>
   <%= loading_indicator_tag(:action => :search) %>
 </form>
 
+<% if ActiveScaffold.js_framework == :prototype %>
 <script type="text/javascript">
 //<![CDATA[
-<% if ActiveScaffold.js_framework == :prototype %>
   new TextFieldWithExample('<%= search_input_id %>', '<%= as_(live_search ? :live_search : :search_terms) %>', {focus: true});
 <% if live_search -%>
-  $(<%= search_input_id.to_json.html_safe %>).next().hide();
   new Form.Element.DelayedObserver('<%= search_input_id %>', 0.5, function(element, value) {
     if (!$(element.id)) return false; // because the element may have been destroyed
     $(element).next().click();
   });
 <% end -%>
-<% elsif live_search && ActiveScaffold.js_framework == :jquery %>
-  jQuery(<%= "##{search_input_id}".to_json.html_safe %>).next().hide();
-  jQuery(<%= "##{search_input_id}".to_json.html_safe %>).delayedObserver(0.5, function() {
-     jQuery(<%= "##{search_input_id}".to_json.html_safe %>).parent().trigger("submit");});
-<% end -%>
-ActiveScaffold.focus_first_element_of_form('<%= element_form_id(:action => 'search') %>');
 //]]>
 </script>
+<% end -%>

data/app/views/active_scaffold_overrides/_show_columns.html.erb

@@ -1,7 +1,7 @@
 <dl>
 <% columns.each :for => @record do |column| %>
   <dt><%= column.label -%></dt>
-<% if column.is_a? ActiveScaffold::DataStructures::ActionColumns -%>
+<% if column.respond_to? :each -%>
   <dd>
     <%= render :partial => 'show_columns', :locals => {:columns => column} %>
 <% else -%>

data/app/views/active_scaffold_overrides/on_create.js.erb

@@ -20,7 +20,7 @@ action_link.update_flash_messages('<%= escape_javascript(render(:partial => 'mes
   <% elsif active_scaffold_config.create.refresh_list %>
     <%= render :partial => 'refresh_list' %>
   <% elsif params[:parent_controller].nil? %>
-    <% new_row = render :partial => 'list_record', :locals => {:record => @record} %>
+    <% new_row = render :partial => 'list_record', :locals => {:record => @saved_record || @record} %>
     ActiveScaffold.create_record_row(action_link ? action_link.scaffold() : '<%= active_scaffold_id %>', '<%= escape_javascript(new_row) %>', <%= {:insert_at => insert_at}.to_json.html_safe %>);
     <%= render :partial => 'update_calculations', :formats => [:js] %>
   <% end %>
@@ -28,13 +28,13 @@ action_link.update_flash_messages('<%= escape_javascript(render(:partial => 'mes
   <% unless render_parent? %>
     <% if active_scaffold_config.list.always_show_create %>
       ActiveScaffold.reset_form('<%= form_selector %>');
-    <% elsif active_scaffold_config.create.persistent %>
-      action_link.reload();
+    <% elsif params[:dont_close] %>
+      ActiveScaffold.replace('<%= form_selector %>','<%= escape_javascript(render(:partial => 'create_form', :locals => {:xhr => true})) %>');
     <% else %>
       action_link.close();
     <% end %>
     <% if (active_scaffold_config.create.action_after_create) %>
-      var link = ActiveScaffold.find_action_link('<%= action_link_id active_scaffold_config.create.action_after_create, @record.id %>');
+      var link = ActiveScaffold.find_action_link('<%= action_link_id active_scaffold_config.create.action_after_create, @record.id || @saved_record.id %>');
       if (link) (function() { link.open() })<%= '.defer' if ActiveScaffold.js_framework == :prototype %>();
     <% end %>
   <% end %>

data/app/views/active_scaffold_overrides/render_field_inplace.html.erb

@@ -1,6 +1,6 @@
 <%
   column = active_scaffold_config.columns[@column.name]
-  options = active_scaffold_input_options(column)
+  options = active_scaffold_input_options(column, nil, :object => @record)
   options[:class] = "#{options[:class]} inplace_field"
 -%>
 <%= active_scaffold_input_for(column, nil, options) %>

data/app/views/active_scaffold_overrides/row.js.erb

@@ -1,2 +1,2 @@
-ActiveScaffold.update_row('<%= element_row_id(:action => :list) %>', '<%= escape_javascript render('list_record', :record => @record) %>');
+ActiveScaffold.update_row('<%= element_row_id(:action => :list, :id => @record.try(:id)) %>', '<%= escape_javascript render('list_record', :record => @record) %>');
 <%= render :partial => 'update_calculations', :formats => [:js] %>

data/config/locales/de.yml

@@ -1,126 +1,137 @@
-de:
-  time:
-    formats:
-      picker: ! '%d.%m.%Y %H:%M'
-  active_scaffold:
+de: 
+  active_scaffold: 
+    ? "!="
+    : "!="
+    <: <
+    <=: <=
+    ? ">"
+    : ">"
+    ? ">="
+    : ">="
+    _select_: "- Auswählen -"
+    _to_: " zu "
     add: Hinzufügen
-    add_existing: Existierenden Eintrag hinzufügen
-    add_existing_model: Existierende %{model} hinzufügen
-    apply: Apply
-    are_you_sure_to_delete: Sind Sie sicher?
+    add_existing: "Existierenden Eintrag hinzufügen"
+    add_existing_model: "Existierende %{model} hinzufügen"
+    update_apply: Apply
+    create_apply: Create and continue
+    are_you_sure_to_delete: "Sind Sie sicher?"
+    average: Average
+    begins_with: Beginnt
+    between: Zwischen
     cancel: Abbrechen
-    click_to_edit: Zum Editieren anklicken
+    cant_destroy_record: "%{record} kann nicht gelöscht werden"
+    click_to_edit: "Zum Editieren anklicken"
     click_to_reset: Reset
     close: Schließen
     config_list: Konfigurieren
-    config_list_model: Konfiguriere Spalten für %{model}
+    config_list_model: "Konfiguriere Spalten für %{model}"
+    contains: Enthält
     create: Anlegen
-    create_model: Lege %{model} an
-    create_another: Weitere anlegen
-    created_model: ! '%{model} angelegt'
-    create_new: Neu anlegen
+    create_another: "Weitere anlegen"
+    create_model: "Lege %{model} an"
+    create_new: "Neu anlegen"
+    created_model: "%{model} angelegt"
     customize: Anpassen
+    date_picker_options: 
+      firstDay: 1
+      isRTL: false
+      showMonthAfterYear: false
+      weekHeader: Wo
+    datetime_picker_options: 
+      closeText: Schließen
+      currentText: Jetzt
+      timeText: Uhrzeit
+    days: Tage
     delete: Löschen
-    deleted_model: ! '%{model} gelöscht'
+    deleted_model: "%{model} gelöscht"
     delimiter: Trennzeichen
     download: Download
     edit: Bearbeiten
+    ends_with: Endet
+    error_500: "(code 500, Interner Fehler)"
+    errors: 
+      template: 
+        body: "Bitte überprüfen Sie die folgenden Felder:"
+        header: 
+          one: "Konnte %{model} nicht speichern: ein Fehler."
+          other: "Konnte %{model} nicht speichern: %{count} Fehler."
     export: Exportieren
-    nested_for_model: ! '%{nested_model} für %{parent_model}'
-    nested_of_model: ! '%{nested_model} von %{parent_model}'
-    'false': 'False'
+    ? "false"
+    : "False"
     filtered: (Gefiltert)
     found: Gefunden
-    hide: Verstecken
-    inplace_edit_handle: --
+    future: Nächsten
+    hide: (Verstecken)
+    hours: Stunden
+    human_conditions: 
+      association: "%{column} = %{value}"
+      boolean: "%{column} = %{value}"
+    inplace_edit_handle: "--"
+    internal_error: "Fehler bei der Verarbeitung"
     live_search: Live-Suche
     loading: Lade…
-    mark_all_records: Mark all
+    mark_all_records: "Mark all"
+    maximum: Maximum
+    minimum: Minimum
+    minutes: Minuten
+    months: Monate
+    nested_for_model: "%{nested_model} für %{parent_model}"
+    nested_of_model: "%{nested_model} von %{parent_model}"
     next: Vor
-    no_entries: Keine Einträge
-    no_options: Keine Optionen
-    omit_header: Lasse Header weg
+    next_month: "Nächsten Monat"
+    next_week: "Nächste Woche"
+    next_year: "Nächstes Jahr"
+    no_authorization_for_action: "Keine Berechtigung für Aktion %{action}"
+    no_entries: "Keine Einträge"
+    no_options: "Keine Optionen"
+    not_null: "Nicht Null"
+    ? "null"
+    : "Null"
+    omit_header: "Lasse Header weg"
+    optional_attributes: Weitere
     options: Optionen
+    past: Letzten
     pdf: PDF
+    prev_month: "Letzten Monat"
+    prev_week: "Letzte Woche"
+    prev_year: "Letztes Jahr"
     previous: Zurück
     print: Drucken
-    records_marked:
-      one: 1 marked %{model}
-      other: ! '%{count} marked %{model}'
-    refresh: Neu laden
+    range: Zeitraum
+    record_not_saved: "Eintrag kann nicht gespeichert werden. Ursache unbekannt."
+    records_marked: 
+      one: "1 marked %{model}"
+      other: "%{count} marked %{model}"
+    refresh: "Neu laden"
     remove: Entfernen
-    remove_file: Entferne oder Ersetze Datei
-    replace_existing: Existierenden ersetzen
-    replace_with_new: Mit Neuer ersetzen
-    revisions_for_model: Revisionen für %{model}
+    remove_file: "Entferne oder Ersetze Datei"
+    replace_existing: "Existierenden ersetzen"
+    replace_with_new: "Mit Neuer ersetzen"
     reset: Zurücksetzen
+    revisions_for_model: "Revisionen für %{model}"
     saving: Speichern…
     search: Suche
     search_terms: Suchbegriffe
-    _select_: ! '- Auswählen -'
+    seconds: Sekunden
     show: Anzeigen
-    show_model: Zeige %{model} an
-    _to_: ! ' zu '
-    'true': 'True'
-    update: Speichern
-    update_model: Editiere %{model}
-    updated_model: ! '%{model} aktualisiert'
-    =: =
-    ! '>=': ! '>='
-    <=: <=
-    ! '>': ! '>'
-    <: <
-    ! '!=': ! '!='
-    between: Zwischen
-    contains: Enthält
-    begins_with: Beginnt
-    ends_with: Endet
+    show_block: (Anzeigen)
+    show_model: "Zeige %{model} an"
+    sum: Sum
+    this_month: "Diesen Monat"
+    this_week: "Diese Woche"
+    this_year: "Dieses Jahr"
     today: Heute
-    yesterday: Gestern
     tomorrow: Morgen
-    this_week: Diese Woche
-    prev_week: Letzte Woche
-    next_week: Nächste Woche
-    this_month: Diesen Monat
-    prev_month: Letzten Monat
-    next_month: Nächsten Monat
-    this_year: Dieses Jahr
-    prev_year: Letztes Jahr
-    next_year: Nächstes Jahr
-    past: Letzten
-    future: Nächsten
-    range: Zeitraum
-    seconds: Sekunden
-    minutes: Minuten
-    hours: Stunden
-    days: Tage
+    ? "true"
+    : "True"
+    update: Speichern
+    update_model: "Editiere %{model}"
+    updated_model: "%{model} aktualisiert"
+    version_inconsistency: "Inkonsistente Versionen - dieser Eintrag wurde verändert nachdem Sie mit der Bearbeitung begonnen haben."
     weeks: Wochen
-    months: Monate
     years: Jahre
-    optional_attributes: Weitere
-    :null: 'Null'
-    not_null: Nicht Null
-    date_picker_options:
-      weekHeader: Wo
-      firstDay: 1
-      isRTL: false
-      showMonthAfterYear: false
-    datetime_picker_options:
-      timeText: Uhrzeit
-      currentText: Jetzt
-      closeText: Schließen
-    human_conditions:
-      boolean: ! '%{column} = %{value}'
-      association: ! '%{column} = %{value}'
-    errors:
-      template:
-        header:
-          one: ! 'Konnte %{model} nicht speichern: ein Fehler.'
-          other: ! 'Konnte %{model} nicht speichern: %{count} Fehler.'
-        body: ! 'Bitte überprüfen Sie die folgenden Felder:'
-    cant_destroy_record: ! '%{record} kann nicht gelöscht werden'
-    internal_error: Fehler bei der Verarbeitung (code 500, Interner Fehler)
-    version_inconsistency: Inkonsistente Versionen - dieser Eintrag wurde verändert nachdem Sie mit der Bearbeitung begonnen haben.
-    record_not_saved: Eintrag kann nicht gespeichert werden. Ursache unbekannt.
-    no_authorization_for_action: Keine Berechtigung für Aktion %{action}
-    'null': 'Null'
+    yesterday: Gestern
+  time: 
+    formats: 
+      picker: "%d.%m.%Y %H:%M"