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
- fr:
2
- active_scaffold:
3
- ? "!="
4
- : "!="
5
- <: <
6
- <=: <=
7
- ? ">"
8
- : ">"
9
- ? ">="
10
- : ">="
1
+ fr:
2
+ active_scaffold:
3
+ "!=": "!="
4
+ "<": "<"
5
+ "<=": "<="
6
+ "=": "="
7
+ ">": ">"
8
+ ">=": ">="
11
9
  _select_: "- sélectionner -"
12
10
  _to_: " à "
13
11
  add: Ajouter
14
- add_existing: "Ajouter un(e) existant(e)"
15
- add_existing_model: "Ajouter un(e) %{model} existant(e)"
16
- update_apply: Appliquer
17
- create_apply: Create and continue
18
- are_you_sure_to_delete: "Êtes vous sûr de vouloir supprimer %{label} ?"
19
- average: Average
20
- begins_with: "Commençant par"
12
+ add_existing: Ajouter un(e) existant(e)
13
+ add_existing_model: Ajouter un(e) %{model} existant(e)
14
+ apply: Appliquer
15
+ are_you_sure_to_delete: Êtes vous sûr de vouloir supprimer %{label} ?
16
+ average: Moyenne
17
+ begins_with: Commençant par
21
18
  between: Entre
22
19
  cancel: Annuler
23
20
  cant_destroy_record: "%{record} ne peut être supprimé"
24
- click_to_edit: "Cliquer pour éditer"
25
- click_to_reset: "Cliquer pour ré-initialiser"
21
+ changes: Changement
22
+ click_to_edit: Cliquer pour éditer
23
+ click_to_reset: Cliquer pour ré-initialiser
26
24
  close: Fermer
25
+ config_list: Configurer
26
+ config_list_model: Configurer les colonnes pour %{model}
27
27
  contains: Contient
28
28
  create: Créer
29
- create_another: "Créer un autre %{model}"
30
- create_model: "Créer %{model}"
31
- create_new: "Créer un nouveau"
29
+ create_another: Créer un autre %{model}
30
+ create_apply: Créer et continuer
31
+ create_model: Créer %{model}
32
+ create_new: Créer un nouveau
32
33
  created_model: "%{model} créé"
33
34
  customize: Personnaliser
34
- date_picker_options:
35
+ date_picker_options:
35
36
  firstDay: 1
36
37
  isRTL: false
37
38
  showMonthAfterYear: false
38
39
  weekHeader: Sm
39
- datetime_picker_options:
40
+ datetime_picker_options:
40
41
  closeText: Fermer
41
42
  currentText: Maintenant
42
43
  timeText: Heure
43
44
  days: Jours
44
45
  delete: Supprimer
45
- deleted_model: "Suppression de %{model}"
46
+ deleted_model: Suppression de %{model}
47
+ deleted_records: Lister les enregistrements supprimés
46
48
  delimiter: Délimiteur
47
49
  download: Télécharger
48
50
  edit: Éditer
49
- ends_with: "Se terminant par"
51
+ ends_with: Se terminant par
50
52
  error_500: "(code 500, Erreur interne)"
51
- errors:
52
- template:
53
- body: "Il y avait des problèmes avec les champs suivants :"
54
- header:
55
- one: "1 erreur interdit ce(tte) %{model} d'être sauvegardé."
53
+ errors:
54
+ template:
55
+ body: 'Il y avait des problèmes avec les champs suivants :'
56
+ header:
57
+ one: 1 erreur interdit ce(tte) %{model} d'être sauvegardé.
56
58
  other: "%{count} erreurs interdisent ce(tte) %{model} d'être sauvegardé"
57
59
  export: Exporter
58
- ? "false"
59
- : Faux
60
- filtered: (Filtré)
60
+ 'false': Faux
61
+ filtered: "(Filtré)"
61
62
  found: Trouvé
62
63
  future: Futur
