active_scaffold 3.4.43 → 3.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (216) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG +39 -0
  3. data/{LICENSE → LICENSE.md} +1 -1
  4. data/README.md +27 -19
  5. data/app/assets/javascripts/active_scaffold.js.erb +1 -1
  6. data/app/assets/javascripts/jquery/active_scaffold.js +95 -43
  7. data/app/assets/javascripts/jquery/tiny_mce_bridge.js +30 -6
  8. data/app/assets/javascripts/prototype/tiny_mce_bridge.js +11 -1
  9. data/app/assets/stylesheets/active_scaffold_colors.scss +2 -2
  10. data/app/assets/stylesheets/active_scaffold_layout.css +36 -28
  11. data/app/views/active_scaffold_overrides/_base_form.html.erb +2 -3
  12. data/app/views/active_scaffold_overrides/_field_search.html.erb +8 -7
  13. data/app/views/active_scaffold_overrides/_form_association.html.erb +9 -9
  14. data/app/views/active_scaffold_overrides/_form_association_footer.html.erb +6 -6
  15. data/app/views/active_scaffold_overrides/_form_association_record.html.erb +52 -50
  16. data/app/views/active_scaffold_overrides/_horizontal_subform.html.erb +1 -1
  17. data/app/views/active_scaffold_overrides/_horizontal_subform_header.html.erb +1 -1
  18. data/app/views/active_scaffold_overrides/_human_conditions.html.erb +3 -1
  19. data/app/views/active_scaffold_overrides/_list_calculations.html.erb +1 -1
  20. data/app/views/active_scaffold_overrides/_list_column_headings.html.erb +2 -0
  21. data/app/views/active_scaffold_overrides/_list_messages.html.erb +5 -3
  22. data/app/views/active_scaffold_overrides/_list_record.html.erb +3 -1
  23. data/app/views/active_scaffold_overrides/_list_with_header.html.erb +9 -9
  24. data/app/views/active_scaffold_overrides/_messages.html.erb +1 -1
  25. data/app/views/active_scaffold_overrides/_refresh_list.js.erb +18 -10
  26. data/app/views/active_scaffold_overrides/_render_field.js.erb +3 -3
  27. data/app/views/active_scaffold_overrides/_search.html.erb +7 -6
  28. data/app/views/active_scaffold_overrides/_show_actions.html.erb +14 -0
  29. data/app/views/active_scaffold_overrides/_show_association.html.erb +1 -1
  30. data/app/views/active_scaffold_overrides/_update_actions.html.erb +6 -2
  31. data/app/views/active_scaffold_overrides/_update_column.js.erb +1 -1
  32. data/app/views/active_scaffold_overrides/_update_form.html.erb +1 -1
  33. data/app/views/active_scaffold_overrides/destroy.js.erb +2 -3
  34. data/app/views/active_scaffold_overrides/edit_associated.js.erb +4 -3
  35. data/app/views/active_scaffold_overrides/on_action_update.js.erb +5 -3
  36. data/app/views/active_scaffold_overrides/on_create.js.erb +4 -4
  37. data/app/views/active_scaffold_overrides/on_update.js.erb +6 -6
  38. data/app/views/active_scaffold_overrides/show.html.erb +6 -0
  39. data/app/views/active_scaffold_overrides/update.html.erb +1 -1
  40. data/app/views/active_scaffold_overrides/update_column.js.erb +1 -1
  41. data/config/brakeman.ignore +26 -0
  42. data/config/brakeman.yml +3 -0
  43. data/config/i18n-tasks.yml +121 -0
  44. data/config/locales/de.yml +81 -70
  45. data/config/locales/en.yml +83 -74
  46. data/config/locales/es.yml +82 -73
  47. data/config/locales/fr.yml +86 -75
  48. data/config/locales/hu.yml +81 -70
  49. data/config/locales/ja.yml +71 -60
  50. data/config/locales/ru.yml +85 -74
  51. data/lib/active_scaffold.rb +3 -0
  52. data/lib/active_scaffold/actions/common_search.rb +11 -7
  53. data/lib/active_scaffold/actions/core.rb +119 -47
  54. data/lib/active_scaffold/actions/create.rb +1 -1
  55. data/lib/active_scaffold/actions/delete.rb +11 -8
  56. data/lib/active_scaffold/actions/field_search.rb +104 -6
  57. data/lib/active_scaffold/actions/list.rb +25 -21
  58. data/lib/active_scaffold/actions/mark.rb +12 -4
  59. data/lib/active_scaffold/actions/nested.rb +26 -26
  60. data/lib/active_scaffold/actions/search.rb +2 -2
  61. data/lib/active_scaffold/actions/show.rb +4 -5
  62. data/lib/active_scaffold/actions/subform.rb +9 -7
  63. data/lib/active_scaffold/actions/update.rb +20 -13
  64. data/lib/active_scaffold/active_record_permissions.rb +24 -5
  65. data/lib/active_scaffold/attribute_params.rb +68 -49
  66. data/lib/active_scaffold/bridges.rb +1 -1
  67. data/lib/active_scaffold/bridges/ancestry/ancestry_bridge.rb +15 -19
  68. data/lib/active_scaffold/bridges/bitfields.rb +1 -1
  69. data/lib/active_scaffold/bridges/bitfields/bitfields_bridge.rb +10 -14
  70. data/lib/active_scaffold/bridges/calendar_date_select.rb +0 -7
  71. data/lib/active_scaffold/bridges/calendar_date_select/as_cds_bridge.rb +19 -22
  72. data/lib/active_scaffold/bridges/cancan.rb +4 -3
  73. data/lib/active_scaffold/bridges/cancan/cancan_bridge.rb +11 -21
  74. data/lib/active_scaffold/bridges/carrierwave.rb +2 -1
  75. data/lib/active_scaffold/bridges/carrierwave/carrierwave_bridge.rb +2 -6
  76. data/lib/active_scaffold/bridges/carrierwave/form_ui.rb +6 -39
  77. data/lib/active_scaffold/bridges/carrierwave/list_ui.rb +1 -1
  78. data/lib/active_scaffold/bridges/chosen.rb +4 -1
  79. data/lib/active_scaffold/bridges/chosen/helpers.rb +3 -2
  80. data/lib/active_scaffold/bridges/country_select/country_select_bridge_helper.rb +2 -2
  81. data/lib/active_scaffold/bridges/date_picker.rb +3 -0
  82. data/lib/active_scaffold/bridges/date_picker/ext.rb +43 -38
  83. data/lib/active_scaffold/bridges/date_picker/helper.rb +24 -23
  84. data/lib/active_scaffold/bridges/dragonfly.rb +1 -1
  85. data/lib/active_scaffold/bridges/dragonfly/dragonfly_bridge.rb +3 -7
  86. data/lib/active_scaffold/bridges/dragonfly/form_ui.rb +3 -25
  87. data/lib/active_scaffold/bridges/dragonfly/list_ui.rb +2 -2
  88. data/lib/active_scaffold/bridges/file_column/as_file_column_bridge.rb +6 -8
  89. data/lib/active_scaffold/bridges/file_column/file_column_helpers.rb +1 -1
  90. data/lib/active_scaffold/bridges/file_column/form_ui.rb +0 -2
  91. data/lib/active_scaffold/bridges/file_column/list_ui.rb +2 -1
  92. data/lib/active_scaffold/bridges/file_column/test/test_helper.rb +1 -1
  93. data/lib/active_scaffold/bridges/paper_trail/actions.rb +1 -1
  94. data/lib/active_scaffold/bridges/paper_trail/helper.rb +1 -2
  95. data/lib/active_scaffold/bridges/paper_trail/paper_trail_bridge.rb +3 -7
  96. data/lib/active_scaffold/bridges/paperclip.rb +1 -1
  97. data/lib/active_scaffold/bridges/paperclip/form_ui.rb +3 -28
  98. data/lib/active_scaffold/bridges/paperclip/list_ui.rb +1 -1
  99. data/lib/active_scaffold/bridges/paperclip/paperclip_bridge.rb +3 -7
  100. data/lib/active_scaffold/bridges/record_select.rb +2 -0
  101. data/lib/active_scaffold/bridges/record_select/helpers.rb +14 -18
  102. data/lib/active_scaffold/bridges/semantic_attributes/column.rb +4 -8
  103. data/lib/active_scaffold/bridges/shared/date_bridge.rb +20 -20
  104. data/lib/active_scaffold/bridges/tiny_mce/helpers.rb +7 -22
  105. data/lib/active_scaffold/bridges/usa_state_select/usa_state_select_helper.rb +14 -14
  106. data/lib/active_scaffold/config/base.rb +9 -6
  107. data/lib/active_scaffold/config/core.rb +30 -21
  108. data/lib/active_scaffold/config/create.rb +2 -1
  109. data/lib/active_scaffold/config/delete.rb +2 -2
  110. data/lib/active_scaffold/config/field_search.rb +9 -3
  111. data/lib/active_scaffold/config/form.rb +4 -4
  112. data/lib/active_scaffold/config/list.rb +27 -23
  113. data/lib/active_scaffold/config/nested.rb +4 -4
  114. data/lib/active_scaffold/config/search.rb +6 -6
  115. data/lib/active_scaffold/config/show.rb +11 -1
  116. data/lib/active_scaffold/config/subform.rb +1 -1
  117. data/lib/active_scaffold/config/update.rb +4 -2
  118. data/lib/active_scaffold/constraints.rb +39 -36
  119. data/lib/active_scaffold/core.rb +36 -15
  120. data/lib/active_scaffold/data_structures/action_columns.rb +14 -9
  121. data/lib/active_scaffold/data_structures/action_link.rb +4 -5
  122. data/lib/active_scaffold/data_structures/action_links.rb +5 -4
  123. data/lib/active_scaffold/data_structures/actions.rb +2 -2
  124. data/lib/active_scaffold/data_structures/association.rb +8 -0
  125. data/lib/active_scaffold/data_structures/association/abstract.rb +147 -0
  126. data/lib/active_scaffold/data_structures/association/active_mongoid.rb +42 -0
  127. data/lib/active_scaffold/data_structures/association/active_record.rb +94 -0
  128. data/lib/active_scaffold/data_structures/association/mongoid.rb +45 -0
  129. data/lib/active_scaffold/data_structures/bridge.rb +3 -6
  130. data/lib/active_scaffold/data_structures/column.rb +100 -82
  131. data/lib/active_scaffold/data_structures/columns.rb +21 -3
  132. data/lib/active_scaffold/data_structures/nested_info.rb +22 -37
  133. data/lib/active_scaffold/data_structures/set.rb +4 -4
  134. data/lib/active_scaffold/data_structures/sorting.rb +29 -15
  135. data/lib/active_scaffold/engine.rb +3 -1
  136. data/lib/active_scaffold/extensions/action_controller_rendering.rb +10 -5
  137. data/lib/active_scaffold/extensions/action_view_rendering.rb +65 -59
  138. data/lib/active_scaffold/extensions/left_outer_joins.rb +48 -53
  139. data/lib/active_scaffold/extensions/localize.rb +3 -4
  140. data/lib/active_scaffold/extensions/name_option_for_datetime.rb +7 -11
  141. data/lib/active_scaffold/extensions/paginator_extensions.rb +20 -18
  142. data/lib/active_scaffold/extensions/routing_mapper.rb +104 -40
  143. data/lib/active_scaffold/extensions/to_label.rb +1 -1
  144. data/lib/active_scaffold/extensions/unsaved_associated.rb +4 -13
  145. data/lib/active_scaffold/extensions/unsaved_record.rb +12 -1
  146. data/lib/active_scaffold/finder.rb +200 -134
  147. data/lib/active_scaffold/helpers/action_link_helpers.rb +398 -0
  148. data/lib/active_scaffold/helpers/association_helpers.rb +12 -30
  149. data/lib/active_scaffold/helpers/controller_helpers.rb +74 -24
  150. data/lib/active_scaffold/helpers/form_column_helpers.rb +205 -112
  151. data/lib/active_scaffold/helpers/human_condition_helpers.rb +21 -11
  152. data/lib/active_scaffold/helpers/id_helpers.rb +1 -1
  153. data/lib/active_scaffold/helpers/list_column_helpers.rb +117 -39
  154. data/lib/active_scaffold/helpers/pagination_helpers.rb +11 -14
  155. data/lib/active_scaffold/helpers/search_column_helpers.rb +69 -32
  156. data/lib/active_scaffold/helpers/show_column_helpers.rb +9 -3
  157. data/lib/active_scaffold/helpers/view_helpers.rb +41 -426
  158. data/lib/active_scaffold/orm_checks.rb +109 -0
  159. data/lib/active_scaffold/paginator.rb +1 -1
  160. data/lib/active_scaffold/responds_to_parent.rb +12 -10
  161. data/lib/active_scaffold/tableless.rb +81 -43
  162. data/lib/active_scaffold/version.rb +2 -2
  163. data/lib/generators/active_scaffold/controller_generator.rb +49 -0
  164. data/lib/generators/active_scaffold/install_generator.rb +45 -0
  165. data/lib/generators/active_scaffold/resource_generator.rb +56 -0
  166. data/lib/generators/{active_scaffold_controller/templates → templates}/controller.rb +0 -0
  167. data/lib/generators/{active_scaffold_controller/templates → templates}/helper.rb +0 -0
  168. data/shoulda_macros/macros.rb +3 -3
  169. data/test/active_scaffold_config_mock.rb +33 -0
  170. data/test/bridges/bridge_test.rb +9 -9
  171. data/test/bridges/date_picker_test.rb +3 -1
  172. data/test/bridges/paper_trail_test.rb +2 -3
  173. data/test/bridges/paperclip_test.rb +21 -10
  174. data/test/bridges/tiny_mce_test.rb +20 -21
  175. data/test/class_with_finder.rb +42 -0
  176. data/test/company.rb +6 -4
  177. data/test/config/core_test.rb +1 -1
  178. data/test/config/create_test.rb +1 -1
  179. data/test/config/list_test.rb +3 -3
  180. data/test/config/update_test.rb +3 -3
  181. data/test/data_structures/action_columns_test.rb +3 -3
  182. data/test/data_structures/association_column_test.rb +5 -5
  183. data/test/data_structures/column_test.rb +14 -14
  184. data/test/data_structures/columns_test.rb +2 -2
  185. data/test/data_structures/set_test.rb +2 -2
  186. data/test/data_structures/sorting_test.rb +6 -4
  187. data/test/extensions/active_record_test.rb +1 -1
  188. data/test/extensions/routing_mapper_test.rb +64 -13
  189. data/test/helpers/form_column_helpers_test.rb +6 -6
  190. data/test/helpers/list_column_helpers_test.rb +9 -5
  191. data/test/helpers/pagination_helpers_test.rb +1 -0
  192. data/test/misc/active_record_permissions_test.rb +18 -1
  193. data/test/misc/attribute_params_test.rb +26 -17
  194. data/test/misc/calculation_test.rb +8 -31
  195. data/test/misc/configurable_test.rb +3 -2
  196. data/test/misc/constraints_test.rb +33 -22
  197. data/test/misc/convert_numbers_format_test.rb +28 -10
  198. data/test/misc/finder_test.rb +6 -29
  199. data/test/misc/parse_datetime_test.rb +160 -0
  200. data/test/misc/render_test.rb +1 -1
  201. data/test/misc/tableless_test.rb +24 -0
  202. data/test/mock_app/app/models/building.rb +2 -1
  203. data/test/mock_app/config.ru +1 -1
  204. data/test/mock_app/config/environments/test.rb +1 -1
  205. data/test/mock_app/config/routes.rb +11 -3
  206. data/test/model_stub.rb +11 -6
  207. data/test/run_all.rb +1 -1
  208. data/test/test_helper.rb +19 -4
  209. metadata +42 -23
  210. data/lib/active_scaffold/data_structures/error_message.rb +0 -22
  211. data/lib/active_scaffold/extensions/reverse_associations.rb +0 -119
  212. data/lib/generators/active_scaffold/USAGE +0 -29
  213. data/lib/generators/active_scaffold/active_scaffold_generator.rb +0 -21
  214. data/lib/generators/active_scaffold_controller/USAGE +0 -19
  215. data/lib/generators/active_scaffold_controller/active_scaffold_controller_generator.rb +0 -29
  216. data/test/data_structures/error_message_test.rb +0 -25
