decidim-core 0.18.1 → 0.19.0

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of decidim-core might be problematic. Click here for more details.

Files changed (275) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/config/decidim_core_manifest.js +3 -0
  3. data/app/assets/javascripts/decidim/social_share.js +2 -0
  4. data/app/assets/stylesheets/decidim/extras/_social_share.css.scss +36 -0
  5. data/app/assets/stylesheets/decidim/modules/_input-gallery.scss +24 -0
  6. data/app/assets/stylesheets/decidim/modules/_navbar.scss +1 -1
  7. data/app/cells/decidim/activities_cell.rb +13 -8
  8. data/app/cells/decidim/activity_cell.rb +19 -5
  9. data/app/cells/decidim/address/details.erb +2 -2
  10. data/app/cells/decidim/amendable/amenders_list/show.erb +1 -1
  11. data/app/cells/decidim/amendable/amenders_list_cell.rb +5 -1
  12. data/app/cells/decidim/amendable/announcement_cell.rb +22 -9
  13. data/app/cells/decidim/amendable/wizard_step_form_cell.rb +121 -0
  14. data/app/cells/decidim/announcement_cell.rb +1 -0
  15. data/app/cells/decidim/author_cell.rb +7 -0
  16. data/app/cells/decidim/card_m_cell.rb +3 -1
  17. data/app/cells/decidim/coauthorships_cell.rb +3 -1
  18. data/app/cells/decidim/collapsible_authors_cell.rb +1 -0
  19. data/app/cells/decidim/collapsible_list_cell.rb +1 -0
  20. data/app/cells/decidim/content_blocks/highlighted_content_banner_cell.rb +1 -0
  21. data/app/cells/decidim/content_blocks/last_activity_cell.rb +3 -2
  22. data/app/cells/decidim/content_blocks/metrics_cell.rb +1 -0
  23. data/app/cells/decidim/content_blocks/stats_cell.rb +1 -0
  24. data/app/cells/decidim/content_blocks/sub_hero_cell.rb +1 -0
  25. data/app/cells/decidim/diff_cell.rb +1 -1
  26. data/app/cells/decidim/fingerprint/show.erb +1 -1
  27. data/app/cells/decidim/follow_button_cell.rb +3 -0
  28. data/app/cells/decidim/members_cell.rb +1 -0
  29. data/app/cells/decidim/notifications/show.erb +1 -1
  30. data/app/cells/decidim/profile_cell.rb +1 -0
  31. data/app/cells/decidim/profile_sidebar_cell.rb +4 -0
  32. data/app/cells/decidim/search_results_cell.rb +1 -0
  33. data/app/cells/decidim/search_results_section/show.erb +1 -1
  34. data/app/cells/decidim/tos_page_cell.rb +1 -0
  35. data/app/cells/decidim/user_group_pending_invitations_list_cell.rb +1 -0
  36. data/app/cells/decidim/user_group_pending_requests_list_cell.rb +1 -0
  37. data/app/cells/decidim/wizard_step_form/wizard_aside.erb +14 -0
  38. data/app/cells/decidim/wizard_step_form/wizard_header.erb +18 -0
  39. data/app/cells/decidim/wizard_step_form_cell.rb +112 -0
  40. data/app/commands/decidim/amendable/accept.rb +1 -1
  41. data/app/commands/decidim/amendable/create_draft.rb +70 -0
  42. data/app/commands/decidim/amendable/destroy_draft.rb +40 -0
  43. data/app/commands/decidim/amendable/promote.rb +13 -11
  44. data/app/commands/decidim/amendable/publish_draft.rb +76 -0
  45. data/app/commands/decidim/amendable/update_draft.rb +54 -0
  46. data/app/commands/decidim/amendable/withdraw.rb +31 -15
  47. data/app/commands/decidim/create_follow.rb +1 -0
  48. data/app/commands/decidim/create_omniauth_registration.rb +22 -4
  49. data/app/commands/decidim/create_registration.rb +5 -0
  50. data/app/commands/decidim/delete_follow.rb +1 -0
  51. data/app/commands/decidim/search.rb +1 -0
  52. data/app/controllers/concerns/decidim/action_authorization.rb +2 -0
  53. data/app/controllers/concerns/decidim/amendments_controller.rb +148 -28
  54. data/app/controllers/concerns/decidim/devise_controllers.rb +3 -2
  55. data/app/controllers/concerns/decidim/force_authentication.rb +38 -0
  56. data/app/controllers/concerns/decidim/impersonate_users.rb +1 -0
  57. data/app/controllers/concerns/decidim/locale_switcher.rb +44 -17
  58. data/app/controllers/concerns/decidim/needs_tos_accepted.rb +8 -0
  59. data/app/controllers/concerns/decidim/orderable.rb +36 -0
  60. data/app/controllers/concerns/decidim/participatory_space_context.rb +2 -0
  61. data/app/controllers/concerns/decidim/safe_redirect.rb +24 -0
  62. data/app/controllers/decidim/application_controller.rb +19 -2
  63. data/app/controllers/decidim/devise/confirmations_controller.rb +6 -0
  64. data/app/controllers/decidim/devise/invitations_controller.rb +8 -4
  65. data/app/controllers/decidim/devise/omniauth_registrations_controller.rb +4 -1
  66. data/app/controllers/decidim/errors_controller.rb +3 -0
  67. data/app/controllers/decidim/follows_controller.rb +2 -2
  68. data/app/controllers/decidim/messaging/conversations_controller.rb +2 -2
  69. data/app/controllers/decidim/profiles_controller.rb +4 -1
  70. data/app/controllers/decidim/scopes_controller.rb +16 -4
  71. data/app/events/decidim/amendable/amendment_base_event.rb +4 -0
  72. data/app/forms/decidim/account_form.rb +1 -1
  73. data/app/forms/decidim/amendable/create_form.rb +3 -19
  74. data/app/forms/decidim/amendable/edit_form.rb +22 -0
  75. data/app/forms/decidim/amendable/form.rb +42 -20
  76. data/app/forms/decidim/amendable/promote_form.rb +4 -7
  77. data/app/forms/decidim/amendable/publish_form.rb +21 -0
  78. data/app/forms/decidim/amendable/reject_form.rb +1 -1
  79. data/app/forms/decidim/amendable/review_form.rb +9 -4
  80. data/app/forms/decidim/invite_user_form.rb +1 -0
  81. data/app/forms/decidim/notifications_settings_form.rb +1 -0
  82. data/app/forms/decidim/registration_form.rb +4 -3
  83. data/app/forms/decidim/user_group_form.rb +1 -0
  84. data/app/forms/decidim/user_interests_form.rb +1 -0
  85. data/app/helpers/decidim/amendments_helper.rb +33 -19
  86. data/app/helpers/decidim/cells_helper.rb +2 -0
  87. data/app/helpers/decidim/layout_helper.rb +1 -0
  88. data/app/helpers/decidim/map_helper.rb +1 -1
  89. data/app/helpers/decidim/meta_tags_helper.rb +1 -0
  90. data/app/helpers/decidim/resource_reference_helper.rb +1 -0
  91. data/app/jobs/decidim/event_publisher_job.rb +60 -0
  92. data/app/jobs/decidim/metric_job.rb +1 -0
  93. data/app/models/decidim/action_log.rb +12 -0
  94. data/app/models/decidim/amendment.rb +31 -2
  95. data/app/models/decidim/attachment.rb +2 -0
  96. data/app/models/decidim/authorization.rb +1 -0
  97. data/app/models/decidim/category.rb +1 -0
  98. data/app/models/decidim/component.rb +7 -0
  99. data/app/models/decidim/content_block.rb +1 -0
  100. data/app/models/decidim/follow.rb +3 -0
  101. data/app/models/decidim/identity.rb +1 -0
  102. data/app/models/decidim/impersonation_log.rb +2 -0
  103. data/app/models/decidim/newsletter.rb +1 -0
  104. data/app/models/decidim/participatory_process_user_role.rb +1 -0
  105. data/app/models/decidim/participatory_space_private_user.rb +1 -0
  106. data/app/models/decidim/permission_action.rb +2 -0
  107. data/app/models/decidim/report.rb +1 -0
  108. data/app/models/decidim/scope.rb +1 -0
  109. data/app/models/decidim/searchable_resource.rb +1 -1
  110. data/app/models/decidim/static_page.rb +1 -0
  111. data/app/models/decidim/user.rb +2 -0
  112. data/app/permissions/decidim/permissions.rb +18 -14
  113. data/app/permissions/decidim/user_manager_permissions.rb +9 -2
  114. data/app/presenters/decidim/admin_log/organization_presenter.rb +1 -0
  115. data/app/presenters/decidim/admin_log/participatory_space_private_user_presenter.rb +1 -1
  116. data/app/presenters/decidim/admin_log/user_presenter.rb +1 -1
  117. data/app/presenters/decidim/hashtag_presenter.rb +1 -1
  118. data/app/presenters/decidim/log/base_presenter.rb +1 -0
  119. data/app/presenters/decidim/log/diff_presenter.rb +1 -1
  120. data/app/presenters/decidim/log/value_types/area_presenter.rb +1 -0
  121. data/app/presenters/decidim/log/value_types/area_type_presenter.rb +1 -0
  122. data/app/presenters/decidim/log/value_types/currency_presenter.rb +1 -0
  123. data/app/presenters/decidim/log/value_types/date_presenter.rb +1 -0
  124. data/app/presenters/decidim/log/value_types/locale_presenter.rb +1 -0
  125. data/app/presenters/decidim/log/value_types/percentage_presenter.rb +1 -0
  126. data/app/presenters/decidim/log/value_types/scope_presenter.rb +1 -0
  127. data/app/presenters/decidim/log/value_types/scope_type_presenter.rb +1 -0
  128. data/app/presenters/decidim/metric_charts_presenter.rb +1 -0
  129. data/app/presenters/decidim/metric_object_presenter.rb +4 -0
  130. data/app/queries/decidim/metric_manage.rb +3 -0
  131. data/app/queries/decidim/metric_measure.rb +1 -0
  132. data/app/queries/decidim/metrics/followers_metric_manage.rb +3 -0
  133. data/app/queries/decidim/metrics/participants_metric_manage.rb +4 -0
  134. data/app/queries/decidim/similar_emendations.rb +56 -0
  135. data/app/resolvers/decidim/core/metric_resolver.rb +1 -0
  136. data/app/services/decidim/action_authorizer.rb +1 -0
  137. data/app/services/decidim/action_logger.rb +1 -0
  138. data/app/services/decidim/activity_search.rb +1 -0
  139. data/app/services/decidim/email_notification_generator.rb +4 -0
  140. data/app/services/decidim/notification_generator.rb +2 -0
  141. data/app/services/decidim/notification_generator_for_recipient.rb +0 -1
  142. data/app/services/decidim/resource_search.rb +1 -1
  143. data/app/services/decidim/traceability.rb +1 -0
  144. data/app/uploaders/decidim/application_uploader.rb +1 -0
  145. data/app/uploaders/decidim/attachment_uploader.rb +16 -0
  146. data/app/uploaders/decidim/avatar_uploader.rb +0 -2
  147. data/app/uploaders/decidim/data_portability_uploader.rb +1 -0
  148. data/app/uploaders/decidim/homepage_image_uploader.rb +0 -2
  149. data/app/uploaders/decidim/image_uploader.rb +15 -1
  150. data/app/uploaders/decidim/oauth_application_logo_uploader.rb +0 -1
  151. data/app/uploaders/decidim/official_image_footer_uploader.rb +0 -1
  152. data/app/uploaders/decidim/official_image_header_uploader.rb +0 -1
  153. data/app/uploaders/decidim/open_data_uploader.rb +1 -0
  154. data/app/validators/etiquette_validator.rb +5 -0
  155. data/app/views/decidim/account/delete.html.erb +2 -2
  156. data/app/views/decidim/account/show.html.erb +1 -1
  157. data/app/views/decidim/amendments/_edit_form_fields.html.erb +16 -13
  158. data/app/views/decidim/amendments/_similar_emendation.html.erb +24 -0
  159. data/app/views/decidim/amendments/compare_draft.html.erb +21 -0
  160. data/app/views/decidim/amendments/edit_draft.html.erb +31 -0
  161. data/app/views/decidim/amendments/new.html.erb +5 -17
  162. data/app/views/decidim/amendments/preview_draft.html.erb +32 -0
  163. data/app/views/decidim/amendments/review.html.erb +5 -3
  164. data/app/views/decidim/application/_document.html.erb +1 -1
  165. data/app/views/decidim/application/_photos.html.erb +1 -1
  166. data/app/views/decidim/data_portability/show.html.erb +1 -1
  167. data/app/views/decidim/devise/invitations/edit.html.erb +2 -2
  168. data/app/views/decidim/devise/sessions/new.html.erb +1 -1
  169. data/app/views/decidim/doorkeeper/authorizations/new.html.erb +3 -3
  170. data/app/views/decidim/export_mailer/data_portability_export.html.erb +1 -1
  171. data/app/views/decidim/searches/index.js.erb +6 -0
  172. data/app/views/decidim/shared/_address_details.html.erb +2 -2
  173. data/app/views/decidim/shared/_embed_modal.html.erb +1 -1
  174. data/app/views/decidim/shared/_share_modal.html.erb +7 -4
  175. data/app/views/layouts/decidim/_application.html.erb +0 -1
  176. data/app/views/layouts/decidim/_head.html.erb +13 -12
  177. data/app/views/layouts/decidim/_logo.html.erb +1 -1
  178. data/app/views/layouts/decidim/_social_media_links.html.erb +5 -5
  179. data/app/views/layouts/decidim/_user_menu.html.erb +1 -1
  180. data/app/views/layouts/decidim/_wrapper.html.erb +2 -2
  181. data/app/views/layouts/decidim/mailer.html.erb +2 -2
  182. data/config/locales/ar.yml +27 -17
  183. data/config/locales/ca.yml +79 -15
  184. data/config/locales/cs.yml +73 -14
  185. data/config/locales/de.yml +62 -12
  186. data/config/locales/en.yml +80 -16
  187. data/config/locales/eo-UY.yml +16 -0
  188. data/config/locales/es-MX.yml +73 -11
  189. data/config/locales/es-PY.yml +73 -11
  190. data/config/locales/es.yml +79 -15
  191. data/config/locales/eu.yml +6 -13
  192. data/config/locales/fi-plain.yml +75 -11
  193. data/config/locales/fi.yml +80 -16
  194. data/config/locales/fr.yml +70 -16
  195. data/config/locales/gl.yml +6 -13
  196. data/config/locales/hu.yml +80 -17
  197. data/config/locales/id-ID.yml +6 -12
  198. data/config/locales/it.yml +56 -14
  199. data/config/locales/nl.yml +76 -12
  200. data/config/locales/no.yml +11 -2
  201. data/config/locales/pl.yml +6 -15
  202. data/config/locales/pt-BR.yml +6 -13
  203. data/config/locales/pt.yml +6 -13
  204. data/config/locales/ru.yml +7 -2
  205. data/config/locales/sv.yml +34 -18
  206. data/config/locales/tr-TR.yml +15 -12
  207. data/config/locales/uk.yml +7 -2
  208. data/config/routes.rb +7 -0
  209. data/db/migrate/20180226140756_add_version_to_action_logs.rb +1 -0
  210. data/db/migrate/20180305132906_rename_features_to_components.rb +1 -0
  211. data/db/migrate/20190412131728_fix_user_names.rb +1 -1
  212. data/db/migrate/20190610093742_add_force_users_to_authenticate_before_access_organization.rb +10 -0
  213. data/db/migrate/20190618075906_add_confidential_to_doorkeeper_application.rb +13 -0
  214. data/db/migrate/{20190925091507_add_uniq_index_to_decidim_metrics.rb → 20190829092826_add_uniq_index_to_decidim_metrics.rb} +0 -0
  215. data/lib/decidim/amendable.rb +87 -13
  216. data/lib/decidim/attributes/localized_date.rb +5 -0
  217. data/lib/decidim/attributes/time_with_zone.rb +5 -0
  218. data/lib/decidim/authorable.rb +3 -0
  219. data/lib/decidim/authorization_form_builder.rb +2 -2
  220. data/lib/decidim/component_manifest.rb +2 -0
  221. data/lib/decidim/content_parsers.rb +2 -0
  222. data/lib/decidim/content_parsers/hashtag_parser.rb +1 -1
  223. data/lib/decidim/content_parsers/link_parser.rb +10 -0
  224. data/lib/decidim/content_parsers/newline_parser.rb +20 -0
  225. data/lib/decidim/content_parsers/user_parser.rb +1 -1
  226. data/lib/decidim/content_processor.rb +2 -0
  227. data/lib/decidim/content_renderers.rb +1 -0
  228. data/lib/decidim/content_renderers/hashtag_renderer.rb +1 -1
  229. data/lib/decidim/content_renderers/link_renderer.rb +24 -0
  230. data/lib/decidim/content_renderers/user_renderer.rb +2 -2
  231. data/lib/decidim/core.rb +11 -0
  232. data/lib/decidim/core/engine.rb +2 -28
  233. data/lib/decidim/core/test.rb +4 -1
  234. data/lib/decidim/core/test/factories.rb +35 -8
  235. data/lib/decidim/core/test/shared_examples/amendable/create_amendment_draft_examples.rb +50 -0
  236. data/lib/decidim/core/test/shared_examples/amendable/destroy_amendment_draft_examples.rb +39 -0
  237. data/lib/decidim/core/test/shared_examples/amendable/promote_amendment_examples.rb +27 -3
  238. data/lib/decidim/core/test/shared_examples/amendable/{create_amendment_examples.rb → publish_amendment_draft_examples.rb} +26 -17
  239. data/lib/decidim/core/test/shared_examples/amendable/update_amendment_draft_examples.rb +42 -0
  240. data/lib/decidim/core/test/shared_examples/amendable/withdraw_amendment_examples.rb +19 -11
  241. data/lib/decidim/core/test/shared_examples/has_attachment_collections.rb +1 -1
  242. data/lib/decidim/core/test/shared_examples/has_attachments.rb +1 -1
  243. data/lib/decidim/core/test/shared_examples/simple_event.rb +4 -0
  244. data/lib/decidim/core/version.rb +1 -1
  245. data/lib/decidim/data_portability_file_zipper.rb +3 -0
  246. data/lib/decidim/events/author_event.rb +1 -0
  247. data/lib/decidim/events/base_event.rb +12 -22
  248. data/lib/decidim/events/coauthor_event.rb +1 -0
  249. data/lib/decidim/events/simple_event.rb +3 -0
  250. data/lib/decidim/exporters/csv.rb +1 -0
  251. data/lib/decidim/fingerprintable.rb +1 -0
  252. data/lib/decidim/followable.rb +8 -0
  253. data/lib/decidim/form_builder.rb +24 -3
  254. data/lib/decidim/gamification.rb +4 -0
  255. data/lib/decidim/gamification/badge_status.rb +1 -0
  256. data/lib/decidim/has_category.rb +2 -0
  257. data/lib/decidim/has_component.rb +2 -7
  258. data/lib/decidim/has_private_users.rb +8 -1
  259. data/lib/decidim/has_settings.rb +12 -8
  260. data/lib/decidim/hashtaggable.rb +4 -0
  261. data/lib/decidim/metric_operation_manifest.rb +1 -0
  262. data/lib/decidim/nicknamizable.rb +1 -0
  263. data/lib/decidim/participable.rb +1 -0
  264. data/lib/decidim/participatory_space_resourceable.rb +1 -0
  265. data/lib/decidim/randomable.rb +20 -0
  266. data/lib/decidim/search_resource_fields_mapper.rb +2 -0
  267. data/lib/decidim/searchable.rb +2 -0
  268. data/lib/decidim/settings_manifest.rb +10 -1
  269. data/lib/decidim/stats_registry.rb +1 -0
  270. data/lib/decidim/view_model.rb +1 -1
  271. data/lib/tasks/decidim_data_portability_tasks.rake +1 -0
  272. data/lib/tasks/decidim_metrics_tasks.rake +2 -0
  273. data/vendor/assets/javascripts/datepicker-locales/foundation-datepicker.no.js +12 -12
  274. metadata +140 -82
  275. data/app/commands/decidim/amendable/create.rb +0 -80