63
- hide: (Cacher)
64
+ group_by: Grouper par
65
+ grouped_by:
66
+ hide: "(Cacher)"
64
67
  hours: Heures
65
- human_conditions:
68
+ human_conditions:
66
69
  association: "%{column} = %{value}"
67
70
  boolean: "%{column} = %{value}"
68
71
  inplace_edit_handle: "--"
69
- internal_error: "Erreur de la requête"
70
- live_search: "Recherche en temps réel"
72
+ internal_error: Erreur de la requête
73
+ live_search: Recherche en temps réel
71
74
  loading: Chargement…
72
- mark_all_records: "Marquer tous"
75
+ mark_all_records: Marquer tous
73
76
  maximum: Maximum
74
77
  minimum: Minimum
75
78
  minutes: Minutes
@@ -77,59 +80,67 @@ fr:
77
80
  nested_for_model: "%{nested_model} pour %{parent_model}"
78
81
  nested_of_model: "%{nested_model} de %{parent_model}"
79
82
  next: Suivant
80
- next_month: "Mois prochain"
81
- next_week: "Semaine prochaine"
82
- next_year: "Année prochaine"
83
- no_authorization_for_action: "Aucune autorisation pour l'action %{action}"
84
- no_entries: "Pas d'entrée"
85
- no_options: "pas d'option"
86
- not_null: "Non Nulle"
87
- ? "null"
88
- : Nulle
89
- omit_header: "Omettre les en-têtes"
90
- optional_attributes: "Options additionnelles"
83
+ next_month: Mois prochain
84
+ next_week: Semaine prochaine
85
+ next_year: Année prochaine
86
+ no_authorization_for_action: Aucune autorisation pour l'action %{action}
87
+ no_color: Pas de couleur
88
+ no_entries: Pas d'entrée
89
+ no_group: Pas de groupe
90
+ no_options: pas d'option
91
+ not_null: Non Nulle
92
+ 'null': Nulle
93
+ omit_header: Omettre les en-têtes
94
+ optional_attributes: Options additionnelles
91
95
  options: Options
92
96
  past: Passé
93
97
  pdf: PDF
94
- prev_month: "Mois dernier"
95
- prev_week: "Semaine dernière"
96
- prev_year: "Année dernière"
98
+ prev_month: Mois dernier
99
+ prev_week: Semaine dernière
100
+ prev_year: Année dernière
97
101
  previous: Précédent
98
102
  print: Imprimer
99
103
  range: Intervale
100
- record_not_saved: "Impossible d'enregistrer l'enregistrement à cause d'une erreur inconnue"
101
- records_marked:
102
- one: "1 %{model} marqué"
104
+ record_not_saved: Impossible d'enregistrer l'enregistrement à cause d'une erreur inconnue
105
+ records_marked:
106
+ one: 1 %{model} marqué
103
107
  other: "%{count} %{model} marqués"
104
108
  refresh: Rafraîchir
105
109
  remove: Supprimer
106
- remove_file: "Supprimer et remplacer le fichier"
107
- replace_existing: "Remplacer existant(e)"
108
- replace_with_new: "Remplacer avec le nouveau"
110
+ remove_file: Supprimer et remplacer le fichier
111
+ replace_existing: Remplacer existant(e)
112
+ replace_with_new: Remplacer avec le nouveau
109
113
  reset: Annuler
110
- revisions_for_model: "Révision pour %{model}"
114
+ revisions_for_model: Révision pour %{model}
111
115
  saving: Sauvegarder…
112
116
  search: Rechercher
113
- search_terms: "Recherche de termes"
117
+ search_terms: Recherche de termes
114
118
  seconds: Secondes
115
119
  show: Montrer