@@ -1,75 +1,78 @@
1
- de:
2
- active_scaffold:
3
- ? "!="
4
- : "!="
5
- <: <
6
- <=: <=
7
- ? ">"
8
- : ">"
9
- ? ">="
10
- : ">="
1
+ de:
2
+ active_scaffold:
3
+ "!=": "!="
4
+ "<": "<"
5
+ "<=": "<="
6
+ "=": "="
7
+ ">": ">"
8
+ ">=": ">="
11
9
  _select_: "- Auswählen -"
12
10
  _to_: " zu "
13
11
  add: Hinzufügen
14
- add_existing: "Existierenden Eintrag hinzufügen"
15
- add_existing_model: "Existierende %{model} hinzufügen"
16
- update_apply: Apply
17
- create_apply: Create and continue
18
- are_you_sure_to_delete: "Sind Sie sicher?"
19
- average: Average
12
+ add_existing: Existierenden Eintrag hinzufügen
13
+ add_existing_model: Existierende %{model} hinzufügen
14
+ apply: Akzeptieren
15
+ are_you_sure_to_delete: Sind Sie sicher?
16
+ average: Durchschnitt
20
17
  begins_with: Beginnt
21
18
  between: Zwischen
22
19
  cancel: Abbrechen
23
20
  cant_destroy_record: "%{record} kann nicht gelöscht werden"
