active_scaffold 4.2.3 → 4.3.1

data/app/assets/stylesheets/active_scaffold/_variables.scss

@@ -0,0 +1,194 @@
+// ==============================================================
+// ACTIVE SCAFFOLD VARIABLES
+// ==============================================================
+// These are Sass variables for legacy support.
+// CSS variables are defined below and are the recommended way
+// to customize ActiveScaffold going forward.
+// ==============================================================
+
+// Base Colors
+$disabled_color: #999 !default;
+$actions_disabled_color: #666 !default;
+$link_color: #06c !default;
+$hover_bg: #ff8 !default;
+$header_color: #555 !default;
+
+// Column Headers
+$column_header_bg: $header_color !default;
+$column_header_link_color: #fff !default;
+$column_header_link_hover_bg: #000 !default;
+$column_header_link_hover_color: #ff8 !default;
+$column_header_color: #eee !default;
+$column_header_sorted_bg: #333 !default;
+
+// Columns
+$column_bg: #E6F2FF !default;
+$column_even_bg: #fff !default;
+$column_color: #333 !default;
+$column_empty_color: #999 !default;
+$column_border_color: #C5DBF7 !default;
+$column_even_border_color: #ddd !default;
+$column_actions_border_color: #ccc !default;
+$vertical_sub_form_border_color: $column_actions_border_color !default;
+
+// Sorted Columns
+$column_sorted_bg: #B9DCFF !default;
+$column_sorted_border_color: #AFD0F5 !default;
+$column_even_sorted_bg: #E6F2FF !default;
+$column_even_sorted_border_color: #AFD0F5 !default;
+
+// Calculations
+$calculations_bg: #eee !default;
+$calculations_border_color: #005CB8 !default;
+
+// Action Groups
+$action_group_color: #0066CC !default;
+$action_group_hover_bg: #ff8 !default;
+$action_group_border_color: #005CB8 !default;
+$action_group_items_bg: #EEE !default;
+$action_group_items_border_color: #222 !default;
+$action_group_link_color: $column_color !default;
+$active_filter: $link_color !default;
+
+// Nested Levels
+$nested_bg: #DAFFCD !default;
+$nested_border_color: #7FCF00 !default;
+$nested_footer_color: #444 !default;
+$nested_column_bg: #ECFFE7 !default;
+$nested_column_even_bg: #fff !default;
+$nested_column_border_color: $column_border_color !default;
+
+$second_nested_bg: #FFFFBB !default;
+$second_nested_border_color: #DDDF37 !default;
+
+$third_nested_bg: $nested_bg !default;
+$third_nested_border_color: $nested_border_color !default;
+
+// Pagination
+$pagination_border_color: #ccc !default;
+
+// Messages
+$msg_color: #333 !default;
+$msg_error_bg: #fbb !default;
+$msg_error_border_color: #f66 !default;
+$msg_warning_bg: #ffb !default;
+$msg_warning_border_color: #ff6 !default;
+$msg_info_bg: #bbf !default;
+$msg_info_border_color: #66f !default;
+$msg_filtered_bg: #e8e8e8 !default;
+$msg_filtered_color: #666 !default;
+
+// Forms
+$form_title_color: #1F7F00 !default;
+$label_color: $header_color !default;
+$description_color: #999 !default;
+$placeholder_color: #aaa !default;
+$input_border_color: $form_title_color !default;
+$input_error_border_color: #f00 !default;
+$input_focus_bg: #ffc !default;
+
+// Draggable Lists
+$draggable_list_bg: #FFFF88 !default;
+$draggable_list_selected_bg: #7FCF00 !default;
+$draggable_list_disabled_bg: $disabled_color !default;
+$checkbox_list_bg: #fff !default;
+
+// Subforms
+$subform_color: #999 !default;
+$subform_header_color: $header_color !default;
+$subform_footer_color: $subform_color !default;
+
+// ==============================================================
+// CSS VARIABLES (Recommended for customization)
+// ==============================================================
+:root {
+  // Base Colors
+  --as-disabled-color: #{$disabled_color};
+  --as-actions-disabled-color: #{$actions_disabled_color};
+  --as-link-color: #{$link_color};
+  --as-hover-bg: #{$hover_bg};
+  --as-header-color: #{$header_color};
+
+  // Column Headers
+  --as-column-header-bg: #{$column_header_bg};
+  --as-column-header-link-color: #{$column_header_link_color};
+  --as-column-header-link-hover-bg: #{$column_header_link_hover_bg};
+  --as-column-header-link-hover-color: #{$column_header_link_hover_color};
+  --as-column-header-color: #{$column_header_color};
+  --as-column-header-sorted-bg: #{$column_header_sorted_bg};
+
+  // Columns
+  --as-column-bg: #{$column_bg};
+  --as-column-even-bg: #{$column_even_bg};
+  --as-column-color: #{$column_color};
+  --as-column-empty-color: #{$column_empty_color};
+  --as-column-border-color: #{$column_border_color};
+  --as-column-even-border-color: #{$column_even_border_color};
+  --as-column-actions-border-color: #{$column_actions_border_color};
+
+  // Sorted Columns
+  --as-column-sorted-bg: #{$column_sorted_bg};
+  --as-column-sorted-border-color: #{$column_sorted_border_color};
+  --as-column-even-sorted-bg: #{$column_even_sorted_bg};
+  --as-column-even-sorted-border-color: #{$column_even_sorted_border_color};
+
+  // Calculations
+  --as-calculations-bg: #{$calculations_bg};
+  --as-calculations-border-color: #{$calculations_border_color};
+
+  // Action Groups
+  --as-action-group-color: #{$action_group_color};
+  --as-action-group-hover-bg: #{$action_group_hover_bg};
+  --as-action-group-border-color: #{$action_group_border_color};
+  --as-action-group-items-bg: #{$action_group_items_bg};
+  --as-action-group-items-border-color: #{$action_group_items_border_color};
+  --as-action-group-link-color: #{$action_group_link_color};
+  --as-active-filter: #{$active_filter};
+
+  // Nested Levels
+  --as-nested-bg: #{$nested_bg};
+  --as-nested-border-color: #{$nested_border_color};
+  --as-nested-footer-color: #{$nested_footer_color};
+  --as-nested-column-bg: #{$nested_column_bg};
+  --as-nested-column-even-bg: #{$nested_column_even_bg};
+  --as-nested-column-border-color: #{$nested_column_border_color};
+  --as-second-nested-bg: #{$second_nested_bg};
+  --as-second-nested-border-color: #{$second_nested_border_color};
+  --as-third-nested-bg: #{$third_nested_bg};
+  --as-third-nested-border-color: #{$third_nested_border_color};
+
+  // Pagination
+  --as-pagination-border-color: #{$pagination_border_color};
+
+  // Messages
+  --as-msg-color: #{$msg_color};
+  --as-msg-error-bg: #{$msg_error_bg};
+  --as-msg-error-border-color: #{$msg_error_border_color};
+  --as-msg-warning-bg: #{$msg_warning_bg};
+  --as-msg-warning-border-color: #{$msg_warning_border_color};
+  --as-msg-info-bg: #{$msg_info_bg};
+  --as-msg-info-border-color: #{$msg_info_border_color};
+  --as-msg-filtered-bg: #{$msg_filtered_bg};
+  --as-msg-filtered-color: #{$msg_filtered_color};
+
+  // Forms
+  --as-form-title-color: #{$form_title_color};
+  --as-label-color: #{$label_color};
+  --as-description-color: #{$description_color};
+  --as-placeholder-color: #{$placeholder_color};
+  --as-input-border-color: #{$input_border_color};
+  --as-input-error-border-color: #{$input_error_border_color};
+  --as-input-focus-bg: #{$input_focus_bg};
+
+  // Draggable Lists
+  --as-draggable-list-bg: #{$draggable_list_bg};
+  --as-draggable-list-selected-bg: #{$draggable_list_selected_bg};
+  --as-draggable-list-disabled-bg: #{$draggable_list_disabled_bg};
+  --as-checkbox-list-bg: #{$checkbox_list_bg};
+
+  // Subforms
+  --as-subform-color: #{$subform_color};
+  --as-subform-header-color: #{$subform_header_color};
+  --as-subform-footer-color: #{$subform_footer_color};
+  --as-vertical-sub-form-border-color: #{$vertical_sub_form_border_color};
+}