116
- show_block: (Montrer)
117
- show_model: "Montrer %{model}"
118
- sum: Sum
119
- this_month: "Ce Mois"
120
- this_week: "Cette Semaine"
121
- this_year: "Cette Année"
120
+ show_block: "(Montrer)"
121
+ show_model: Montrer %{model}
122
+ sum: Somme
123
+ this_month: Ce Mois
124
+ this_week: Cette Semaine
125
+ this_year: Cette Année
122
126
  today: Aujourd'hui
123
127
  tomorrow: Demain
124
- ? "true"
125
- : Vrai
126
- update: "Mettre à jour"
127
- update_model: "Mettre à jour le(/la) %{model}"
128
- updated_model: "Mis à jour de %{model}"
129
- version_inconsistency: "Version incomplète - Cet enregistrement a été modifié depuis que vous avez commencé à l'éditer."
128
+ 'true': Vrai
129
+ update: Mettre à jour
130
+ update_apply: Appliquer
131
+ update_model: Mettre à jour le(/la) %{model}
132
+ updated_model: Mis à jour de %{model}
133
+ version_inconsistency: Version incomplète - Cet enregistrement a été modifié depuis que vous avez commencé à l'éditer.
130
134
  weeks: Semaines
131
135
  years: Années
132
136
  yesterday: Hier
133
- time:
134
- formats:
137
+ date:
138
+ formats:
139
+ month:
140
+ quarter:
141
+ week:
142
+ year_month:
143
+ year_quarter:
144
+ time:
145
+ formats:
135
146
  picker: "%a, %d %b %Y %H:%M:%S"
@@ -1,75 +1,78 @@
1
- hu:
2
- active_scaffold:
3
- ? "!="
4
- : "!="
5
- <: <
6
- <=: <=
7
- ? ">"
8
- : ">"
9
- ? ">="
10
- : ">="
1
+ hu:
2
+ active_scaffold:
3
+ "!=": "!="
4
+ "<": "<"
5
+ "<=": "<="
6
+ "=": "="
7
+ ">": ">"
8
+ ">=": ">="
11
9
  _select_: "- válassz -"
12
10
  _to_: " – "
13
11
  add: Hozzáadás
14
- add_existing: "Meglevő hozzáadása"
15
- add_existing_model: "Meglevő %{model} hozzáadása"
16
- update_apply: Apply
17
- create_apply: Create and continue
18
- are_you_sure_to_delete: "Are you sure you want to delete %{label}?"
12
+ add_existing: Meglevő hozzáadása
13
+ add_existing_model: Meglevő %{model} hozzáadása
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: Között
22
19
  cancel: Mégse
23
- cant_destroy_record: "nem törölhető: %{record}"
24
- click_to_edit: "Kattints a szerkesztéshez"
25
- click_to_reset: "Kattints az alapállapothoz"
20
+ cant_destroy_record: 'nem törölhető: %{record}'
21
+ changes:
22
+ click_to_edit: Kattints a szerkesztéshez
23
+ click_to_reset: Kattints az alapállapothoz
26
24
  close: Bezárás
25
+ config_list: Configure
26
+ config_list_model: Configure Columns for %{model}
27
27
  contains: Contains
28
28
  create: Létrehozás
29
- create_another: "Create Another %{model}"
29
+ create_another: Create Another %{model}
30
+ create_apply:
30
31
  create_model: "%{model} létrehozása"
31
- create_new: "Új létrehozása"
32
+ create_new: Új létrehozása
32
33
  created_model: "%{model} létrehozva"
33
34
  customize: Testreszabás
34
- date_picker_options:
35
+ date_picker_options:
35
36
  firstDay: 0
36
37
  isRTL: false
37
38
  showMonthAfterYear: false
38
39
  weekHeader: Wk
39
- datetime_picker_options:
40
- closeText: ~
41
- currentText: ~
42
- timeText: ~
40
+ datetime_picker_options:
41
+ closeText:
42
+ currentText:
43
+ timeText:
43
44
  days: Days
44
45
  delete: Törlés
45
46
  deleted_model: "%{model} törölve"