24
- click_to_edit: "Zum Editieren anklicken"
21
+ changes: Änderungen
22
+ click_to_edit: Zum Editieren anklicken
25
23
  click_to_reset: Reset
26
24
  close: Schließen
25
+ config_list: Konfigurieren
26
+ config_list_model: Konfiguriere Spalten für %{model}
27
27
  contains: Enthält
28
28
  create: Anlegen
29
- create_another: "Weitere anlegen"
30
- create_model: "Lege %{model} an"
31
- create_new: "Neu anlegen"
29
+ create_another: Weitere anlegen
30
+ create_apply: Anlegen und weiter
31
+ create_model: Lege %{model} an
32
+ create_new: Neu anlegen
32
33
  created_model: "%{model} angelegt"
33
34
  customize: Anpassen
34
- date_picker_options:
35
+ date_picker_options:
35
36
  firstDay: 1
36
37
  isRTL: false
37
38
  showMonthAfterYear: false
38
39
  weekHeader: Wo
39
- datetime_picker_options:
40
+ datetime_picker_options:
40
41
  closeText: Schließen
41
42
  currentText: Jetzt
42
43
  timeText: Uhrzeit
43
44
  days: Tage
44
45
  delete: Löschen
45
46
  deleted_model: "%{model} gelöscht"