data/app/assets/stylesheets/active_scaffold/core.scss

@@ -0,0 +1,15 @@
+/*
+ ActiveScaffold
+ (c) 2007 Richard White <rrwhite@gmail.com>
+
+ ActiveScaffold is freely distributable under the terms of an MIT-style license.
+
+ For details, see the ActiveScaffold web site: https://github.com/activescaffold/active_scaffold
+*/
+
+@forward 'variables';
+@use 'layout';
+@use 'images';
+@use 'colours';
+@use 'active_scaffold/deps';
+.ui-front { z-index: 98; }

data/app/assets/stylesheets/active_scaffold.scss.erb

@@ -0,0 +1,16 @@
+/*
+ ActiveScaffold
+ (c) 2007 Richard White <rrwhite@gmail.com>
+
+ ActiveScaffold is freely distributable under the terms of an MIT-style license.
+
+ For details, see the ActiveScaffold web site: https://github.com/activescaffold/active_scaffold
+*/
+
+@use 'active_scaffold/layout';
+@use 'active_scaffold/images';
+@use 'active_scaffold/colours';
+
+<%= File.read(File.join(ActiveScaffold.root, 'app/assets/stylesheets/active_scaffold/_variables.scss')) %>
+<% ActiveScaffold::Assets.active_scaffold_stylesheets(:deps).each { |asset| require_asset asset } %>
+.ui-front { z-index: 98; }

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