47
+ deleted_records:
46
48
  delimiter: Elválasztó
47
49
  download: Letöltés
48
50
  edit: Szerkesztés
49
- ends_with: "Ends with"
51
+ ends_with: Ends with
50
52
  error_500: "(code 500, Internal Error)"
51
- errors:
52
- template:
53
- body: "There were problems with the following fields:"
54
- header:
55
- 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.
56
58
  other: "%{count} errors prohibited this %{model} from being saved"
57
59
  export: Exportálás
58
- ? "false"
59
- : "False"
60
- filtered: (Szűrt)
60
+ 'false': 'False'
61
+ filtered: "(Szűrt)"
61
62
  found: Találat
62
63
  future: Future
63
- hide: (Elrejtés)
64
+ group_by:
65
+ grouped_by:
66
+ hide: "(Elrejtés)"
64
67
  hours: Hours
65
- human_conditions:
68
+ human_conditions:
66
69
  association: "%{column} = %{value}"
67
70
  boolean: "%{column} = %{value}"
68
71
  inplace_edit_handle: "--"
69
- internal_error: "A lekérés sikertelen"
70
- live_search: "Élő keresés"
72
+ internal_error: A lekérés sikertelen
73
+ live_search: Élő keresés
71
74
  loading: Betöltés…
72
- mark_all_records: "Mark all"
75
+ mark_all_records: Mark all
73
76
  maximum: Maximum
74
77
  minimum: Minimum
75
78
  minutes: Minutes
@@ -77,59 +80,67 @@ hu:
77
80
  nested_for_model: "%{nested_model} / %{parent_model}"
78
81
  nested_of_model: "%{nested_model} of %{parent_model}"
79
82
  next: Következő
80
- next_month: "Next Month"
81
- next_week: "Next Week"
82
- next_year: "Next Year"
83
- no_authorization_for_action: "No Authorization for action %{action}"
84
- no_entries: "Nincs elem"
85
- no_options: "nincsenek opciók"
86
- not_null: "Not Null"
87
- ? "null"
88
- : "Null"
89
- omit_header: "Fejléc mellőzése"
90
- 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:
88
+ no_entries: Nincs elem
89
+ no_group:
90
+ no_options: nincsenek opciók
91
+ not_null: Not Null
92
+ 'null': 'Null'
93
+ omit_header: Fejléc mellőzése
94
+ optional_attributes: Further Options
91
95
  options: Opciók
92
96
  past: Past
93
97
  pdf: PDF
94
- prev_month: "Last Month"
95
- prev_week: "Last Week"
96
- prev_year: "Last Year"
98
+ prev_month: Last Month
99
+ prev_week: Last Week
100
+ prev_year: Last Year
97
101
  previous: Előző
98
102
  print: Nyomtatás
99
103
  range: Range
100
- record_not_saved: "Failed to save record cause of an unknown error"
101
- records_marked:
102
- 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}
103
107
  other: "%{count} marked %{model}"
104
108
  refresh: Frissítés
105
109
  remove: Törlés
106
- remove_file: "Fájl törlése, vagy cseréje"
107
- replace_existing: "Replace existing"
108
- replace_with_new: "Csere újjal"
110
+ remove_file: Fájl törlése, vagy cseréje
111
+ replace_existing: Replace existing
112
+ replace_with_new: Csere újjal
109
113
  reset: Alapállapot
110
114
  revisions_for_model: "%{model} revíziói"
111
115
  saving: Mentés…
112
116
  search: Keresés
113
- search_terms: "Keresési kifejezések"
117
+ search_terms: Keresési kifejezések
114
118
  seconds: Seconds
115
119
  show: Mutatás
116
- show_block: (Mutatás)
120
+ show_block: "(Mutatás)"
117
121
  show_model: "%{model} mutatása"
118
122
  sum: Sum