47
+ deleted_records: Gelöschte Records auflisten
46
48
  delimiter: Trennzeichen
47
- download: Download
49
+ download: Herunterladen
48
50
  edit: Bearbeiten
49
51
  ends_with: Endet
50
52
  error_500: "(code 500, Interner Fehler)"
51
- errors:
52
- template:
53
- body: "Bitte überprüfen Sie die folgenden Felder:"
54
- header:
55
- one: "Konnte %{model} nicht speichern: ein Fehler."
56
- other: "Konnte %{model} nicht speichern: %{count} Fehler."
53
+ errors:
54
+ template:
55
+ body: 'Bitte überprüfen Sie die folgenden Felder:'
56
+ header:
57
+ one: 'Konnte %{model} nicht speichern: ein Fehler.'
58
+ other: 'Konnte %{model} nicht speichern: %{count} Fehler.'
57
59
  export: Exportieren
58
- ? "false"
59
- : "False"
60
- filtered: (Gefiltert)
60
+ 'false': Falsch
61
+ filtered: "(Gefiltert)"
61
62
  found: Gefunden
62
63
  future: Nächsten
63
- hide: (Verstecken)
64
+ group_by: Gruppieren nach
65
+ grouped_by: Gruppiert nach %{column}
66
+ hide: "(Verstecken)"
64
67
  hours: Stunden
65
- human_conditions:
68
+ human_conditions:
66
69
  association: "%{column} = %{value}"
67
70
  boolean: "%{column} = %{value}"
68
71
  inplace_edit_handle: "--"
69
- internal_error: "Fehler bei der Verarbeitung"
72
+ internal_error: Fehler bei der Verarbeitung
70
73
  live_search: Live-Suche
71
74
  loading: Lade…
72
- mark_all_records: "Mark all"
75
+ mark_all_records: Alle auswählen
73
76
  maximum: Maximum
74
77
  minimum: Minimum
75
78
  minutes: Minuten