@@ -1,7 +1,7 @@
1
1
  <% if geolocalizable.respond_to? :location %>
2
- <strong><%= translated_attribute geolocalizable.location %></strong><br />
2
+ <strong><%= translated_attribute geolocalizable.location %></strong><br>
3
3
  <% end %>
4
- <span><%= geolocalizable.address %></span><br />
4
+ <span><%= geolocalizable.address %></span><br>
5
5
  <% if geolocalizable.respond_to? :location_hints %>
6
6
  <span><%= translated_attribute geolocalizable.location_hints %></span>
7
7
  <% end %>
@@ -13,7 +13,7 @@
13
13
  </div>
14
14
  <p class="embed__code">
15
15
  <%= js_embed_code %>
16
- <br />
16
+ <br>
17
17
  <%= embed_code %>
18
18
  </p>
19
19
  </div>
@@ -1,10 +1,10 @@
1
1
  <div class="text-center">
2
- <button class="share-link link text-center" data-open="processShare">
2
+ <button class="share-link link text-center" data-open="socialShare">
3
3
  <%= t(".share") %>
4
4
  <%= icon "share", class: "icon--after" %>
5
5
  </button>
6
6
  </div>
7
- <div class="reveal" id="processShare" data-reveal>
7
+ <div class="reveal" id="socialShare" data-reveal>
8
8
  <div class="reveal__header">