@@ -1,3 +1,10 @@
+<% if columns.layout == :multiple -%>
+<div class="form-columns"<%= " id=#{subsection_id}" if local_assigns.key? :subsection_id %><%= ' style="display: none;"'.html_safe if columns.collapsed %>>
+  <% columns.each do |group| %>
+    <%= render 'field_search_columns', local_assigns.merge(columns: group, subsection_id: nil) %>
+  <% end %>
+</div>
+<% else -%>
 <ol class="form" <%= "id=#{subsection_id}" unless local_assigns[:subsection_id].nil? %> <%= 'style="display: none;"'.html_safe if columns.collapsed %>>
   <% visibles, hiddens = visibles_and_hiddens(active_scaffold_config.field_search, columns) %>
   <% visibles.each do |column| -%>
@@ -30,3 +37,4 @@
     </li>
   <% end -%>
 </ol>
+<% end -%>

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

@@ -1,3 +1,10 @@
+<% if columns.layout == :multiple %>
+  <div class="form-columns"<%= " id=#{subsection_id}" if local_assigns.key? :subsection_id %><%= ' style="display: none;"'.html_safe if columns.collapsed %>>
+    <% columns.each do |group| %>
+      <%= render 'form', local_assigns.merge(columns: group, subsection_id: nil) %>
+    <% end %>
+  </div>
+<% else %>
 <%
   scope ||= nil
   subsection_id ||= nil
@@ -37,3 +44,4 @@
   <% end -%>
   <% end -%>
 </ol>
+<% end %>

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

@@ -19,6 +19,8 @@
     parent_record: parent_record, column: column, associated: associated, scope: scope, subform_div_id: subform_div_id,
     tabbed_by: tabbed_by, tab_value: tab_value
   })