@@ -77,59 +80,67 @@ de:
77
80
  nested_for_model: "%{nested_model} für %{parent_model}"
78
81
  nested_of_model: "%{nested_model} von %{parent_model}"
79
82
  next: Vor
80
- next_month: "Nächsten Monat"
81
- next_week: "Nächste Woche"
82
- next_year: "Nächstes Jahr"
83
- no_authorization_for_action: "Keine Berechtigung für Aktion %{action}"
84
- no_entries: "Keine Einträge"
85
- no_options: "Keine Optionen"
86
- not_null: "Nicht Null"
87
- ? "null"
88
- : "Null"
89
- omit_header: "Lasse Header weg"
83
+ next_month: Nächsten Monat
84
+ next_week: Nächste Woche
85
+ next_year: Nächstes Jahr
86
+ no_authorization_for_action: Keine Berechtigung für Aktion %{action}
87
+ no_color: Keine Farbe
88
+ no_entries: Keine Einträge
89
+ no_group: Keine Gruppierung
90
+ no_options: Keine Optionen
91
+ not_null: Nicht Null
92
+ 'null': 'Null'
93
+ omit_header: Lasse Header weg
90
94
  optional_attributes: Weitere
91
95
  options: Optionen
92
96
  past: Letzten
93
97
  pdf: PDF
94
- prev_month: "Letzten Monat"
95
- prev_week: "Letzte Woche"
96
- prev_year: "Letztes Jahr"
98
+ prev_month: Letzten Monat
99
+ prev_week: Letzte Woche
100
+ prev_year: Letztes Jahr
97
101
  previous: Zurück
98
102
  print: Drucken
99
103
  range: Zeitraum
100
- record_not_saved: "Eintrag kann nicht gespeichert werden. Ursache unbekannt."
101
- records_marked:
102
- one: "1 marked %{model}"
103
- other: "%{count} marked %{model}"
104
- refresh: "Neu laden"
104
+ record_not_saved: Eintrag kann nicht gespeichert werden. Ursache unbekannt.
105
+ records_marked:
106
+ one: 1 %{model} makriert
107
+ other: "%{count} %{model} makriert"
108
+ refresh: Neu laden
105
109
  remove: Entfernen
106
- remove_file: "Entferne oder Ersetze Datei"
107
- replace_existing: "Existierenden ersetzen"
108
- replace_with_new: "Mit Neuer ersetzen"
110
+ remove_file: Entferne oder Ersetze Datei
111
+ replace_existing: Existierenden ersetzen
112
+ replace_with_new: Mit Neuer ersetzen
109
113
  reset: Zurücksetzen
110
- revisions_for_model: "Revisionen für %{model}"
114
+ revisions_for_model: Revisionen für %{model}
111
115
  saving: Speichern…
112
116
  search: Suche
113
117
  search_terms: Suchbegriffe
114
118
  seconds: Sekunden
115
119
  show: Anzeigen
116
- show_block: (Anzeigen)
117
- show_model: "Zeige %{model} an"
118
- sum: Sum
119
- this_month: "Diesen Monat"
120
- this_week: "Diese Woche"
121
- this_year: "Dieses Jahr"
120
+ show_block: "(Anzeigen)"
121
+ show_model: Zeige %{model} an
122
+ sum: Summe
123
+ this_month: Diesen Monat
124
+ this_week: Diese Woche
125
+ this_year: Dieses Jahr
122
126
  today: Heute
123
127
  tomorrow: Morgen
124
- ? "true"
125
- : "True"
128
+ 'true': Richtig
126
129
  update: Speichern
127
- update_model: "Editiere %{model}"
130
+ update_apply: Bewerben
131
+ update_model: Editiere %{model}
128
132
  updated_model: "%{model} aktualisiert"
129
- version_inconsistency: "Inkonsistente Versionen - dieser Eintrag wurde verändert nachdem Sie mit der Bearbeitung begonnen haben."
133
+ version_inconsistency: Inkonsistente Versionen - dieser Eintrag wurde verändert nachdem Sie mit der Bearbeitung begonnen haben.
130
134
  weeks: Wochen
131
135
  years: Jahre
132
136
  yesterday: Gestern
133
- time:
134
- formats:
137
+ date:
138
+ formats:
139
+ month:
140
+ quarter: Quartal %{num}
141
+ week:
142
+ year_month:
143
+ year_quarter: Quartal %{quarter} %{year}
144
+ time:
145
+ formats:
135
146
  picker: "%d.%m.%Y %H:%M"
@@ -1,77 +1,78 @@
1
- en:
2
- active_scaffold:
3
- ? "!="
4
- : "!="
5
- <: <
6
- <=: <=
7
- ? ">"
8
- : ">"
9
- ? ">="
10
- : ">="
1
+ en:
2
+ active_scaffold:
3
+ "!=": "!="
4
+ "<": "<"
5
+ "<=": "<="
6
+ "=": "="
7
+ ">": ">"
8
+ ">=": ">="
11
9
  _select_: "- select -"
12
10
  _to_: " to "
13
11
  add: Add
14
- add_existing: "Add Existing"
15
- add_existing_model: "Add Existing %{model}"
16
- create_apply: Create and continue
17
- update_apply: Apply
18
- are_you_sure_to_delete: "Are you sure you want to delete %{label}?"
12
+ add_existing: Add Existing
13
+ add_existing_model: Add Existing %{model}
14
+ apply: Apply
15
+ are_you_sure_to_delete: Are you sure you want to delete %{label}?
19
16
  average: Average
