active_scaffold 3.3.0 → 3.3.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (62) hide show
  1. data/CHANGELOG +18 -0
  2. data/app/assets/javascripts/active_scaffold.js.erb +8 -0
  3. data/app/assets/javascripts/jquery/active_scaffold.js +11 -7
  4. data/app/assets/javascripts/jquery/date_picker_bridge.js.erb +19 -0
  5. data/app/assets/javascripts/prototype/active_scaffold.js +2 -0
  6. data/app/assets/stylesheets/active_scaffold_layout.css +5 -1
  7. data/app/views/active_scaffold_overrides/_field_search.html.erb +2 -2
  8. data/app/views/active_scaffold_overrides/_form_association.html.erb +5 -5
  9. data/app/views/active_scaffold_overrides/_form_association_record.html.erb +21 -16
  10. data/app/views/active_scaffold_overrides/_horizontal_subform.html.erb +8 -8
  11. data/app/views/active_scaffold_overrides/_horizontal_subform_header.html.erb +1 -1
  12. data/app/views/active_scaffold_overrides/_list.html.erb +1 -1
  13. data/app/views/active_scaffold_overrides/_list_calculations.html.erb +5 -7
  14. data/app/views/active_scaffold_overrides/_list_inline_adapter.html.erb +1 -12
  15. data/app/views/active_scaffold_overrides/_list_pagination.html.erb +1 -1
  16. data/app/views/active_scaffold_overrides/_list_record.html.erb +2 -2
  17. data/app/views/active_scaffold_overrides/_list_with_header.html.erb +1 -1
  18. data/app/views/active_scaffold_overrides/_render_field.js.erb +1 -1
  19. data/app/views/active_scaffold_overrides/_update_calculations.js.erb +1 -0
  20. data/app/views/active_scaffold_overrides/_vertical_subform.html.erb +2 -4
  21. data/app/views/active_scaffold_overrides/destroy.js.erb +1 -1
  22. data/app/views/active_scaffold_overrides/edit_associated.js.erb +2 -2
  23. data/config/locales/de.yml +109 -109
  24. data/config/locales/en.yml +109 -111
  25. data/config/locales/es.yml +112 -113
  26. data/config/locales/fr.yml +119 -125
  27. data/config/locales/hu.yml +109 -110
  28. data/config/locales/ja.yml +109 -110
  29. data/config/locales/ru.yml +119 -121
  30. data/lib/active_scaffold.rb +2 -2
  31. data/lib/active_scaffold/actions/common_search.rb +7 -3
  32. data/lib/active_scaffold/actions/core.rb +1 -0
  33. data/lib/active_scaffold/actions/field_search.rb +2 -1
  34. data/lib/active_scaffold/actions/list.rb +7 -1
  35. data/lib/active_scaffold/actions/subform.rb +2 -4
  36. data/lib/active_scaffold/attribute_params.rb +2 -4
  37. data/lib/active_scaffold/bridges/calendar_date_select.rb +1 -1
  38. data/lib/active_scaffold/bridges/date_picker.rb +4 -1
  39. data/lib/active_scaffold/bridges/date_picker/helper.rb +6 -6
  40. data/lib/active_scaffold/bridges/file_column.rb +1 -1
  41. data/lib/active_scaffold/bridges/file_column/as_file_column_bridge.rb +1 -1
  42. data/lib/active_scaffold/bridges/file_column/file_column_helpers.rb +1 -1
  43. data/lib/active_scaffold/bridges/paperclip.rb +1 -1
  44. data/lib/active_scaffold/bridges/paperclip/paperclip_bridge_helpers.rb +1 -1
  45. data/lib/active_scaffold/bridges/shared/date_bridge.rb +1 -1
  46. data/lib/active_scaffold/config/base.rb +6 -1
  47. data/lib/active_scaffold/config/core.rb +16 -0
  48. data/lib/active_scaffold/config/list.rb +4 -0
  49. data/lib/active_scaffold/data_structures/column.rb +10 -3
  50. data/lib/active_scaffold/extensions/action_view_rendering.rb +10 -5
  51. data/lib/active_scaffold/helpers/association_helpers.rb +20 -5
  52. data/lib/active_scaffold/helpers/form_column_helpers.rb +31 -21
  53. data/lib/active_scaffold/helpers/list_column_helpers.rb +8 -5
  54. data/lib/active_scaffold/helpers/pagination_helpers.rb +8 -0
  55. data/lib/active_scaffold/helpers/search_column_helpers.rb +20 -6
  56. data/lib/active_scaffold/helpers/view_helpers.rb +6 -6
  57. data/lib/active_scaffold/version.rb +1 -1
  58. data/test/bridges/paperclip_test.rb +2 -2
  59. data/vendor/assets/javascripts/getprototypeof.js +12 -0
  60. data/vendor/assets/javascripts/jquery-ui-timepicker-addon.js +1 -1
  61. metadata +5 -5
  62. data/app/views/active_scaffold_overrides/_search_attribute.html.erb +0 -10