9
9
  <h3 class="reveal__title"><%= t(".share") %>:</h3>
10
10
  <button class="close-button" data-close aria-label="<%= t(".close_window") %>" type="button">
@@ -17,7 +17,7 @@
17
17
  image: decidim_meta_image_url,
18
18
  desc: h(decidim_meta_description),
19
19
  via: decidim_meta_twitter_handler) %>
20
- <a class="button secondary" data-open="urlShare">
20
+ <a class="button" data-open="urlShare">
21
21
  <%= icon "link-intact" %>
22
22
  </a>
23
23
  </div>
@@ -29,5 +29,8 @@
29
29
  <span aria-hidden="true">&times;</span>
30
30
  </button>
31
31
  </div>
32
- <input type="text" value="<%= "#{decidim_meta_url}" %>" readonly />
32
+ <input type="text" value="<%= "#{decidim_meta_url}" %>" readonly>
33
33
  </div>
34
+
35
+ <%= javascript_include_tag "decidim/social_share" %>
36
+ <%= stylesheet_link_tag "decidim/extras/_social_share" %>
@@ -28,6 +28,5 @@
28
28
 
29
29
  <%= render partial: "decidim/shared/login_modal" %>
30
30
  <%= render partial: "decidim/shared/authorization_modal" %>
31
- <%= organization_colors %>
32
31
  </body>