20
- begins_with: "Begins with"
17
+ begins_with: Begins with
21
18
  between: Between
22
19
  cancel: Cancel
23
20
  cant_destroy_record: "%{record} can't be destroyed"
24
21
  changes: Changes
25
- click_to_edit: "Click to edit"
26
- click_to_reset: "Click to reset"
22
+ click_to_edit: Click to edit
23
+ click_to_reset: Click to reset
27
24
  close: Close
25
+ config_list: Configure
26
+ config_list_model: Configure Columns for %{model}
28
27
  contains: Contains
29
28
  create: Create
30
- create_another: "Create Another %{model}"
31
- create_model: "Create %{model}"
32
- create_new: "Create New"
33
- created_model: "Created %{model}"
29
+ create_another: Create Another %{model}
30
+ create_apply: Create and continue
31
+ create_model: Create %{model}
32
+ create_new: Create New
33
+ created_model: Created %{model}
34
34
  customize: Customize
35
- date_picker_options:
35
+ date_picker_options:
36
36
  firstDay: 0
37
37
  isRTL: false
38
38
  showMonthAfterYear: false
39
39
  weekHeader: Wk
40
- datetime_picker_options:
40
+ datetime_picker_options:
41
41
  closeText: Close
42
42
  currentText: Now
43
43
  timeText: Hour
44
44
  days: Days
45
45
  delete: Delete
46
- deleted_model: "Deleted %{model}"
47
- deleted_records: "List Deleted Records"
46
+ deleted_model: Deleted %{model}
47
+ deleted_records: List Deleted Records
48
48
  delimiter: Delimiter
49
49
  download: Download
50
50
  edit: Edit
51
- ends_with: "Ends with"
51
+ ends_with: Ends with
52
52
  error_500: "(code 500, Internal Error)"
53
- errors:
54
- template:
55
- body: "There were problems with the following fields:"
56
- header:
57
- one: "1 error prohibited this %{model} from being saved."
53
+ errors:
54
+ template:
55
+ body: 'There were problems with the following fields:'
56
+ header:
57
+ one: 1 error prohibited this %{model} from being saved.
58
58
  other: "%{count} errors prohibited this %{model} from being saved"
59
59
  export: Export
60
- ? "false"
61
- : "False"
62
- filtered: (Filtered)
60
+ 'false': 'False'
61
+ filtered: "(Filtered)"
63
62
  found: Found
64
63
  future: Future
65
- hide: (Hide)
64
+ group_by: Group by
65
+ grouped_by: Grouped by %{column}
66
+ hide: "(Hide)"
66
67
  hours: Hours
67
- human_conditions:
68
+ human_conditions:
68
69
  association: "%{column} = %{value}"
69
70
  boolean: "%{column} = %{value}"
70
71
  inplace_edit_handle: "--"
71
- internal_error: "Request Failed"
72
- live_search: "Live Search"
72
+ internal_error: Request Failed
73
+ live_search: Live Search
73
74
  loading: Loading…
74
- mark_all_records: "Mark all"
75
+ mark_all_records: Mark all
75
76
  maximum: Maximum
76
77
  minimum: Minimum
77
78
  minutes: Minutes
@@ -79,59 +80,67 @@ en:
79
80
  nested_for_model: "%{nested_model} for %{parent_model}"
80
81
  nested_of_model: "%{nested_model} of %{parent_model}"
81
82
  next: Next
82
- next_month: "Next Month"
83
- next_week: "Next Week"
84
- next_year: "Next Year"
85
- no_authorization_for_action: "No Authorization for action %{action}"
86
- no_entries: "No Entries"
87
- no_options: "no options"
88
- not_null: "Not Null"
89
- ? "null"
90
- : "Null"
91
- omit_header: "Omit Header"
92
- optional_attributes: "Further Options"
83
+ next_month: Next Month
84
+ next_week: Next Week
85
+ next_year: Next Year
86
+ no_authorization_for_action: No Authorization for action %{action}
87
+ no_color: No color
88
+ no_entries: No Entries
89
+ no_group: No group
90
+ no_options: no options
91
+ not_null: Not Null
92
+ 'null': 'Null'
93
+ omit_header: Omit Header
94
+ optional_attributes: Further Options
93
95
  options: Options
94
96
  past: Past
95
97
  pdf: PDF
96
- prev_month: "Last Month"
97
- prev_week: "Last Week"
98
- prev_year: "Last Year"
98
+ prev_month: Last Month
99
+ prev_week: Last Week
100
+ prev_year: Last Year
99
101
  previous: Previous
100
102
  print: Print
101
103
  range: Range
102
- record_not_saved: "Failed to save record cause of an unknown error"
103
- records_marked:
104
- one: "1 marked %{model}"
104
+ record_not_saved: Failed to save record cause of an unknown error
105
+ records_marked:
106
+ one: 1 marked %{model}
105
107
  other: "%{count} marked %{model}"
106
108
  refresh: Refresh
107
109
  remove: Remove
108
- remove_file: "Remove or Replace file"
109
- replace_existing: "Replace Existing"
110
- replace_with_new: "Replace With New"
110
+ remove_file: Remove or Replace file
111
+ replace_existing: Replace Existing
112
+ replace_with_new: Replace With New
111
113
  reset: Reset