@@ -1,128 +1,126 @@
1
1
  en:
2
2
  time:
3
3
  formats:
4
- picker: "%a, %d %b %Y %H:%M:%S"
4
+ picker: ! '%a, %d %b %Y %H:%M:%S'
5
5
  active_scaffold:
6
- add: 'Add'
7
- add_existing: 'Add Existing'
8
- add_existing_model: 'Add Existing %{model}'
9
- apply: 'Apply'
10
- are_you_sure_to_delete: 'Are you sure you want to delete %{label}?'
11
- cancel: 'Cancel'
12
- click_to_edit: 'Click to edit'
13
- click_to_reset: 'Click to reset'
14
- close: 'Close'
15
- config_list: 'Configure'
16
- config_list_model: 'Configure Columns for %{model}'
17
- create: 'Create'
18
- create_model: 'Create %{model}'
19
- create_another: 'Create Another %{model}'
20
- created_model: 'Created %{model}'
21
- create_new: 'Create New'
22
- customize: 'Customize'
23
- delete: 'Delete'
24
- deleted_model: 'Deleted %{model}'
25
- delimiter: 'Delimiter'
26
- download: 'Download'
27
- edit: 'Edit'
28
- export: 'Export'
29
- nested_for_model: '%{nested_model} for %{parent_model}'
30
- nested_of_model: '%{nested_model} of %{parent_model}'
6
+ add: Add
7
+ add_existing: Add Existing
8
+ add_existing_model: Add Existing %{model}
9
+ apply: Apply
10
+ are_you_sure_to_delete: Are you sure you want to delete %{label}?
11
+ cancel: Cancel
12
+ click_to_edit: Click to edit
13
+ click_to_reset: Click to reset
14
+ close: Close
15
+ config_list: Configure
16
+ config_list_model: Configure Columns for %{model}
17
+ create: Create
18
+ create_model: Create %{model}
19
+ create_another: Create Another %{model}
20
+ created_model: Created %{model}
21
+ create_new: Create New
22
+ customize: Customize
23
+ delete: Delete
24
+ deleted_model: Deleted %{model}
25
+ delimiter: Delimiter
26
+ download: Download
27
+ edit: Edit
28
+ export: Export
29
+ nested_for_model: ! '%{nested_model} for %{parent_model}'
30
+ nested_of_model: ! '%{nested_model} of %{parent_model}'
31
31
  'false': 'False'
32
- filtered: '(Filtered)'
33
- found: 'Found'
34
- hide: 'Hide'
35
- inplace_edit_handle: '--'
36
- live_search: 'Live Search'
37
- loading: 'Loading…'
38
- mark_all_records: "Mark all"
39
- next: 'Next'
40
- no_entries: 'No Entries'
41
- no_options: 'no options'
42
- omit_header: 'Omit Header'
43
- options: 'Options'
44
- pdf: 'PDF'
45
- previous: 'Previous'
46
- print: 'Print'
32
+ filtered: (Filtered)
33
+ found: Found
34
+ hide: Hide
35
+ inplace_edit_handle: --
36
+ live_search: Live Search
37
+ loading: Loading…
38
+ mark_all_records: Mark all
39
+ next: Next
40
+ no_entries: No Entries
41
+ no_options: no options
42
+ omit_header: Omit Header
43
+ options: Options
44
+ pdf: PDF
45
+ previous: Previous
46
+ print: Print
47
47
  records_marked:
48
- one: "1 marked %{model}"
49
- other: "%{count} marked %{model}"
50
- refresh: 'Refresh'
51
- remove: 'Remove'
52
- remove_file: 'Remove or Replace file'
53
- replace_existing: 'Replace Existing'
54
- replace_with_new: 'Replace With New'
55
- revisions_for_model: 'Revisions for %{model}'
56
- reset: 'Reset'
57
- saving: 'Saving…'
58
- search: 'Search'
59
- search_terms: 'Search Terms'
60
- _select_: '- select -'
61
- show: 'Show'
62
- show_model: 'Show %{model}'
63
- _to_ : ' to '
48
+ one: 1 marked %{model}
49
+ other: ! '%{count} marked %{model}'
50
+ refresh: Refresh
51
+ remove: Remove
52
+ remove_file: Remove or Replace file
53
+ replace_existing: Replace Existing
54
+ replace_with_new: Replace With New
55
+ revisions_for_model: Revisions for %{model}
56
+ reset: Reset
57
+ saving: Saving…
58
+ search: Search
59
+ search_terms: Search Terms
60
+ _select_: ! '- select -'
61
+ show: Show
62
+ show_model: Show %{model}
63
+ _to_: ! ' to '
64
64
  'true': 'True'
65
- update: 'Update'
66
- update_model: 'Update %{model}'
67
- updated_model: 'Updated %{model}'
68
- '=': '='
69
- '>=': '>='
70
- '<=': '<='
71
- '>': '>'
72
- '<': '<'
73
- '!=': '!='
74
- between: 'Between'
75
- contains: 'Contains'
76
- begins_with: 'Begins with'
77
- ends_with: 'Ends with'
78
- today: 'Today'
79
- yesterday: 'Yesterday'
80
- tomorrow: 'Tommorrow'
81
- this_week: 'This Week'
82
- prev_week: 'Last Week'
83
- next_week: 'Next Week'
84
- this_month: 'This Month'
85
- prev_month: 'Last Month'
86
- next_month: 'Next Month'
87
- this_year: 'This Year'
88
- prev_year: 'Last Year'
89
- next_year: 'Next Year'
90
- past: 'Past'
91
- future: 'Future'
92
- range: 'Range'
93
- seconds: 'Seconds'
94
- minutes: 'Minutes'
95
- hours: 'Hours'
96
- days: 'Days'
97
- weeks: 'Weeks'
98
- months: 'Months'
99
- years: 'Years'
100
- optional_attributes: 'Further Options'
65
+ update: Update
66
+ update_model: Update %{model}
67
+ updated_model: Updated %{model}
68
+ =: =
69
+ ! '>=': ! '>='
70
+ <=: <=
71
+ ! '>': ! '>'
72
+ <: <
73
+ ! '!=': ! '!='
74
+ between: Between
75
+ contains: Contains
76
+ begins_with: Begins with
77
+ ends_with: Ends with
78
+ today: Today
79
+ yesterday: Yesterday
80
+ tomorrow: Tomorrow
81
+ this_week: This Week
82
+ prev_week: Last Week
83
+ next_week: Next Week
84
+ this_month: This Month
85
+ prev_month: Last Month
86
+ next_month: Next Month
87
+ this_year: This Year
88
+ prev_year: Last Year
89
+ next_year: Next Year
90
+ past: Past
91
+ future: Future
92
+ range: Range
93
+ seconds: Seconds
94
+ minutes: Minutes
95
+ hours: Hours
96
+ days: Days
97
+ weeks: Weeks
98
+ months: Months
99
+ years: Years
100
+ optional_attributes: Further Options
101
101
  :null: 'Null'