33
32
  </html>
@@ -1,24 +1,25 @@
1
1
  <%= csrf_meta_tags %>
2
2
 
3
- <meta name="viewport" content="width=device-width, initial-scale=1.0" />
3
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
4
4
  <% available_locales.each do |locale| %>
5
- <link rel="alternate" href="<%= url_for(request.parameters.merge(locale: locale)) %>" hreflang="<%= locale %>" />
5
+ <link rel="alternate" href="<%= url_for(request.parameters.merge(locale: locale)) %>" hreflang="<%= locale %>">
6
6
  <% end %>
7
7
 
8
- <meta name="twitter:card" content="summary_large_image" />
9
- <meta name="twitter:site" content="@<%= decidim_meta_twitter_handler %>" />
10
- <meta name="twitter:title" content="<%= decidim_page_title %>" />
11
- <meta name="twitter:description" content="<%= decidim_meta_description %>" />
12
- <meta name="twitter:image" content="<%= decidim_meta_image_url %>" />
8
+ <meta name="twitter:card" content="summary_large_image">
9
+ <meta name="twitter:site" content="@<%= decidim_meta_twitter_handler %>">
10
+ <meta name="twitter:title" content="<%= decidim_page_title %>">
11
+ <meta name="twitter:description" content="<%= decidim_meta_description %>">
12
+ <meta name="twitter:image" content="<%= decidim_meta_image_url %>">
13
13
 
14
- <meta property="og:url" content="<%= decidim_meta_url %>" />
15
- <meta property="og:type" content="article" />
16
- <meta property="og:title" content="<%= decidim_page_title %>" />
17
- <meta property="og:description" content="<%= decidim_meta_description %>" />
18
- <meta property="og:image" content="<%= decidim_meta_image_url %>" />
14
+ <meta property="og:url" content="<%= decidim_meta_url %>">
15
+ <meta property="og:type" content="article">
16
+ <meta property="og:title" content="<%= decidim_page_title %>">
17
+ <meta property="og:description" content="<%= decidim_meta_description %>">
18
+ <meta property="og:image" content="<%= decidim_meta_image_url %>">
19
19
 
20
20
  <%= favicon %>
21
21
  <%= stylesheet_link_tag "application", media: "all" %>