112
- revisions_for_model: "Revisions for %{model}"
114
+ revisions_for_model: Revisions for %{model}
113
115
  saving: Saving…
114
116
  search: Search
115
- search_terms: "Search Terms"
117
+ search_terms: Search Terms
116
118
  seconds: Seconds
117
119
  show: Show
118
- show_block: (Show)
119
- show_model: "Show %{model}"
120
+ show_block: "(Show)"
121
+ show_model: Show %{model}
120
122
  sum: Sum
121
- this_month: "This Month"
122
- this_week: "This Week"
123
- this_year: "This Year"
123
+ this_month: This Month
124
+ this_week: This Week
125
+ this_year: This Year
124
126
  today: Today
125
127
  tomorrow: Tomorrow
126
- ? "true"
127
- : "True"
128
+ 'true': 'True'
128
129
  update: Update
129
- update_model: "Update %{model}"
130
- updated_model: "Updated %{model}"
131
- version_inconsistency: "Version inconsistency - this record has been modified since you started editing it."
130
+ update_apply: Apply
131
+ update_model: Update %{model}
132
+ updated_model: Updated %{model}
133
+ version_inconsistency: Version inconsistency - this record has been modified since you started editing it.
132
134
  weeks: Weeks
133
135
  years: Years
134
136
  yesterday: Yesterday
135
- time:
136
- formats:
137
+ date:
138
+ formats:
139
+ month: "%B"
140
+ quarter: Quarter %{num}
141
+ week: Week %W, %Y
142
+ year_month: "%b %Y"
143
+ year_quarter: Quarter %{quarter} %{year}
144
+ time:
145
+ formats:
137
146
  picker: "%a, %d %b %Y %H:%M:%S"
@@ -1,79 +1,80 @@
1
- es:
2
- active_scaffold:
3
- ? "!="
4
- : Distinto
5
- <: Menor
6
- <=: "Menor o igual"
7
- ? ">"
8
- : Mayor
9
- ? ">="
10
- : "Mayor o igual"
1
+ es:
2
+ active_scaffold:
3
+ "!=": Distinto
4
+ "<": Menor
5
+ "<=": Menor o igual
6
+ "=": Igual
7
+ ">": Mayor
8
+ ">=": Mayor o igual
11
9
  _select_: "- seleccionar -"
12
10
  _to_: " a "
13
11
  add: Añadir
14
- add_existing: "Añadir Existente"
15
- add_existing_model: "Añadir %{model} Existente"
16
- create_apply: Crear y continuar
17
- update_apply: Aplicar
12
+ add_existing: Añadir Existente
13
+ add_existing_model: Añadir %{model} Existente
14
+ apply: Aplicar
18
15
  are_you_sure_to_delete: "¿Estás seguro de que quieres borrar %{label}?"
19
16
  average: Media
20
- begins_with: "Empieza con"
17
+ begins_with: Empieza con
21
18
  between: Entre
22
19
  cancel: Cancelar
23
- cant_destroy_record: "No se pudo borrar %{record}"
20
+ cant_destroy_record: No se pudo borrar %{record}
24
21
  changes: Cambios
25
- click_to_edit: "Pulsa para editar"
26
- click_to_reset: "Pulsa para restaurar"
22
+ click_to_edit: Pulsa para editar
23
+ click_to_reset: Pulsa para restaurar
27
24
  close: Cerrar
25
+ config_list: Configurar
26
+ config_list_model: Configurar columnas de %{model}
28
27
  contains: Contiene
29
28
  create: Crear
30
- create_another: "Crear Otro %{model}"
31
- create_model: "Crear %{model}"
32
- create_new: "Crear Nuevo"
29
+ create_another: Crear Otro %{model}
30
+ create_apply: Crear y continuar
31
+ create_model: Crear %{model}
32
+ create_new: Crear Nuevo
33
33
  created_model: "%{model} creado"
34
34
  customize: Personalizar
35
- date_picker_options:
35
+ date_picker_options:
36
36
  firstDay: 1
37
37
  isRTL: false
38
38
  showMonthAfterYear: false
39
39
  weekHeader: Sm
40
- datetime_picker_options:
40
+ datetime_picker_options:
41
41
  closeText: Cerrar
42
42
  currentText: Ahora
43
43
  timeText: Hora
44
44
  days: Días
45
45
  delete: Borrar
46
46
  deleted_model: "%{model} borrado"
47
- deleted_records: "Ver Eliminados"
47
+ deleted_records: Ver Eliminados
48
48
  delimiter: Delimitador
49
49
  download: Descargar
50
50
  edit: Editar
51
- ends_with: "Termina con"
51
+ ends_with: Termina con
52
52
  error_500: "(código 500, error interno)"
53
- errors:
54
- template:
55
- body: "Hubo problemas con los siguientes campos:"
56
- header:
57
- one: "No se pudo guardar %{model} debido a un error."
58
- other: "No se pudo guardar %{model} debido a %{count} errores."
53
+ errors:
54
+ template:
55
+ body: 'Hubo problemas con los siguientes campos:'
56
+ header:
57
+ one: No se pudo guardar %{model} debido a un error.
58
+ other: No se pudo guardar %{model} debido a %{count} errores.
59
59
  export: Exportar