119
- this_month: "This Month"
120
- this_week: "This Week"
121
- this_year: "This Year"
123
+ this_month: This Month
124
+ this_week: This Week
125
+ this_year: This Year
122
126
  today: Today
123
127
  tomorrow: Tomorrow
124
- ? "true"
125
- : "True"
128
+ 'true': 'True'
126
129
  update: Modosítás
130
+ update_apply:
127
131
  update_model: "%{model} modosítása"
128
132
  updated_model: "%{model} módosítva"
129
- version_inconsistency: "Verzió ütközés - ezt a rekordot módosították mióta elkezdted szerkeszteni."
133
+ version_inconsistency: Verzió ütközés - ezt a rekordot módosították mióta elkezdted szerkeszteni.
130
134
  weeks: Weeks
131
135
  years: Years
132
136
  yesterday: Yesterday
133
- time:
134
- formats:
137
+ date:
138
+ formats:
139
+ month:
140
+ quarter:
141
+ week:
142
+ year_month:
143
+ year_quarter:
144
+ time:
145
+ formats:
135
146
  picker: "%a, %d %b %Y %H:%M:%S"
@@ -1,75 +1,78 @@
1
- ja:
2
- active_scaffold:
3
- ? "!="
4
- : "!="
5
- <: <
6
- <=: <=
7
- ? ">"
8
- : ">"
9
- ? ">="
10
- : ">="
1
+ ja:
2
+ active_scaffold:
3
+ "!=": "!="
4
+ "<": "<"
5
+ "<=": "<="
6
+ "=": "="
7
+ ">": ">"
8
+ ">=": ">="
11
9
  _select_: "- 選択してください -"
12
10
  _to_: " to "
13
11
  add: 追加
14
12
  add_existing: 既存のものを追加
15
- add_existing_model: "既存の%{model}を追加"
16
- update_apply: Apply
17
- create_apply: Create and continue
18
- are_you_sure_to_delete: "Are you sure you want to delete %{label}?"
13
+ add_existing_model: 既存の%{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: キャンセル
23
20
  cant_destroy_record: "%{record}を削除で来ません"
21
+ changes:
24
22
  click_to_edit: クリックして編集
25
- click_to_reset: "Click to reset"
23
+ click_to_reset: Click to reset
26
24
  close: 閉じる
25
+ config_list: Configure
26
+ config_list_model: Configure Columns for %{model}
27
27
  contains: Contains
28
28
  create: 作成
29
- create_another: "Create Another %{model}"
29
+ create_another: Create Another %{model}
30
+ create_apply:
30
31
  create_model: "%{model}を作成"
31
32
  create_new: 新規作成
32
33
  created_model: "%{model}を作成しました"
33
34
  customize: カスタマイズ
34
- date_picker_options:
35
+ date_picker_options:
35
36
  firstDay: 0
36
37
  isRTL: false
37
38
  showMonthAfterYear: false
38
39
  weekHeader: Wk
39
- datetime_picker_options:
40
- closeText: ~
41
- currentText: ~
42
- timeText: ~
40
+ datetime_picker_options:
41
+ closeText:
42
+ currentText:
43
+ timeText:
43
44
  days: Days
44
45
  delete: 削除
45
46
  deleted_model: "%{model}を削除しました"
47
+ deleted_records:
46
48
  delimiter: Delimiter
47
49
  download: ダウンロード
48
50
  edit: 編集
49
- ends_with: "Ends with"
51
+ ends_with: Ends with
50
52
  error_500: "(コード500: 内部エラー)"
51
- errors:
52
- template:
53
- body: "There were problems with the following fields:"
54
- header:
55
- 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.
56
58
  other: "%{count} errors prohibited this %{model} from being saved"
57
59
  export: Export
58
- ? "false"
59
- : "False"
60
- filtered: (フィルタ中)
60
+ 'false': 'False'
61
+ filtered: "(フィルタ中)"
61
62
  found: 個ありました
62
63
  future: Future
63
- hide: (隠す)
64
+ group_by:
65
+ grouped_by:
66
+ hide: "(隠す)"
64
67
  hours: Hours
65
- human_conditions:
68
+ human_conditions:
66
69
  association: "%{column} = %{value}"
67
70
  boolean: "%{column} = %{value}"
68
71
  inplace_edit_handle: "--"
69
72
  internal_error: リクエストが失敗しました
70
73
  live_search: その場で検索
71
74
  loading: 読み込み中…
72
- mark_all_records: "Mark all"
75
+ mark_all_records: Mark all
73
76
  maximum: Maximum
74
77
  minimum: Minimum
75
78
  minutes: Minutes
@@ -77,59 +80,67 @@ ja:
77
80
  nested_for_model: "%{parent_model}の%{nested_model}"
78
81
  nested_of_model: "%{nested_model} of %{parent_model}"
79
82
  next: 次
80
- next_month: "Next Month"
81
- next_week: "Next Week"
82
- next_year: "Next Year"
83
- no_authorization_for_action: "No Authorization for action %{action}"
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:
84
88
  no_entries: 見つかりませんでした
89
+ no_group:
85
90
  no_options: オプション無し
86
- not_null: "Not Null"
87
- ? "null"
88
- : "Null"
89
- omit_header: "Omit Header"
90
- optional_attributes: "Further Options"
91
+ not_null: Not Null
92
+ 'null': 'Null'
93
+ omit_header: Omit Header
94
+ optional_attributes: Further Options
91
95
  options: オプション
92
96
  past: Past
93
97
  pdf: PDF
94
- prev_month: "Last Month"
95
- prev_week: "Last Week"
96
- prev_year: "Last Year"
98
+ prev_month: Last Month
99
+ prev_week: Last Week
100
+ prev_year: Last Year
97
101
  previous: 前
98
102
  print: 印刷
99
103
  range: Range
100
- record_not_saved: "Failed to save record cause of an unknown error"
101
- records_marked:
102
- 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}
103
107
  other: "%{count} marked %{model}"