22
+ <%= organization_colors %>
22
23
  <%= javascript_include_tag "application" %>
23
24
  <%= foundation_datepicker_locale_tag %>
24
25
 
@@ -1,7 +1,7 @@
1
1
  <% if organization %>
2
2
  <%= link_to decidim.root_url(host: organization.host) do %>
3
3
  <% if organization.logo.present? %>
4
- <%= image_tag organization.logo.medium.url %>
4
+ <%= image_tag organization.logo.medium.url, alt: organization.name %>
5
5
  <% else %>
6
6
  <span><%= organization.name %></span>
7
7
  <style>
@@ -2,35 +2,35 @@
2
2
  <ul class="footer-social">
3
3
  <% if current_organization.twitter_handler.present? %>
4
4
  <li>
5
- <a class="footer-social__icon" target="_blank" title="Twitter" href="https://twitter.com/<%= current_organization.twitter_handler %>">
5
+ <a class="footer-social__icon" target="_blank" rel="noopener" title="Twitter" href="https://twitter.com/<%= current_organization.twitter_handler %>">
6
6
  <%= icon "twitter", role: "img", aria_label: "Twitter" %>
7
7
  </a>
8
8
  </li>
9
9
  <% end %>
10
10
  <% if current_organization.facebook_handler.present? %>
11
11
  <li>
12
- <a class="footer-social__icon" target="_blank" title="Facebook" href="https://www.facebook.com/<%= current_organization.facebook_handler %>">
12
+ <a class="footer-social__icon" target="_blank" rel="noopener" title="Facebook" href="https://www.facebook.com/<%= current_organization.facebook_handler %>">
13
13
  <%= icon "facebook", role: "img", aria_label: "Facebook" %>
14
14
  </a>
15
15
  </li>
16
16
  <% end %>
17
17
  <% if current_organization.instagram_handler.present? %>
18
18
  <li>
19
- <a class="footer-social__icon" target="_blank" title="Instagram" href="https://www.instagram.com/<%= current_organization.instagram_handler %>">
19
+ <a class="footer-social__icon" target="_blank" rel="noopener" title="Instagram" href="https://www.instagram.com/<%= current_organization.instagram_handler %>">
20
20
  <%= icon "instagram", role: "img", aria_label: "Instagram" %>
21
21
  </a>
22
22
  </li>
23
23
  <% end %>
24
24
  <% if current_organization.youtube_handler.present? %>
25
25
  <li>
26
- <a class="footer-social__icon" target="_blank" title="YouTube" href="https://www.youtube.com/<%= current_organization.youtube_handler %>">
26
+ <a class="footer-social__icon" target="_blank" rel="noopener" title="YouTube" href="https://www.youtube.com/<%= current_organization.youtube_handler %>">
27
27
  <%= icon "youtube", role: "img", aria_label: "YouTube" %>
28
28
  </a>
29
29
  </li>
30
30
  <% end %>
31
31
  <% if current_organization.github_handler.present? %>
32
32
  <li>
33
- <a class="footer-social__icon" target="_blank" title="GitHub" href="https://www.github.com/<%= current_organization.github_handler %>">
33
+ <a class="footer-social__icon" target="_blank" rel="noopener" title="GitHub" href="https://www.github.com/<%= current_organization.github_handler %>">
34
34
  <%= icon "github", role: "img", aria_label: "GitHub" %>
35
35
  </a>
36
36
  </li>
@@ -1,5 +1,5 @@
1
1
  <li><%= link_to t(".profile"), decidim.account_path %></li>
2
- <% unless current_user.managed? %>
2
+ <% if current_user.nickname.present? && !current_user.managed? %>
3
3
  <li><%= link_to t(".public_profile"), decidim.profile_path(current_user.nickname) %></li>
4
4
  <% end %>
5
5
  <li><%= link_to t(".notifications"), decidim.notifications_path %></li>
@@ -127,7 +127,7 @@ end
127
127
  <div class="medium-3 large-4 column">
128
128
  <a rel="license" class="cc-badge"
129
129
  href="http://creativecommons.org/licenses/by-sa/4.0/"
130
- target="_blank">
130
+ target="_blank" rel="noopener">
131
131
  <%= image_tag("decidim/cc-badge.png", alt: "Creative Commons License" ) %>
132
132
  </a>
133
133
  <%= t("layouts.decidim.footer.made_with_open_source").html_safe %>
@@ -136,7 +136,7 @@ end
136
136
  <div class="decidim-logo">
137
137
  <a rel="decidim"
138
138
  href="https://decidim.org/"
139
- target="_blank">
139
+ target="_blank" rel="noopener">
140
140
  <%= image_tag("decidim/decidim-logo.svg", alt: "Decidim Logo" ) %>
141
141
  </a>
142
142
  </div>
@@ -1,8 +1,8 @@
1
1
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2
2
  <html xmlns="http://www.w3.org/1999/xhtml">
3
3
  <head>
4
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
5
- <meta name="viewport" content="width=device-width" />
4
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
5
+ <meta name="viewport" content="width=device-width">
6
6
  <%= stylesheet_link_tag "decidim/email" %>
7
7
  </head>
8
8
 
@@ -3,6 +3,13 @@ ar:
3
3
  attributes:
4
4
  account:
5
5
  delete_reason: سبب حذف حسابك
6
+ group:
7
+ about: عن
8
+ document_number: رقم المستند
9
+ email: البريد الإلكتروني
10
+ name: الإسم
11
+ nickname: الاسم المستعار
12
+ phone: الهاتف
6
13
  report:
7
14
  details: تعليقات إضافية
8
15
  user:
@@ -151,9 +158,8 @@ ar:
151
158
  help_text: تحسين هذا %{model_name} عن طريق تعديل %{amendable_fields}الخاص به
152
159
  promote_confirm_text: هل أنت متأكد من رغبتك في الترويج لهذا الإصدار؟
153
160
  section_heading: التعديلات (%{count})
154
- created:
155
- error: حدث خطأ أثناء إنشاء التعديل
156
- success: تم إنشاء التعديل بنجاح
161
+ compare_draft:
162
+ continue: متابعة
157
163
  emendation:
158
164
  actions:
159
165
  button_accept: قبول
@@ -172,10 +178,8 @@ ar:
172
178
  من قبل المؤلف.
173
179
  new:
174
180
  amendment_author: مؤلف التعديل