60
- ? "false"
61
- : "No"
62
- filtered: (Filtrado)
63
- found:
60
+ 'false': 'No'
61
+ filtered: "(Filtrado)"
62
+ found:
64
63
  one: encontrado
65
64
  other: encontrados
66
65
  future: Futuro
67
- hide: (Ocultar)
66
+ group_by: Agrupar por
67
+ grouped_by: Agrupado por %{column}
68
+ hide: "(Ocultar)"
68
69
  hours: Horas
69
- human_conditions:
70
+ human_conditions:
70
71
  association: "%{column} = %{value}"
71
72
  boolean: "%{column} = %{value}"
72
73
  inplace_edit_handle: "--"
73
- internal_error: "Petición fallida"
74
- live_search: "Buscar en Vivo"
74
+ internal_error: Petición fallida
75
+ live_search: Buscar en Vivo
75
76
  loading: Cargando…
76
- mark_all_records: "Seleccionar todos"
77
+ mark_all_records: Seleccionar todos
77
78
  maximum: Máximo
78
79
  minimum: Mínimo
79
80
  minutes: Minutos
@@ -81,59 +82,67 @@ es:
81
82
  nested_for_model: "%{nested_model} de %{parent_model}"
82
83
  nested_of_model: "%{nested_model} de %{parent_model}"
83
84
  next: Siguiente
84
- next_month: "Próximo mes"
85
- next_week: "Próxima semana"
86
- next_year: "Próximo año"
87
- no_authorization_for_action: "No dispone de autorización para la acción %{action}"
88
- no_entries: "Sin entradas"
89
- no_options: "sin opciones"
90
- not_null: "No Nulo"
91
- ? "null"
92
- : Nulo
93
- omit_header: "Omitir Cabecera"
94
- optional_attributes: "Más opciones"
85
+ next_month: Próximo mes
86
+ next_week: Próxima semana
87
+ next_year: Próximo año
88
+ no_authorization_for_action: No dispone de autorización para la acción %{action}
89
+ no_color: Sin color
90
+ no_entries: Sin entradas
91
+ no_group: No agrupar
92
+ no_options: sin opciones
93
+ not_null: No Nulo
94
+ 'null': Nulo
95
+ omit_header: Omitir Cabecera
96
+ optional_attributes: Más opciones
95
97
  options: Opciones
96
98
  past: Pasado
97
99
  pdf: PDF
98
- prev_month: "Mes pasado"
99
- prev_week: "Semana pasada"
100
- prev_year: "Año pasado"
100
+ prev_month: Mes pasado
101
+ prev_week: Semana pasada
102
+ prev_year: Año pasado
101
103
  previous: Anterior
102
104
  print: Imprimir
103
105
  range: Rango
104
- record_not_saved: "Fallo guardando el registro debido a un error desconocido"
105
- records_marked:
106
- one: "1 %{model} seleccionado"
106
+ record_not_saved: Fallo guardando el registro debido a un error desconocido
107
+ records_marked:
108
+ one: 1 %{model} seleccionado
107
109
  other: "%{count} %{model} seleccionados"
108
110
  refresh: Recargar
109
111
  remove: Eliminar
110
- remove_file: "Eliminar o Reemplazar archivo"
111
- replace_existing: "Reemplazar existente"
112
- replace_with_new: "Reemplazar con Nuevo"
112
+ remove_file: Eliminar o Reemplazar archivo
113
+ replace_existing: Reemplazar existente
114
+ replace_with_new: Reemplazar con Nuevo
113
115
  reset: Restaurar
114
- revisions_for_model: "Revisiones de %{model}"
116
+ revisions_for_model: Revisiones de %{model}
115
117
  saving: Guardando…
116
118
  search: Buscar
117
- search_terms: "Términos a buscar"
119
+ search_terms: Términos a buscar
118
120
  seconds: Segundos
119
121
  show: Ver
120
- show_block: (Ver)
121
- show_model: "Ver %{model}"
122
+ show_block: "(Ver)"
123
+ show_model: Ver %{model}
122
124
  sum: Total
123
- this_month: "Este mes"
124
- this_week: "Esta semana"
125
- this_year: "Este año"
125
+ this_month: Este mes
126
+ this_week: Esta semana
127
+ this_year: Este año
126
128
  today: Hoy
127
129
  tomorrow: Mañana
128
- ? "true"
129
- : Sí
130
+ 'true':
130
131
  update: Actualizar
131
- update_model: "Actualizar %{model}"
132
+ update_apply: Aplicar
133
+ update_model: Actualizar %{model}
132
134
  updated_model: "%{model} actualizado"
133
- version_inconsistency: "Inconsistencia de versiones - este registro se ha modificado después de que empezó a editarlo."
135
+ version_inconsistency: Inconsistencia de versiones - este registro se ha modificado después de que empezó a editarlo.
134
136
  weeks: Semanas
135
137
  years: Años
136
138
  yesterday: Ayer
137
- time:
138
- formats:
139
+ date:
140
+ formats:
141
+ month: "%B"
142
+ quarter: Trimestre %{num}
143
+ week: Semana %W de %Y
144
+ year_month: "%b %Y"
145
+ year_quarter: Trimestre %{quarter} %{year}
146
+ time:
147
+ formats:
139
148
  picker: "%a, %d %b %Y %H:%M:%S"