+  columns = (column.form_ui_options || column.options)[:subform_columns]
+  columns = active_scaffold_config_for(column.association.klass).subform.build_action_columns(columns) if columns
 -%>
 <h5>
   <%= column.label -%>
@@ -28,7 +30,7 @@
 <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 "#{(opts = active_scaffold_input_options(column, scope, object: parent_record))[:name]}[0]", '', id: "#{opts[:id]}_0" if column.association.collection? %>
-  <%= render subform_partial_for_column(column), column: column, parent_record: parent_record, associated: associated, show_blank_record: show_blank_record, scope: scope, tab_id: tab_id %>
+  <%= render subform_partial_for_column(column), column: column, parent_record: parent_record, columns: columns, associated: associated, show_blank_record: show_blank_record, scope: scope, tab_id: tab_id %>
   <%= footer -%>
 </div>
 <%

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

@@ -1,15 +1,17 @@
 <%
   record_column = column
+  ui_options = record_column.form_ui_options || record_column.options
   readonly = record.readonly? || !record.authorized_for?(crud_type: :update)
   crud_type = record.new_record? ? :create : (readonly ? :read : :update)
   show_actions = false
   locked ||= false
   config = active_scaffold_config_for(record.class)
   columns ||= config.subform.columns
+  column_names = columns.visible_columns_names
   scope = column_scope(record_column, scope, record)
   options = active_scaffold_input_options(config.columns[record.class.primary_key], scope, object: record)
   tr_id = "association-#{options[:id]}"
-  layout ||= column.options[:layout] || config.subform.layout
+  layout ||= ui_options[:layout] || config.subform.layout
 
   if layout == :vertical
     record_tag ||= :div
@@ -58,7 +60,7 @@
     col_class << 'hidden' if column_renders_as(column) == :hidden
   -%>
     <%= content_tag column_tag, class: col_class.join(' ') do %>
-      <%= active_scaffold_render_subform_column(column, scope, crud_type, readonly, false, record) %>
+      <%= active_scaffold_render_subform_column(column, scope, crud_type, readonly, false, record, form_columns: column_names) %>
     <% end %>
   <% end -%>
   <% if show_actions -%>

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

@@ -2,9 +2,9 @@
   <% if nested_singular_association? %>
   if (action_link) action_link.close(true);
   <% elsif params[:parent_sti] && render_parent_action == :row %>
-    ActiveScaffold.create_record_row_from_url(action_link, '<%= url_for(render_parent_options) %>', <%= {insert_at: insert_at}.to_json.html_safe %>);
+    ActiveScaffold.create_record_row_from_url(action_link, '<%=raw url_for(render_parent_options) %>', <%= {insert_at: insert_at}.to_json.html_safe %>);
   <% else %>
-    ActiveScaffold.reload('<%= url_for render_parent_options %>');
+    ActiveScaffold.reload('<%=raw url_for render_parent_options %>');
   <% end %>
 <% elsif active_scaffold_config.create.refresh_list %>
   <%= render 'refresh_list', no_history: true %>

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