175
- back: الى الخلف
176
- heading: إنشاء التعديل الخاص بك
177
- help_text: أنت تعدل %{model_name}
178
- send: إرسال التعديل
181
+ preview_draft:
182
+ publish: انشر
179
183
  promoted:
180
184
  error: كانت هناك مشكلة في نشر التعديل كاقتراح جديد
181
185
  success: تم نشر التعديل بنجاح كمقترح جديد
@@ -187,6 +191,12 @@ ar:
187
191
  heading: مراجعة التعديل
188
192
  help_text: أنت تراجع التعديل على %{model_name}
189
193
  send: قبول التعديل
194
+ wizard_step_form:
195
+ steps:
196
+ '1': إنشاء التعديل الخاص بك
197
+ '2': Compare your amendment
198
+ '3': Complete your amendment
199
+ '4': Publish your amendment
190
200
  anonymous_user: مجهول
191
201
  application:
192
202
  collection:
@@ -299,6 +309,7 @@ ar:
299
309
  name: البطل الفرعي راية
300
310
  core:
301
311
  actions:
312
+ login_before_access: من فضلك ، لِج بحسابك قبل الوصول
302
313
  unauthorized: غير مصرح لك بتنفيذ هذا الإجراء
303
314
  data_portability:
304
315
  export:
@@ -315,7 +326,6 @@ ar:
315
326
  email_already_exists: يستخدم حساب آخر عنوان البريد الإلكتروني نفسه
316
327
  new:
317
328
  complete_profile: الملف الشخصي الكامل
318
- nickname_help: الاسم المستعار الخاص بك (@ كنية) في %{organization}
319
329
  sign_up: يرجى استكمال ملف التعريف الخاص بك
320
330
  subtitle: يرجى ملء النموذج التالي من أجل استكمال التسجيل
321
331
  username_help: الاسم العام الذي يظهر في مشاركاتك. بهدف ضمان عدم الكشف عن هويته ، يمكن أن يكون أي اسم.
@@ -324,7 +334,6 @@ ar:
324
334
  already_have_an_account?: هل لديك حساب؟
325
335
  newsletter: تلقي رسالة إخبارية من حين لآخر مع المعلومات ذات الصلة
326
336
  newsletter_title: الاتصال إذن
327
- nickname_help: الاسم المستعار الخاص بك (@ كنية) في %{organization}
328
337
  sign_in: تسجيل الدخول
329
338
  sign_up: سجل
330
339
  sign_up_as:
@@ -1012,6 +1021,12 @@ ar:
1012
1021
  welcome_notification:
1013
1022
  default_body: <p>مرحبا {{name}}، شكرا لانضمامك {{organization}} ومرحبا بكم!</p><ul><li>إذا كنت ترغب في الحصول على فكرة سريعة عما يمكنك القيام به هنا ، ألق نظرة على قسم <a href="{{help_url}}">Help</a> .</li><li>بمجرد قراءتها ، ستحصل على أول شارة. فيما يلي قائمة تضم <a href="{{badges_url}}">الشارات</a> التي يمكنك الحصول عليها وأنت تشارك في {{organization}}</li><li>أخيرًا وليس آخرًا ، انضم إلى أشخاص آخرين ، وشارك معهم تجربة المشاركة والمشاركة في {{organization}}. قم بتقديم مقترحات وتعليقات ومناقشات وفكر في كيفية المساهمة في الصالح العام وتقديم حجج للإقناع والاستماع والقراءة حتى تقتنع ، والتعبير عن أفكارك بطريقة ملموسة ومباشرة ، والاستجابة بصبر وقرار ، والدفاع عن أفكارك والحفاظ عليها بعقل متفتح للتعاون والانضمام إلى أفكار الآخرين.</li></ul>
1014
1023
  default_subject: شكرا لانضمامك {{organization}}!
1024
+ wizard_step_form:
1025
+ wizard_aside:
1026
+ back: العودة
1027
+ wizard_header:
1028
+ see_steps: عرض الخطوات
1029
+ step_of: الخطوة %{current_step} مِن %{total_steps}
1015
1030
  devise:
1016
1031
  confirmations:
1017
1032
  confirmed: تم تأكيد عنوان بريدك الإلكتروني بنجاح.
@@ -1171,15 +1186,7 @@ ar:
1171
1186
  long_words: يحتوي على كلمات طويلة جدًا (أكثر من 35 حرفًا)
1172
1187
  must_start_with_caps: يجب أن تبدأ بحرف كبير
1173
1188
  nesting_too_deep: لا يمكن أن يكون داخل فئة فرعية
1174
- not_found: غير معثور عليه
1175
1189
  not_locked: لم يكن مغلقا
1176
- not_saved:
1177
- zero: "%{count} أخطاء تمنع حفظ هذا %{resource}:"
1178
- one: '1 خطأ يحظر حفظ هذا %{resource}:'
1179
- two: "%{count} أخطاء تمنع حفظ هذا %{resource}:"
1180
- few: "%{count} أخطاء تمنع حفظ هذا %{resource}:"
1181
- many: "%{count} أخطاء تمنع حفظ هذا %{resource}:"
1182
- other: "%{count} أخطاء تمنع حفظ هذا %{resource}:"
1183
1190
  too_many_marks: يستخدم الكثير من علامات الترقيم المتتالية (مثل! و؟)
1184
1191
  too_much_caps: يستخدم عددًا كبيرًا جدًا من الأحرف الكبيرة (أكثر من 25٪ من النص)
1185
1192
  too_short: قصير جدًا (أقل من 15 حرفًا)
@@ -1253,12 +1260,15 @@ ar:
1253
1260
  qq: Qzone
1254
1261
  reddit: رديت
1255
1262
  share_to: شارك في %{name}
1263
+ telegram: تلغرام
1256
1264
  tumblr: نعرفكم
1257
1265
  twitter: تويتر
1258
1266
  vkontakte: فكونتاكتي
1259
1267
  wechat: WeChat
1260
1268
  wechat_footer: افتح WeChat الخاص بك ، وانقر فوق الزر "اكتشاف" ، ثم انقر فوق "مسح رمز الاستجابة السريعة" القائمة.
1261
1269
  weibo: سينا ويبو
1270
+ whatsapp_app: واتساب
1271
+ whatsapp_web: واتساب
1262
1272
  xing: شينغ
1263
1273
  time:
1264
1274
  formats:
@@ -3,6 +3,14 @@ ca:
3
3
  attributes:
4
4
  account:
5
5
  delete_reason: Raó per eliminar el teu compte