102
- not_null: 'Not Null'
102
+ not_null: Not Null
103
103
  date_picker_options:
104
- weekHeader: 'Wk'
104
+ weekHeader: Wk
105
105
  firstDay: 0
106
106
  isRTL: false
107
107
  showMonthAfterYear: false
108
-
109
108
  datetime_picker_options:
110
-
109
+ closeText: Close
110
+ currentText: Now
111
+ timeText: Hour
111
112
  human_conditions:
112
- boolean: "%{column} = %{value}"
113
- association: "%{column} = %{value}"
114
-
113
+ boolean: ! '%{column} = %{value}'
114
+ association: ! '%{column} = %{value}'
115
115
  errors:
116
116
  template:
117
117
  header:
118
- one: "1 error prohibited this %{model} from being saved."
119
- other: "%{count} errors prohibited this %{model} from being saved"
120
-
121
- body: "There were problems with the following fields:"
122
-
123
- # error_messages
124
- cant_destroy_record: "%{record} can't be destroyed"
125
- internal_error: 'Request Failed (code 500, Internal Error)'
126
- version_inconsistency: 'Version inconsistency - this record has been modified since you started editing it.'
127
- record_not_saved: 'Failed to save record cause of an unknown error'
128
- no_authorization_for_action: "No Authorization for action %{action}"
118
+ one: 1 error prohibited this %{model} from being saved.
119
+ other: ! '%{count} errors prohibited this %{model} from being saved'
120
+ body: ! 'There were problems with the following fields:'
121
+ cant_destroy_record: ! '%{record} can''t be destroyed'
122
+ internal_error: Request Failed (code 500, Internal Error)
123
+ version_inconsistency: Version inconsistency - this record has been modified since you started editing it.
124
+ record_not_saved: Failed to save record cause of an unknown error
125
+ no_authorization_for_action: No Authorization for action %{action}
126
+ 'null': 'Null'
@@ -1,129 +1,128 @@
1
1
  es:
2
2
  time:
3
3
  formats:
4
- picker: "%a, %d %b %Y %H:%M:%S"
4
+ picker: ! '%a, %d %b %Y %H:%M:%S'
5
5
  active_scaffold:
6
- add: 'Añadir'
7
- add_existing: 'Añadir Existente'
8
- add_existing_model: 'Añadir %{model} Existente'
9
- apply: 'Aplicar'
10
- are_you_sure_to_delete: '¿Estás seguro de que quieres borrar %{label}?'
11
- cancel: 'Cancelar'
12
- click_to_edit: 'Pulsa para editar'
13
- click_to_reset: 'Pulsa para restaurar'
14
- close: 'Cerrar'
15
- config_list: 'Configurar'
16
- config_list_model: 'Configurar columnas de %{model}'
17
- create: 'Crear'
18
- create_model: 'Crear %{model}'
19
- create_another: 'Crear Otro %{model}'
20
- created_model: '%{model} creado'
21
- create_new: 'Crear Nuevo'
22
- customize: 'Personalizar'
23
- delete: 'Borrar'
24
- deleted_model: '%{model} borrado'
25
- delimiter: 'Delimitador'
26
- download: 'Descargar'
27
- edit: 'Editar'
28
- export: 'Exportar'
6
+ add: Añadir
7
+ add_existing: Añadir Existente
8
+ add_existing_model: Añadir %{model} Existente
9
+ apply: Aplicar
10
+ are_you_sure_to_delete: ¿Estás seguro de que quieres borrar %{label}?
11
+ cancel: Cancelar
12
+ click_to_edit: Pulsa para editar
13
+ click_to_reset: Pulsa para restaurar
14
+ close: Cerrar
15
+ config_list: Configurar
16
+ config_list_model: Configurar columnas de %{model}
17
+ create: Crear
18
+ create_model: Crear %{model}
19
+ create_another: Crear Otro %{model}
20
+ created_model: ! '%{model} creado'
21
+ create_new: Crear Nuevo
22
+ customize: Personalizar
23
+ delete: Borrar
24
+ deleted_model: ! '%{model} borrado'
25
+ delimiter: Delimitador
26
+ download: Descargar
27
+ edit: Editar
28
+ export: Exportar
29
29
  'false': 'No'