@@ -3,7 +3,7 @@
     ActiveScaffold.append('<%= active_scaffold_tbody_id %>', '<%= escape_javascript(render(partial: list_record_view, 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 %>});
+      ActiveScaffold.auto_load_page('<%=raw url_for main_path_to_return %>', {auto_pagination: true, page: <%= @page.number + 1 %>});
     <% else %>
       ActiveScaffold.hide('<%= loading_indicator_id(action: :pagination) %>');
     <% end # @page.pager.infinite?... %>

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

@@ -1,3 +1,4 @@
+<% columns = active_scaffold_config_for(column.association.klass).show.build_action_columns(columns) if local_assigns[:columns].is_a?(Array) %>
 <% associated = column.association.singular? ? [parent_record.send(column.name)].compact : parent_record.send(column.name).to_a -%>
 <% associated = associated.select { |record| record.send(tabbed_by) == tab_value } if local_assigns[:tabbed_by] %>
-<%= render "show_association_#{show_partial}", column: column, parent_record: parent_record, associated: associated if associated.present? %>
+<%= render "show_association_#{show_partial}", columns: columns, column: column, parent_record: parent_record, associated: associated if associated.present? %>

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

@@ -1,6 +1,6 @@
 <%
   columns_hash = {}
-  heading_columns = show_columns_for(associated.first, column, columns_hash)
+  heading_columns = columns || show_columns_for(associated.first, column, columns_hash)
 %>
 <table>
   <thead>
@@ -12,7 +12,7 @@
   </thead>
   <tbody>
 <% associated.each do |record| -%>
-    <%= render 'show_horizontal_record', record: record, parent_record: parent_record, columns: show_columns_for(associated.first, column, columns_hash) %>
+    <%= render 'show_horizontal_record', record: record, parent_record: parent_record, columns: columns || show_columns_for(associated.first, column, columns_hash) %>
 <% end -%>
   </tbody>
 </table>

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

@@ -1,4 +1,4 @@
 <% columns_hash = {} -%>
 <% associated.each do |record| -%>
-  <%= render 'show_columns', columns: show_columns_for(record, column, columns_hash), record: record %>
+  <%= render 'show_columns', columns: columns || show_columns_for(record, column, columns_hash), record: record %>
 <% end -%>

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

@@ -3,14 +3,14 @@
   <% if render_parent? %>
     <% if render_parent_action == :row %>
       <% current_id = controller_id(params[:eid] || params[:parent_sti]) -%>
-      ActiveScaffold.delete_record_row('<%= element_row_id(controller_id: current_id, action: 'list', id: params[:id]) %>', '<%= url_for params_for(render_parent_options.merge(id: nil, page: [active_scaffold_config.list.user.page.to_i - 1, 1].max)) %>');
+      ActiveScaffold.delete_record_row('<%= element_row_id(controller_id: current_id, action: 'list', id: params[:id]) %>', '<%=raw url_for params_for(render_parent_options.merge(id: nil, page: [active_scaffold_config.list.user.page.to_i - 1, 1].max)) %>');
       <% messages_id = active_scaffold_messages_id(controller_id: current_id) %>
       <%= render 'update_calculations', calculations_id: active_scaffold_calculations_id(controller_id: current_id) %>
     <% elsif render_parent_action == :index %>
       <% if controller.respond_to?(:render_component_into_view, true) %>
         <%= escape_javascript(controller.send(:render_component_into_view, render_parent_options)) %>
       <% else %>
-        ActiveScaffold.reload('<%= url_for render_parent_options %>');
+        ActiveScaffold.reload('<%=raw url_for render_parent_options %>');
       <% end %>
     <% end %>
   <% elsif active_scaffold_config.delete.refresh_list %>

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

@@ -1,13 +1,15 @@
 <%
+columns = (@column.form_ui_options || @column.options)[:subform_columns]
+columns = active_scaffold_config_for(@column.association.klass).subform.build_action_columns(columns) if columns
 subform_id = sub_form_list_id(association: @column.name, tab_id: @tab_id, id: @parent_record.id || generated_id(@parent_record) || 99_999_999_999)
-associated_form = render 'form_association_record', scope: @scope, parent_record: @parent_record, column: @column, record: @record, locked: @record.new_record? && @column.association.singular?
+associated_form = render 'form_association_record', columns: columns, scope: @scope, parent_record: @parent_record,
+                  column: @column, record: @record, locked: @record.new_record? && @column.association.singular?
 options = {singular: false}
 if @column.association.singular?
   options[:singular] = true
-else
-  unless @record.new_record?
-    column = active_scaffold_config_for(@record.class).columns[@record.class.primary_key]
-    options[:id] = active_scaffold_input_options(column, column_scope(@column, @scope, @record))[:id]
-  end
-end %>
-ActiveScaffold.create_associated_record_form('<%= subform_id %>','<%=escape_javascript(associated_form)%>', <%= options.to_json.html_safe %>);
+elsif @record.persisted?
+  column = active_scaffold_config_for(@record.class).columns[@record.class.primary_key]
+  options[:id] = active_scaffold_input_options(column, column_scope(@column, @scope, @record))[:id]
+end
+%>
+ActiveScaffold.create_associated_record_form('<%= subform_id %>', '<%= escape_javascript(associated_form) %>', <%= options.to_json.html_safe %>);

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

@@ -16,7 +16,7 @@ if (action_link) action_link.update_flash_messages('<%= escape_javascript(render
       <% if nested_singular_association? || render_parent_action == :row %>
         if (action_link) action_link.close(true);
       <% else %>
-        ActiveScaffold.reload('<%= url_for render_parent_options %>');
+        ActiveScaffold.reload('<%=raw url_for render_parent_options %>');
       <% end %>
     <% elsif update_refresh_list? %>
       <%= render 'refresh_list', no_history: true %>

data/config/locales/de.yml

@@ -12,8 +12,8 @@ de:
     add_existing: Existierenden Eintrag hinzufügen
     add_existing_model: Existierende %{model} hinzufügen
     add_model: "%{model} hinzufügen"
-    all_tokens:
-    any_token:
+    all_tokens: All keywords
+    any_token: Any keyword
     apply: Akzeptieren
     are_you_sure_to_delete: Sind Sie sicher?
     average: Durchschnitt
@@ -22,7 +22,7 @@ de:
     cancel: Abbrechen
     cant_destroy_record: "%{record} kann nicht gelöscht werden"
     changes: Änderungen
-    check_all:
+    check_all: Check all
     click_to_edit: Zum Editieren anklicken
     click_to_reset: Reset
     close: Schließen
@@ -37,9 +37,9 @@ de:
     created_model: "%{model} angelegt"
     customize: Anpassen
     date_picker_options:
-      firstDay: 1
-      isRTL: false
-      showMonthAfterYear: false
+      firstDay: '1'
+      isRTL: 'false'
+      showMonthAfterYear: 'false'
       weekHeader: Wo
     datetime_picker_options:
       closeText: Schließen
@@ -51,9 +51,9 @@ de:
     deleted_model: "%{model} gelöscht"
     deleted_records: Gelöschte Records auflisten
     delimiter: Trennzeichen
-    doesnt_begin_with:
-    doesnt_contain:
-    doesnt_end_with:
+    doesnt_begin_with: Doesn't begin with
+    doesnt_contain: Doesn't contain
+    doesnt_end_with: Doesn't end with
     download: Herunterladen
     edit: Bearbeiten
     ends_with: Endet
@@ -80,7 +80,7 @@ de:
     internal_error: Fehler bei der Verarbeitung
     live_search: Live-Suche
     loading: Lade…
-    logical_search:
+    logical_search: Logical Search
     mark_all_records: Alle auswählen
     maximum: Maximum
     minimum: Minimum
@@ -136,12 +136,13 @@ de:
     today: Heute
     tomorrow: Morgen
     'true': Richtig
-    uncheck_all:
+    uncheck_all: Uncheck all
     update: Speichern
     update_apply: Bewerben
     update_model: Editiere %{model}
     updated_model: "%{model} aktualisiert"
-    version_inconsistency: Inkonsistente Versionen - dieser Eintrag wurde verändert nachdem Sie mit der Bearbeitung begonnen haben.
+    version_inconsistency: Inkonsistente Versionen - dieser Eintrag wurde 
+      verändert nachdem Sie mit der Bearbeitung begonnen haben.
     weeks: Wochen
     years: Jahre
     yesterday: Gestern
@@ -149,7 +150,7 @@ de:
     formats:
       month: "%B"
       quarter: Quartal %{num}
-      week:
+      week: Week %W, %Y
       year_month: "%b %Y"
       year_quarter: Quartal %{quarter} %{year}
   time:
@@ -157,6 +158,9 @@ de:
       picker: "%d.%m.%Y %H:%M"
   datetime:
     prompts:
-      millisec:
-      microsec:
+      millisec: Millisecond
+      microsec: Microsecond
+      second: Second
+      minute: Minute
+      hour: Hour
 

data/config/locales/en.yml

@@ -37,9 +37,9 @@ en:
     created_model: Created %{model}
     customize: Customize
     date_picker_options:
-      firstDay: 0
-      isRTL: false
-      showMonthAfterYear: false
+      firstDay: '0'
+      isRTL: 'false'
+      showMonthAfterYear: 'false'
       weekHeader: Wk
     datetime_picker_options:
       closeText: Close
@@ -141,7 +141,8 @@ en:
     update_apply: Apply
     update_model: Update %{model}
     updated_model: Updated %{model}
-    version_inconsistency: Version inconsistency - this record has been modified since you started editing it.
+    version_inconsistency: Version inconsistency - this record has been modified
+      since you started editing it.
     weeks: Weeks
     years: Years
     yesterday: Yesterday

data/config/locales/es.yml

@@ -12,8 +12,8 @@ es:
     add_existing: Añadir Existente
     add_existing_model: Añadir %{model} Existente
     add_model: Añadir %{model}
-    all_tokens:
-    any_token:
+    all_tokens: Todas las palabras
+    any_token: Cualquier palabra
     apply: Aplicar
     are_you_sure_to_delete: "¿Estás seguro de que quieres borrar %{label}?"
     average: Media
@@ -37,9 +37,9 @@ es:
     created_model: "%{model} creado"
     customize: Personalizar
     date_picker_options:
-      firstDay: 1
-      isRTL: false
-      showMonthAfterYear: false
+      firstDay: '1'
+      isRTL: 'false'
+      showMonthAfterYear: 'false'
       weekHeader: Sm
     datetime_picker_options:
       closeText: Cerrar
@@ -63,12 +63,14 @@ es:
         body: 'Hubo problemas con los siguientes campos:'
         header:
           one: No se pudo guardar %{model} debido a un error.
+          many: No se pudo guardar %{model} debido a %{count} errores.
           other: No se pudo guardar %{model} debido a %{count} errores.
     export: Exportar
     'false': 'No'
     filtered: "(Filtrado)"
     found:
       one: encontrado
+      many: encontrados
       other: encontrados
     future: Futuro
     group_by: Agrupar por
@@ -94,7 +96,8 @@ es:
     next_month: Próximo mes
     next_week: Próxima semana
     next_year: Próximo año
-    no_authorization_for_action: No dispone de autorización para la acción %{action}
+    no_authorization_for_action: No dispone de autorización para la acción 
+      %{action}
     no_color: Sin color
     no_entries: Sin entradas
     no_group: No agrupar
@@ -115,7 +118,8 @@ es:
     record_not_saved: Fallo guardando el registro debido a un error desconocido
     records_marked:
       one: 1 %{model} seleccionado
-      other: "%{count} %{model} seleccionados"
+      many: '%{count} %{model} seleccionados'
+      other: '%{count} %{model} seleccionados'
     refresh: Recargar
     remove: Eliminar
     remove_file: Eliminar o Reemplazar archivo
@@ -143,7 +147,8 @@ es:
     update_apply: Aplicar
     update_model: Actualizar %{model}
     updated_model: "%{model} actualizado"
-    version_inconsistency: Inconsistencia de versiones - este registro se ha modificado después de que empezó a editarlo.
+    version_inconsistency: Inconsistencia de versiones - este registro se ha 
+      modificado después de que empezó a editarlo.
     weeks: Semanas
     years: Años
     yesterday: Ayer
@@ -161,3 +166,6 @@ es:
     prompts:
       millisec: Milisegundo
       microsec: Microsegundo
+      hour: Hora
+      minute: Minuto
+      second: Segundo