6
+ group:
7
+ about: Quant a
8
+ avatar: Avatar
9
+ document_number: Número de document
10
+ email: Correu electrònic
11
+ name: Nom
12
+ nickname: Àlies
13
+ phone: Telèfon
6
14
  report:
7
15
  details: Comentaris addicionals
8
16
  user:
@@ -108,6 +116,7 @@ ca:
108
116
  update: "%{user_name} ha actualitzat la configuració de l'organització"
109
117
  participatory_space_private_user:
110
118
  create: "%{user_name} ha convidat %{resource_name} com a participant privada"
119
+ create_via_csv: "%{user_name} ha convidat %{resource_name} via csv per a ser un participant privat"
111
120
  delete: "%{user_name} ha eliminat %{resource_name} com a participant privada"
112
121
  scope:
113
122
  create: "%{user_name} ha creat l'àmbit %{resource_name}"
@@ -142,9 +151,21 @@ ca:
142
151
  promote_confirm_text: Segur que vols promoure aquesta esmena?
143
152
  promote_help_text: Podeu publicar aquesta esmena com a proposta independent %{model_name}
144
153
  section_heading: Esmenes (%{count})
154
+ compare_draft:
155
+ continue: Continua
156
+ no_similars_found: No s’han trobat esmenes semblants.
157
+ title: Esmenes similars
145
158
  created:
146
- error: S'ha produït un error durant la creació de l’esmena
147
- success: L'esmena s'ha creat correctament
159
+ error: S'ha produït un error durant la creació de l’esmena.
160
+ success: L'esborrany d’esmena ha estat creat amb èxit.
161
+ destroy_draft:
162
+ error: S'ha produït un error en suprimir l'esborrany de l'esmena.
163
+ success: L'esborrany d'esmena s'ha eliminat correctament.
164
+ edit_draft:
165
+ discard: Descarta aquest esborrany
166
+ discard_confirmation: Estàs segur de que vols descartar l'esborrany d'aquesta esmena?
167
+ send: Vista prèvia
168
+ title: Edita l'esborrany d'esmena
148
169
  emendation:
149
170
  actions:
150
171
  button_accept: Acceptar
@@ -152,21 +173,27 @@ ca:
152
173
  help_text: Revisa els canvis i accepta o rebutja aquesta esmena. S'enviarà una notificació a la seva autora(es).
153
174
  announcement:
154
175
  accepted: |-
155
- Aquesta esmena per al %{amendable_type} %{amendable_link} ha estat acceptada a <strong>%{announcement_date}</strong>.
176
+ Aquesta esmena per la %{amendable_type} %{proposal_link} ha estat acceptada el <strong>%{date}</strong>.
156
177
  evaluating: |-
157
- Aquesta esmena per a %{amendable_type} %{amendable_link} está essent avaluada.
158
- rejected: Aquesta esmena de la %{amendable_type} %{amendable_link} ha estat rebutjada el <strong>%{announcement_date}</strong>.
178
+ L' esmena per a %{amendable_type} %{proposal_link} está essent avaluada.
179
+ promoted: Promocionar a %{amendable_type}.
180
+ rejected: L' esmena de la %{amendable_type} %{proposal_link} ha estat rebutjada el <strong>%{date}</strong>.
159
181
  withdrawn: |-
160
- Aquesta esmena de la %{amendable_type} %{amendable_link} ha estat retirada per l'autora.
182
+ L' esmena de la %{amendable_type} %{proposal_link} ha estat retirada per l'autora.
161
183
  new:
162
184
  amendment_author: Autora de l'esmena
163
- back: Torna
164
- heading: Crea la teva esmena
165
- help_text: Estàs modificant el %{model_name}
166
- send: Enviar esmena
185
+ send: Crear
186
+ title: Crear esborrany d'esmena
187
+ preview_draft:
188
+ modify: Modificar
189
+ publish: Publicar
190
+ title: Publicar l'esborrany d'esmena
167
191
  promoted:
168
192
  error: S'ha produït un error en publicar l'esmena com una nova proposta
169
193
  success: L'esmena s'ha publicat com una nova proposta correctament
194
+ publish_draft:
195
+ error: S'ha produït un error en publicar aquesta esmena.
196
+ success: Esmena publicada correctament.
170
197
  rejected:
171
198
  error: S'ha produït un error en rebutjar aquesta esmena, si us plau torna-ho a provar més tard
172
199
  success: L'esmena s'ha rebutjat correctament
@@ -175,6 +202,21 @@ ca:
175
202
  heading: Revisa l'esmena
176
203
  help_text: Esteu revisant una esmena al %{model_name}
177
204
  send: Accepta l'esmena
205
+ update_draft:
206
+ error: S'ha produït un error en actualitzar l'esborrany de l'esmena.
207
+ success: Esborrany d'esmena actualitzat correctament.
208
+ visibility_options:
209
+ all: Les esmenes són visibles per a tothom
210
+ participants: Les esmenes són visibles únicament per als seus autors
211
+ withdraw:
212
+ error: S'ha produït un error en retirar l'esmena
213
+ success: L'esmena s'ha retirat correctament
214
+ wizard_step_form:
215
+ steps:
216
+ '1': Crea la teva esmena
217
+ '2': Compara la teva esmena
218
+ '3': Completa la teva esmena
219
+ '4': Publica la teva esmena
178
220
  anonymous_user: Anònim
179
221
  application:
180
222
  collection:
@@ -265,12 +307,18 @@ ca:
265
307
  comments_enabled: Comentaris habilitats
266
308
  dummy_global_attribute_1: Atribut de prova 1
267
309
  dummy_global_attribute_2: Atribut de prova 2
310
+ dummy_global_translatable_text: Text traduïble de proves
268
311
  enable_pads_creation: Habilitar la creació de pads
269
312
  resources_permissions_enabled: Permisos de recursos habilitats
270
313
  step:
314
+ amendment_creation_enabled: Creació d'esmenes habilitada
315
+ amendment_promotion_enabled: Promoció d'esmenes habilitada
316
+ amendment_reaction_enabled: Reacció a esmenes habilitada
317
+ amendments_visibility: Visibilitat de les esmenes
271
318
  comments_blocked: Comentaris bloquejats
272
319
  dummy_step_attribute_1: Atribut de fase de prova 1
273
320
  dummy_step_attribute_2: Atribut de fase de prova 2