104
108
  refresh: Refresh
105
109
  remove: 削除
106
110
  remove_file: ファイルを削除または置換
107
- replace_existing: "Replace existing"
111
+ replace_existing: Replace existing
108
112
  replace_with_new: 新しいもので置換
109
113
  reset: リセット
110
- revisions_for_model: "Revisions for %{model}"
114
+ revisions_for_model: Revisions for %{model}
111
115
  saving: 保存中…
112
116
  search: 検索
113
117
  search_terms: 検索単語
114
118
  seconds: Seconds
115
119
  show: 表示
116
- show_block: (表示)
120
+ show_block: "(表示)"
117
121
  show_model: "%{model}を表示"
118
122
  sum: Sum
119
- this_month: "This Month"
120
- this_week: "This Week"
121
- this_year: "This Year"
123
+ this_month: This Month
124
+ this_week: This Week
125
+ this_year: This Year
122
126
  today: Today
123
127
  tomorrow: Tomorrow
124
- ? "true"
125
- : "True"
128
+ 'true': 'True'
126
129
  update: 更新
130
+ update_apply:
127
131
  update_model: "%{model}を更新"
128
132
  updated_model: "%{model}を更新しました"
129
- version_inconsistency: "バージョンが一致しません - あなたが編集している間にこのレコードが変更されました。"
133
+ version_inconsistency: バージョンが一致しません - あなたが編集している間にこのレコードが変更されました。
130
134
  weeks: Weeks
131
135
  years: Years
132
136
  yesterday: Yesterday
133
- time:
134
- formats:
137
+ date:
138
+ formats:
139
+ month:
140
+ quarter:
141
+ week:
142
+ year_month:
143
+ year_quarter:
144
+ time:
145
+ formats:
135
146
  picker: "%a, %d %b %Y %H:%M:%S"