30
- filtered: '(Filtrado)'
30
+ filtered: (Filtrado)
31
31
  found:
32
- one: 'encontrado'
33
- other: 'encontrados'
34
- hide: 'Ocultar'
35
- inplace_edit_handle: '--'
36
- live_search: 'Buscar en Vivo'
37
- loading: 'Cargando…'
38
- mark_all_records: "Seleccionar todos"
39
- nested_for_model: '%{nested_model} de %{parent_model}'
40
- nested_of_model: '%{nested_model} de %{parent_model}'
41
- next: 'Siguiente'
42
- no_entries: 'Sin entradas'
43
- no_options: 'sin opciones'
44
- omit_header: 'Omitir Cabecera'
45
- options: 'Opciones'
46
- pdf: 'PDF'
47
- previous: 'Anterior'
48
- print: 'Imprimir'
32
+ one: encontrado
33
+ other: encontrados
34
+ hide: Ocultar
35
+ inplace_edit_handle: --
36
+ live_search: Buscar en Vivo
37
+ loading: Cargando…
38
+ mark_all_records: Seleccionar todos
39
+ nested_for_model: ! '%{nested_model} de %{parent_model}'
40
+ nested_of_model: ! '%{nested_model} de %{parent_model}'
41
+ next: Siguiente
42
+ no_entries: Sin entradas
43
+ no_options: sin opciones
44
+ omit_header: Omitir Cabecera
45
+ options: Opciones
46
+ pdf: PDF
47
+ previous: Anterior
48
+ print: Imprimir
49
49
  records_marked:
50
- one: "1 %{model} seleccionado"
51
- other: "%{count} %{model} seleccionados"
52
- refresh: 'Recargar'
53
- remove: 'Eliminar'
54
- remove_file: 'Eliminar o Reemplazar archivo'
55
- replace_existing: 'Reemplazar existente'
56
- replace_with_new: 'Reemplazar con Nuevo'
57
- revisions_for_model: 'Revisiones de %{model}'
58
- reset: 'Restaurar'
59
- saving: 'Guardando…'
60
- search: 'Buscar'
61
- search_terms: 'Términos a buscar'
62
- _select_: '- seleccionar -'
63
- show: 'Ver'
64
- show_model: 'Ver %{model}'
65
- _to_ : ' a '
66
- 'true': ''
67
- update: 'Actualizar'
68
- update_model: 'Actualizar %{model}'
69
- updated_model: '%{model} actualizado'
70
- '=': 'Igual'
71
- '>=': 'Mayor o igual'
72
- '<=': 'Menor o igual'
73
- '>': 'Mayor'
74
- '<': 'Menor'
75
- '!=': 'Distinto'
76
- between: 'Entre'
77
- contains: 'Contiene'
78
- begins_with: 'Empieza con'
79
- ends_with: 'Termina con'
80
- today: 'Hoy'
81
- yesterday: 'Ayer'
82
- tomorrow: 'Mañana'
83
- this_week: 'Esta semana'
84
- prev_week: 'Semana pasada'
85
- next_week: 'Próxima semana'
86
- this_month: 'Este mes'
87
- prev_month: 'Mes pasado'
88
- next_month: 'Próximo mes'
89
- this_year: 'Este año'
90
- prev_year: 'Año pasado'
91
- next_year: 'Próximo año'
92
- past: 'Pasado'
93
- future: 'Futuro'
94
- range: 'Rango'
95
- seconds: 'Segundos'
96
- minutes: 'Minutos'
97
- hours: 'Horas'
98
- days: 'Días'
99
- weeks: 'Semanas'
100
- months: 'Meses'
101
- years: 'Años'
102
- optional_attributes: 'Más opciones'
103
- :null: 'Nulo'
104
- not_null: 'No Nulo'
50
+ one: 1 %{model} seleccionado
51
+ other: ! '%{count} %{model} seleccionados'
52
+ refresh: Recargar
53
+ remove: Eliminar
54
+ remove_file: Eliminar o Reemplazar archivo
55
+ replace_existing: Reemplazar existente
56
+ replace_with_new: Reemplazar con Nuevo
57
+ revisions_for_model: Revisiones de %{model}
58
+ reset: Restaurar
59
+ saving: Guardando…
60
+ search: Buscar
61
+ search_terms: Términos a buscar
62
+ _select_: ! '- seleccionar -'
63
+ show: Ver
64
+ show_model: Ver %{model}
65
+ _to_: ! ' a '
66
+ 'true': Sí
67
+ update: Actualizar
68
+ update_model: Actualizar %{model}
69
+ updated_model: ! '%{model} actualizado'
70
+ =: Igual
71
+ ! '>=': Mayor o igual
72
+ <=: Menor o igual
73
+ ! '>': Mayor
74
+ <: Menor
75
+ ! '!=': Distinto
76
+ between: Entre
77
+ contains: Contiene
78
+ begins_with: Empieza con
79
+ ends_with: Termina con
80
+ today: Hoy
81
+ yesterday: Ayer
82
+ tomorrow: Mañana
83
+ this_week: Esta semana
84
+ prev_week: Semana pasada
85
+ next_week: Próxima semana
86
+ this_month: Este mes
87
+ prev_month: Mes pasado
88
+ next_month: Próximo mes
89
+ this_year: Este año
90
+ prev_year: Año pasado
91
+ next_year: Próximo año
92
+ past: Pasado
93
+ future: Futuro
94
+ range: Rango
95
+ seconds: Segundos
96
+ minutes: Minutos
97
+ hours: Horas
98
+ days: Días
99
+ weeks: Semanas
100
+ months: Meses
101
+ years: Años
102
+ optional_attributes: Más opciones
103
+ :null: Nulo
104
+ not_null: No Nulo
105
105
  date_picker_options:
106
- weekHeader: 'Sm'
106
+ weekHeader: Sm
107
107
  firstDay: 1
108
108
  isRTL: false
109
109
  showMonthAfterYear: false
110
110
  datetime_picker_options:
111
- timeText: 'Hora'
112
- currentText: 'Ahora'
113
- closeText: 'Cerrar'
111
+ timeText: Hora
112
+ currentText: Ahora
113
+ closeText: Cerrar
114
114
  human_conditions:
115
- boolean: "%{column} = %{value}"
116
- association: "%{column} = %{value}"
115
+ boolean: ! '%{column} = %{value}'
116
+ association: ! '%{column} = %{value}'
117
117
  errors:
118
118
  template:
119
119
  header:
120
- one: "No se pudo guardar debido a un error."
121
- other: "No se pudo guardar debido a %{count} errores."
122
- body: "Hubo problemas con los siguientes campos:"
123
-
124
- # error_messages
125
- cant_destroy_record: "No se pudo borrar %{record}"
126
- internal_error: 'Petición fallida (código 500, error interno)'
127
- version_inconsistency: 'Inconsistencia de versiones - este registro se ha modificado después de que empezó a editarlo.'
128
- record_not_saved: 'Fallo guardando el registro debido a un error desconocido'
129
- no_authorization_for_action: "No dispone de autorización para la acción %{action}"
120
+ one: No se pudo guardar %{model} debido a un error.
121
+ other: No se pudo guardar %{model} debido a %{count} errores.
122
+ body: ! 'Hubo problemas con los siguientes campos:'
123
+ cant_destroy_record: No se pudo borrar %{record}
124
+ internal_error: Petición fallida (código 500, error interno)
125
+ version_inconsistency: Inconsistencia de versiones - este registro se ha modificado después de que empezó a editarlo.
126
+ record_not_saved: Fallo guardando el registro debido a un error desconocido
127
+ no_authorization_for_action: No dispone de autorización para la acción %{action}
128
+ 'null': Nulo