321
+ dummy_step_translatable_text: Text de fase traduïble de proves
274
322
  contact: Contacte
275
323
  content_blocks:
276
324
  footer_sub_hero:
@@ -296,6 +344,7 @@ ca:
296
344
  name: Banner de sub-heros
297
345
  core:
298
346
  actions:
347
+ login_before_access: Si us plau, identifica't amb el teu compte abans d'accedir
299
348
  unauthorized: No tens permís per realitzar aquesta acció
300
349
  data_portability:
301
350
  export:
@@ -312,7 +361,7 @@ ca:
312
361
  email_already_exists: Un altre compte està utilitzant la mateixa adreça de correu electrònic
313
362
  new:
314
363
  complete_profile: Completa el perfil
315
- nickname_help: El teu àlies (@sobrenom) a %{organization}
364
+ nickname_help: El teu àlies a %{organization}
316
365
  sign_up: Si us plau, completa el teu perfil
317
366
  subtitle: Si us plau, omple el següent formulari per tal de completar la teva inscripció
318
367
  username_help: Nom públic que apareix als teus missatges. Amb l'objectiu de garantir l'anonimat, pot ser qualsevol nom.
@@ -321,7 +370,7 @@ ca:
321
370
  already_have_an_account?: Ja tens un compte?
322
371
  newsletter: Vull rebre un butlletí ocasional amb informació rellevant
323
372
  newsletter_title: Permís de contacte
324
- nickname_help: El teu àlies (@sobrenom) a %{organization}
373
+ nickname_help: El teu àlies a %{organization}
325
374
  password_help: "%{minimun_characters} caràcters mínim, no ha de ser massa comú (per exemple 123456) i ha de ser diferent del teu nom d'usuari i la teva adreça de correu electrònic."
326
375
  sign_in: Entra
327
376
  sign_up: Registra't
@@ -535,6 +584,9 @@ ca:
535
584
  current_image: Imatge actual
536
585
  default_image: Imatge predeterminada
537
586
  errors:
587
+ decidim/user:
588
+ password: La contrasenya és massa curta.
589
+ password_confirmation: La confirmació de la contrasenya no coincideix amb la contrasenya.
538
590
  error: Hi ha un error en aquest camp.
539
591
  remove_this_file: Eliminar aquest arxiu
540
592
  gamification:
@@ -1002,6 +1054,12 @@ ca:
1002
1054
  welcome_notification:
1003
1055
  default_body: <p>Hola {{name}}, gràcies per unir-te a {{organization}} i benvinguda!</p><ul><li>Si vols fer-te una idea ràpida del que pots fer aquí, fes un cop d'ull a la secció d'<a href="{{help_url}}">Ajuda</a>.</li><li>Un cop l'hagis llegit obtindràs la teva primera insígnia. Aquí tens la <a href="{{badges_url}}">llista</a> de totes les que pots anar aconseguint a mesura que participis a {{organization}}</li><li>Finalment, però no per això menys important, uneix-te a altres persones, comparteix amb elles l'experiència d'implicar-se i participar a {{organization}}. Fes propostes, comenta, debat, pensa en com contribuir al bé comú, aporta arguments per convèncer, escolta i llegeix per convèncer-te, expressa les teves idees de manera concreta i directa, respon amb paciència i decisió, defensa les teves idees i manté la ment oberta a col·laborar i sumar-te a les idees d'altres persones.</li></ul>
1004
1056
  default_subject: Gràcies per unir-te a {{organization}}!
1057
+ wizard_step_form:
1058
+ wizard_aside:
1059
+ back: Enrere
1060
+ wizard_header:
1061
+ see_steps: veure els passos
1062
+ step_of: Pas %{current_step} de %{total_steps}
1005
1063
  devise:
1006
1064
  confirmations:
1007
1065
  confirmed: La teva adreça de correu electrònic s'ha confirmat correctament.
@@ -1157,11 +1215,11 @@ ca:
1157
1215
  long_words: conté paraules massa llargues (més de 35 caràcters)
1158
1216
  must_start_with_caps: ha de començar amb una lletra majúscula
1159
1217
  nesting_too_deep: no pot estar dins d'una subcategoria
1160
- not_found: No trobat
1218
+ not_found: No es pot trobar. Us heu inscrit prèviament?
1161
1219
  not_locked: No estava bloquejat
1162
1220
  not_saved:
1163
- one: 'Un error ha impedit que es guardés aquest %{resource}:'
1164
- other: "%{count} errors han impedit que es guardés aquest %{resource}:"
1221
+ one: 'S''ha produït un error en processar la teva sol·licitud:'
1222
+ other: 'S''han produït múltiples errors en processar la vostra sol·licitud:'
1165
1223
  too_many_marks: Estàs fent servir massa signes de puntuació consecutius (p. ex. i?)
1166
1224
  too_much_caps: Estàs utilitzant massa lletres majúscules (més del 25% del text)
1167
1225
  too_short: És massa curt (menys de 15 caràcters)
@@ -1235,12 +1293,15 @@ ca:
1235
1293
  qq: Qzone
1236
1294
  reddit: Reddit
1237
1295
  share_to: Compartir a %{name}
1296
+ telegram: Telegram
1238
1297
  tumblr: Tumblr
1239
1298
  twitter: Twitter
1240
1299
  vkontakte: Vkontakte
1241
1300
  wechat: WeChat
1242
1301
  wechat_footer: Obre WeChat, fes clic al botó "Discover" i després fes clic al menú "Escanejar codi QR".
1243
1302
  weibo: Sina Weibo
1303
+ whatsapp_app: WhatsApp
1304
+ whatsapp_web: WhatsApp
1244
1305
  xing: Xing
1245
1306
  time:
1246
1307
  formats:
@@ -1250,10 +1311,13 @@ ca:
1250
1311
  day_of_year: "%d/%m/%y"
1251
1312
  decidim_day_of_year: "%d %B %Y"
1252
1313
  decidim_short: "%d/%m/%Y %H:%M"
1314
+ default: "%a, %d %b %Y %H:%M:%S %z"
1253
1315
  devise:
1254
1316
  mailer:
1255
1317
  invitation_instructions:
1256
1318
  accept_until_format: "%B %d, %Y %I:%M %p"
1319
+ long: "%B %d, %Y %H:%M"
1320
+ short: "%d/%m/%Y %H:%M"
1257
1321
  time_of_day: "%H:%M"
1258
1322
  versions:
1259
1323
  directions: