decidim-conferences 0.26.4 → 0.27.0.rc1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (129) hide show
  1. checksums.yaml +4 -4
  2. data/app/cells/decidim/conferences/content_blocks/highlighted_conferences/show.erb +2 -2
  3. data/app/cells/decidim/conferences/content_blocks/highlighted_conferences_cell.rb +4 -5
  4. data/app/commands/decidim/conferences/admin/confirm_conference_registration.rb +3 -3
  5. data/app/commands/decidim/conferences/admin/copy_conference.rb +1 -1
  6. data/app/commands/decidim/conferences/admin/create_conference.rb +1 -1
  7. data/app/commands/decidim/conferences/admin/create_conference_speaker.rb +8 -8
  8. data/app/commands/decidim/conferences/admin/create_media_link.rb +6 -6
  9. data/app/commands/decidim/conferences/admin/create_partner.rb +8 -8
  10. data/app/commands/decidim/conferences/admin/create_registration_type.rb +6 -6
  11. data/app/commands/decidim/conferences/admin/destroy_conference_admin.rb +1 -1
  12. data/app/commands/decidim/conferences/admin/destroy_conference_speaker.rb +1 -1
  13. data/app/commands/decidim/conferences/admin/destroy_media_link.rb +1 -1
  14. data/app/commands/decidim/conferences/admin/destroy_partner.rb +1 -1
  15. data/app/commands/decidim/conferences/admin/destroy_registration_type.rb +1 -1
  16. data/app/commands/decidim/conferences/admin/export_conference_registrations.rb +1 -1
  17. data/app/commands/decidim/conferences/admin/invite_user_to_join_conference.rb +10 -12
  18. data/app/commands/decidim/conferences/admin/notify_role_assigned_to_conference.rb +1 -1
  19. data/app/commands/decidim/conferences/admin/publish_conference.rb +1 -1
  20. data/app/commands/decidim/conferences/admin/publish_registration_type.rb +1 -1
  21. data/app/commands/decidim/conferences/admin/send_conference_diplomas.rb +1 -1
  22. data/app/commands/decidim/conferences/admin/unpublish_conference.rb +1 -1
  23. data/app/commands/decidim/conferences/admin/unpublish_registration_type.rb +1 -1
  24. data/app/commands/decidim/conferences/admin/update_conference.rb +1 -1
  25. data/app/commands/decidim/conferences/admin/update_conference_speaker.rb +8 -8
  26. data/app/commands/decidim/conferences/admin/update_diploma.rb +3 -3
  27. data/app/commands/decidim/conferences/admin/update_media_link.rb +6 -6
  28. data/app/commands/decidim/conferences/admin/update_partner.rb +6 -6
  29. data/app/commands/decidim/conferences/admin/update_registration_type.rb +6 -6
  30. data/app/commands/decidim/conferences/decline_invitation.rb +1 -1
  31. data/app/commands/decidim/conferences/join_conference.rb +1 -8
  32. data/app/commands/decidim/conferences/leave_conference.rb +4 -4
  33. data/app/controllers/decidim/conferences/admin/reminders_controller.rb +14 -0
  34. data/app/controllers/decidim/conferences/conference_program_controller.rb +2 -2
  35. data/app/controllers/decidim/conferences/conference_registrations_controller.rb +0 -17
  36. data/app/events/decidim/conferences/conference_registration_notification_event.rb +1 -1
  37. data/app/events/decidim/conferences/conference_role_assigned_event.rb +1 -1
  38. data/app/forms/decidim/conferences/admin/conference_registration_invite_form.rb +1 -1
  39. data/app/mailers/decidim/conferences/admin/send_conference_diploma_mailer.rb +2 -2
  40. data/app/models/decidim/conference.rb +2 -3
  41. data/app/models/decidim/conferences/conference_invite.rb +2 -2
  42. data/app/models/decidim/conferences/conference_registration.rb +2 -2
  43. data/app/permissions/decidim/conferences/permissions.rb +0 -1
  44. data/app/presenters/decidim/conference_speaker_presenter.rb +3 -5
  45. data/app/presenters/decidim/conferences/conference_stats_presenter.rb +4 -1
  46. data/app/queries/decidim/conferences/admin/admin_users.rb +1 -1
  47. data/app/queries/decidim/conferences/admin/conference_invites.rb +1 -1
  48. data/app/queries/decidim/conferences/admin/conference_speakers.rb +1 -1
  49. data/app/queries/decidim/conferences/conference_program_meetings.rb +2 -2
  50. data/app/queries/decidim/conferences/conference_program_meetings_by_day.rb +3 -3
  51. data/app/queries/decidim/conferences/conferences_with_user_role.rb +1 -1
  52. data/app/queries/decidim/conferences/organization_conferences.rb +1 -1
  53. data/app/queries/decidim/conferences/organization_prioritized_conferences.rb +3 -3
  54. data/app/queries/decidim/conferences/organization_published_conferences.rb +3 -3
  55. data/app/queries/decidim/conferences/prioritized_conferences.rb +1 -1
  56. data/app/queries/decidim/conferences/promoted_conferences.rb +1 -1
  57. data/app/queries/decidim/conferences/published_conferences.rb +1 -1
  58. data/app/queries/decidim/conferences/visible_conferences.rb +1 -1
  59. data/app/serializers/decidim/conferences/{data_portability_conference_invite_serializer.rb → download_your_data_conference_invite_serializer.rb} +2 -2
  60. data/app/serializers/decidim/conferences/{data_portability_conference_registration_serializer.rb → download_your_data_conference_registration_serializer.rb} +2 -2
  61. data/app/views/decidim/conferences/admin/invite_join_conference_mailer/invite.html.erb +3 -3
  62. data/app/views/decidim/conferences/admin/partners/index.html.erb +3 -1
  63. data/app/views/decidim/conferences/conferences/_promoted_conference.html.erb +1 -1
  64. data/app/views/devise/mailer/join_conference.html.erb +2 -2
  65. data/app/views/devise/mailer/join_conference.text.erb +2 -2
  66. data/app/views/layouts/decidim/_conference_hero.html.erb +1 -1
  67. data/app/views/layouts/decidim/_conferences_nav.html.erb +1 -1
  68. data/config/locales/am-ET.yml +1 -0
  69. data/config/locales/ar.yml +2 -1
  70. data/config/locales/bg.yml +1 -0
  71. data/config/locales/ca.yml +5 -7
  72. data/config/locales/cs.yml +11 -13
  73. data/config/locales/da.yml +1 -0
  74. data/config/locales/de.yml +2 -1
  75. data/config/locales/el.yml +2 -1
  76. data/config/locales/en.yml +2 -5
  77. data/config/locales/eo.yml +1 -0
  78. data/config/locales/es-MX.yml +2 -4
  79. data/config/locales/es-PY.yml +2 -4
  80. data/config/locales/es.yml +6 -8
  81. data/config/locales/et.yml +1 -0
  82. data/config/locales/eu.yml +2 -1
  83. data/config/locales/fi-plain.yml +2 -4
  84. data/config/locales/fi.yml +3 -5
  85. data/config/locales/fr-CA.yml +2 -4
  86. data/config/locales/fr.yml +4 -6
  87. data/config/locales/ga-IE.yml +1 -0
  88. data/config/locales/gl.yml +2 -1
  89. data/config/locales/hr.yml +1 -0
  90. data/config/locales/hu.yml +2 -1
  91. data/config/locales/id-ID.yml +2 -1
  92. data/config/locales/is-IS.yml +2 -1
  93. data/config/locales/it.yml +2 -1
  94. data/config/locales/ja.yml +2 -4
  95. data/config/locales/ko.yml +1 -0
  96. data/config/locales/lb.yml +2 -1
  97. data/config/locales/lt.yml +1 -623
  98. data/config/locales/lv.yml +2 -1
  99. data/config/locales/mt.yml +1 -0
  100. data/config/locales/nl.yml +3 -2
  101. data/config/locales/no.yml +2 -1
  102. data/config/locales/om-ET.yml +1 -0
  103. data/config/locales/pl.yml +2 -1
  104. data/config/locales/pt-BR.yml +3 -2
  105. data/config/locales/pt.yml +2 -1
  106. data/config/locales/ro-RO.yml +2 -1
  107. data/config/locales/ru.yml +1 -0
  108. data/config/locales/si-LK.yml +1 -0
  109. data/config/locales/sk.yml +2 -1
  110. data/config/locales/sl.yml +1 -0
  111. data/config/locales/so-SO.yml +1 -0
  112. data/config/locales/sr-CS.yml +1 -0
  113. data/config/locales/sv.yml +2 -1
  114. data/config/locales/sw-KE.yml +1 -0
  115. data/config/locales/ti-ER.yml +1 -0
  116. data/config/locales/tr-TR.yml +2 -1
  117. data/config/locales/uk.yml +1 -0
  118. data/config/locales/val-ES.yml +1 -0
  119. data/config/locales/vi.yml +1 -0
  120. data/config/locales/zh-CN.yml +2 -1
  121. data/config/locales/zh-TW.yml +1 -0
  122. data/lib/decidim/conferences/admin_engine.rb +1 -0
  123. data/lib/decidim/conferences/participatory_space.rb +8 -8
  124. data/lib/decidim/conferences/test/factories.rb +1 -1
  125. data/lib/decidim/conferences/version.rb +1 -1
  126. metadata +17 -19
  127. data/config/locales/gn-PY.yml +0 -1
  128. data/config/locales/lo-LA.yml +0 -1
  129. data/config/locales/oc-FR.yml +0 -1
@@ -6,7 +6,7 @@ module Decidim
6
6
  include Decidim::Events::NotificationEvent
7
7
 
8
8
  def notification_title
9
- I18n.t("notification_title", i18n_options).html_safe
9
+ I18n.t("notification_title", **i18n_options).html_safe
10
10
  end
11
11
 
12
12
  def i18n_options
@@ -7,7 +7,7 @@ module Decidim
7
7
  include Decidim::Events::AuthorEvent
8
8
 
9
9
  def notification_title
10
- I18n.t("notification_title", i18n_options).html_safe
10
+ I18n.t("notification_title", **i18n_options).html_safe
11
11
  end
12
12
 
13
13
  def i18n_role
@@ -14,7 +14,7 @@ module Decidim
14
14
  attribute :existing_user, Boolean, default: false
15
15
 
16
16
  validates :name, presence: true, unless: proc { |object| object.existing_user }
17
- validates :email, presence: true, 'valid_email_2/email': { disposable: true }, unless: proc { |object| object.existing_user }
17
+ validates :email, presence: true, "valid_email_2/email": { disposable: true }, unless: proc { |object| object.existing_user }
18
18
  validates :user, presence: true, if: proc { |object| object.existing_user }
19
19
 
20
20
  def user
@@ -35,8 +35,8 @@ module Decidim
35
35
  def add_diploma_attachment
36
36
  diploma = WickedPdf.new.pdf_from_string(
37
37
  render_to_string(pdf: "conference-diploma",
38
- template: "decidim/conferences/admin/send_conference_diploma_mailer/diploma_user.html.erb",
39
- layout: "decidim/diploma.html.erb"),
38
+ template: "decidim/conferences/admin/send_conference_diploma_mailer/diploma_user",
39
+ layout: "decidim/diploma"),
40
40
  orientation: "Landscape"
41
41
  )
42
42
 
@@ -19,6 +19,7 @@ module Decidim
19
19
  include Decidim::Searchable
20
20
  include Decidim::HasUploadValidations
21
21
  include Decidim::TranslatableResource
22
+ include Decidim::FilterableResource
22
23
 
23
24
  translatable_fields :title, :slogan, :short_description, :description, :objectives, :registration_terms
24
25
 
@@ -140,8 +141,6 @@ module Decidim
140
141
  end
141
142
 
142
143
  # Allow ransacker to search for a key in a hstore column (`title`.`en`)
143
- ransacker :title do |parent|
144
- Arel::Nodes::InfixOperation.new("->>", parent.table[:title], Arel::Nodes.build_quoted(I18n.locale.to_s))
145
- end
144
+ ransacker_i18n :title
146
145
  end
147
146
  end
@@ -6,7 +6,7 @@ module Decidim
6
6
  class ConferenceInvite < ApplicationRecord
7
7
  include Decidim::Traceable
8
8
  include Decidim::Loggable
9
- include Decidim::DataPortability
9
+ include Decidim::DownloadYourData
10
10
 
11
11
  belongs_to :conference, foreign_key: "decidim_conference_id", class_name: "Decidim::Conference"
12
12
  belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User"
@@ -15,7 +15,7 @@ module Decidim
15
15
  validates :user, uniqueness: { scope: :conference }
16
16
 
17
17
  def self.export_serializer
18
- Decidim::Conferences::DataPortabilityConferenceInviteSerializer
18
+ Decidim::Conferences::DownloadYourDataConferenceInviteSerializer
19
19
  end
20
20
 
21
21
  def self.log_presenter_class_for(_log)
@@ -4,7 +4,7 @@ module Decidim
4
4
  module Conferences
5
5
  # The data store for a Registration in the Decidim::Conferences component.
6
6
  class ConferenceRegistration < ApplicationRecord
7
- include Decidim::DataPortability
7
+ include Decidim::DownloadYourData
8
8
 
9
9
  belongs_to :conference, foreign_key: "decidim_conference_id", class_name: "Decidim::Conference"
10
10
  belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User"
@@ -19,7 +19,7 @@ module Decidim
19
19
  end
20
20
 
21
21
  def self.export_serializer
22
- Decidim::Conferences::DataPortabilityConferenceRegistrationSerializer
22
+ Decidim::Conferences::DownloadYourDataConferenceRegistrationSerializer
23
23
  end
24
24
 
25
25
  def confirmed?
@@ -77,7 +77,6 @@ module Decidim
77
77
  end
78
78
 
79
79
  def can_decline_invitation?
80
- return unless user
81
80
  return unless conference.presence
82
81
  return unless conference.registrations_enabled? &&
83
82
  conference.conference_invites.exists?(user: user) &&
@@ -46,11 +46,9 @@ module Decidim
46
46
  private
47
47
 
48
48
  def user
49
- @user ||= begin
50
- if (user = __getobj__.user.presence)
51
- Decidim::UserPresenter.new(user)
52
- end
53
- end
49
+ @user ||= if (user = __getobj__.user.presence)
50
+ Decidim::UserPresenter.new(user)
51
+ end
54
52
  end
55
53
  end
56
54
  end
@@ -4,9 +4,12 @@ module Decidim
4
4
  module Conferences
5
5
  # A presenter to render statistics in the homepage.
6
6
  class ConferenceStatsPresenter < Decidim::StatsPresenter
7
- attribute :conference, Decidim::Conference
8
7
  include IconHelper
9
8
 
9
+ def conference
10
+ __getobj__.fetch(:conference)
11
+ end
12
+
10
13
  # Public: Render a collection of primary stats.
11
14
  def highlighted
12
15
  highlighted_stats = component_stats(priority: StatsRegistry::HIGH_PRIORITY)
@@ -4,7 +4,7 @@ module Decidim
4
4
  module Conferences
5
5
  module Admin
6
6
  # A class used to find the admins for an conference or an organization conferences.
7
- class AdminUsers < Rectify::Query
7
+ class AdminUsers < Decidim::Query
8
8
  # Syntactic sugar to initialize the class and return the queried objects.
9
9
  #
10
10
  # conference - an conference that needs to find its conference admins
@@ -4,7 +4,7 @@ module Decidim
4
4
  module Conferences
5
5
  module Admin
6
6
  # A class used to find the ConferenceInvites by their status status.
7
- class ConferenceInvites < Rectify::Query
7
+ class ConferenceInvites < Decidim::Query
8
8
  # Syntactic sugar to initialize the class and return the queried objects.
9
9
  #
10
10
  # conference_invites - the initial Invites relation that needs to be filtered.
@@ -4,7 +4,7 @@ module Decidim
4
4
  module Conferences
5
5
  module Admin
6
6
  # A class used to find the ConferenceSpeakers's by the search.
7
- class ConferenceSpeakers < Rectify::Query
7
+ class ConferenceSpeakers < Decidim::Query
8
8
  # Syntactic sugar to initialize the class and return the queried objects.
9
9
  #
10
10
  # conference_speakers - the initial ConferenceSpeaker relation that needs to be filtered.
@@ -3,14 +3,14 @@
3
3
  module Decidim
4
4
  module Conferences
5
5
  # This query class filters meetings for component and day
6
- class ConferenceProgramMeetings < Rectify::Query
6
+ class ConferenceProgramMeetings < Decidim::Query
7
7
  def initialize(component, user = nil)
8
8
  @component = component
9
9
  @user = user
10
10
  end
11
11
 
12
12
  def query
13
- Decidim::Meetings::Meeting.where(component: @component).visible_meeting_for(@user)
13
+ Decidim::Meetings::Meeting.where(component: @component).visible_for(@user)
14
14
  end
15
15
  end
16
16
  end
@@ -3,7 +3,7 @@
3
3
  module Decidim
4
4
  module Conferences
5
5
  # This query class filters meetings for component and day
6
- class ConferenceProgramMeetingsByDay < Rectify::Query
6
+ class ConferenceProgramMeetingsByDay < Decidim::Query
7
7
  def initialize(component, day, user = nil)
8
8
  @component = component
9
9
  @day = day
@@ -11,9 +11,9 @@ module Decidim
11
11
  end
12
12
 
13
13
  def query
14
- Rectify::Query.merge(
14
+ Decidim::Query.merge(
15
15
  ConferenceProgramMeetings.new(@component, @user)
16
- ).query.where(start_time: @day.beginning_of_day..@day.end_of_day).order(start_time: :asc)
16
+ ).query.where(start_time: @day.all_day).order(start_time: :asc)
17
17
  end
18
18
  end
19
19
  end
@@ -4,7 +4,7 @@ module Decidim
4
4
  module Conferences
5
5
  # A class used to find the Conferences that the given user has
6
6
  # the specific role privilege.
7
- class ConferencesWithUserRole < Rectify::Query
7
+ class ConferencesWithUserRole < Decidim::Query
8
8
  # Syntactic sugar to initialize the class and return the queried objects.
9
9
  #
10
10
  # user - a User that needs to find which conferences can manage
@@ -3,7 +3,7 @@
3
3
  module Decidim
4
4
  module Conferences
5
5
  # This query class filters all conferences given an organization.
6
- class OrganizationConferences < Rectify::Query
6
+ class OrganizationConferences < Decidim::Query
7
7
  def initialize(organization)
8
8
  @organization = organization
9
9
  end
@@ -4,17 +4,17 @@ module Decidim
4
4
  module Conferences
5
5
  # This query class filters public conferences given an organization in a
6
6
  # meaningful prioritized order.
7
- class OrganizationPrioritizedConferences < Rectify::Query
7
+ class OrganizationPrioritizedConferences < Decidim::Query
8
8
  def initialize(organization, user = nil)
9
9
  @organization = organization
10
10
  @user = user
11
11
  end
12
12
 
13
13
  def query
14
- Rectify::Query.merge(
14
+ Decidim::Query.merge(
15
15
  OrganizationPublishedConferences.new(@organization, @user),
16
16
  PrioritizedConferences.new
17
- ).query
17
+ ).query.with_attached_hero_image
18
18
  end
19
19
  end
20
20
  end
@@ -3,18 +3,18 @@
3
3
  module Decidim
4
4
  module Conferences
5
5
  # This query class filters published conferences given an organization.
6
- class OrganizationPublishedConferences < Rectify::Query
6
+ class OrganizationPublishedConferences < Decidim::Query
7
7
  def initialize(organization, user = nil)
8
8
  @organization = organization
9
9
  @user = user
10
10
  end
11
11
 
12
12
  def query
13
- Rectify::Query.merge(
13
+ Decidim::Query.merge(
14
14
  OrganizationConferences.new(@organization),
15
15
  VisibleConferences.new(@user),
16
16
  PublishedConferences.new
17
- ).query.order(start_date: :desc)
17
+ ).query
18
18
  end
19
19
  end
20
20
  end
@@ -4,7 +4,7 @@ module Decidim
4
4
  module Conferences
5
5
  # This query orders conferences by importance, prioritizing promoted
6
6
  # conferences.
7
- class PrioritizedConferences < Rectify::Query
7
+ class PrioritizedConferences < Decidim::Query
8
8
  def query
9
9
  Decidim::Conference.order(promoted: :desc)
10
10
  end
@@ -3,7 +3,7 @@
3
3
  module Decidim
4
4
  module Conferences
5
5
  # This query filters conferences so only promoted ones are returned.
6
- class PromotedConferences < Rectify::Query
6
+ class PromotedConferences < Decidim::Query
7
7
  def query
8
8
  Decidim::Conference.promoted
9
9
  end
@@ -3,7 +3,7 @@
3
3
  module Decidim
4
4
  module Conferences
5
5
  # This query filters published conferences only.
6
- class PublishedConferences < Rectify::Query
6
+ class PublishedConferences < Decidim::Query
7
7
  def query
8
8
  Decidim::Conference.published
9
9
  end
@@ -3,7 +3,7 @@
3
3
  module Decidim
4
4
  module Conferences
5
5
  # This query class filters conferences given a current_user.
6
- class VisibleConferences < Rectify::Query
6
+ class VisibleConferences < Decidim::Query
7
7
  def query
8
8
  Decidim::Conference.public_spaces
9
9
  end
@@ -2,8 +2,8 @@
2
2
 
3
3
  module Decidim
4
4
  module Conferences
5
- class DataPortabilityConferenceInviteSerializer < Decidim::Exporters::Serializer
6
- # Serializes a conference invite for data portability
5
+ class DownloadYourDataConferenceInviteSerializer < Decidim::Exporters::Serializer
6
+ # Serializes a conference invite for download your data
7
7
  def serialize
8
8
  {
9
9
  id: resource.id,
@@ -2,8 +2,8 @@
2
2
 
3
3
  module Decidim
4
4
  module Conferences
5
- class DataPortabilityConferenceRegistrationSerializer < Decidim::Exporters::Serializer
6
- # Serializes a registration for data portability
5
+ class DownloadYourDataConferenceRegistrationSerializer < Decidim::Exporters::Serializer
6
+ # Serializes a registration for download your data
7
7
  def serialize
8
8
  {
9
9
  id: resource.id,
@@ -1,12 +1,12 @@
1
1
  <p class="email-greeting"><%= t("devise.mailer.invitation_instructions.hello", email: @user.name) %></p>
2
2
 
3
3
  <p class="email-instructions">
4
- <%= t ".invited_existing_user_to_join_a_conference", invited_by: @invited_by.name, application: @user.organization.name %>
4
+ <%= t ".invited_you_to_join_a_conference", invited_by: @invited_by.name, application: @user.organization.name %>
5
5
  </p>
6
6
 
7
7
  <p class="email-button email-button__cta cta-decline">
8
- <%= link_to t(".decline", conference_title: translated_attribute(@conference.title)), routes.decline_invitation_conference_registration_type_conference_registration_url(conference_slug: @conference.slug, registration_type_id: @registration_type.id) %>
8
+ <%= link_to t(".decline", conference_title: translated_attribute(@conference.title)),routes.decline_invitation_conference_registration_type_conference_registration_path(conference_slug: @conference.slug, registration_type_id: @registration_type.id) %>
9
9
  </p>
10
10
  <p class="email-button email-button__cta cta-accept">
11
- <%= link_to t(".registration", conference_title: translated_attribute(@conference.title)), routes.conference_registration_type_conference_registration_url(conference_slug: @conference.slug, registration_type_id: @registration_type.id) %>
11
+ <%= link_to t(".registration", conference_title: translated_attribute(@conference.title)),routes.conference_registration_type_conference_registration_url(conference_slug: @conference.slug, registration_type_id: @registration_type.id) %>
12
12
  </p>
@@ -36,7 +36,9 @@
36
36
  <% end %>
37
37
  </td>
38
38
  <td>
39
- <%= image_tag(partner.attached_uploader(:logo).path(variant: :thumb)) %>
39
+ <% if partner.attached_uploader(:logo).path %>
40
+ <%= image_tag(partner.attached_uploader(:logo).path(variant: :thumb)) %>
41
+ <% end %>
40
42
  </td>
41
43
  <td class="table-list__actions">
42
44
  <% if allowed_to? :update, :partner, partner: partner %>
@@ -13,7 +13,7 @@
13
13
  </div>
14
14
  <div class="columns mediumlarge-8 large-6 card--process__column">
15
15
  <div class="card--full__image"
16
- style="background-image:url('<%= promoted_conference.attached_uploader(:hero_image).path %>')">
16
+ style="background-image:url(<%= promoted_conference.attached_uploader(:hero_image).path %>)">
17
17
  <div class="card__content row collapse">
18
18
  <div class="large-6 large-offset-6 columns">
19
19
  <%= link_to conference_path(promoted_conference), class: "button expanded button--sc" do %>
@@ -1,10 +1,10 @@
1
1
  <p class="email-greeting"><%= t("devise.mailer.invitation_instructions.hello", email: @resource.name) %></p>
2
2
 
3
3
  <p class="email-instructions">
4
- <%= t("decidim.conferences.admin.invite_join_conference_mailer.invite.invited_user_to_join_a_conference", invited_by: @resource.invited_by.name, application: @resource.organization.name) %>
4
+ <%= t("decidim.conferences.admin.invite_join_conference_mailer.invite.invited_you_to_join_a_conference", invited_by: @resource.invited_by.name, application: @resource.organization.name) %>
5
5
  </p>
6
6
 
7
- <p class="email-button email-button__cta"><%= link_to t("devise.mailer.invitation_instructions.accept"), accept_invitation_url(@resource, invitation_token: @token, invite_redirect: Decidim::EngineRouter.main_proxy(@opts[:conference]).conference_registration_type_conference_registration_path(conference_slug: @opts[:conference], registration_type_id: @opts[:registration_type]), host: @resource.organization.host) %></p>
7
+ <p class="email-button email-button__cta"><%= link_to t("devise.mailer.invitation_instructions.accept"), accept_invitation_url(@resource, invitation_token: @token, invite_redirect: Decidim::EngineRouter.main_proxy(@opts[:conference]).conference_conference_registration_path(conference_slug: @opts[:conference]), host: @resource.organization.host) %></p>
8
8
 
9
9
  <% if @resource.invitation_due_at %>
10
10
  <p class="email-small"><%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :long)) %></p>
@@ -1,8 +1,8 @@
1
1
  <%= t("devise.mailer.invitation_instructions.hello", email: @resource.name) %>
2
2
 
3
- <%= t("decidim.conferences.admin.invite_join_conference_mailer.invite.invited_existing_user_to_join_a_conference", invited_by: @resource.invited_by.name, application: @resource.organization.name) %>
3
+ <%= t("decidim.conferences.admin.invite_join_conference_mailer.invite.invited_you_to_join_a_conference", invited_by: @resource.invited_by.name, application: @resource.organization.name) %>
4
4
 
5
- <%= link_to t("devise.mailer.invitation_instructions.accept"), accept_invitation_url(@resource, invitation_token: @token, invite_redirect: Decidim::EngineRouter.main_proxy(@opts[:conference]).conference_registration_type_conference_registration_path(conference_slug: @opts[:conference], registration_type_id: @opts[:registration_type]), host: @resource.organization.host) %>
5
+ <%= link_to t("devise.mailer.invitation_instructions.accept"), accept_invitation_url(@resource, invitation_token: @token, invite_redirect: Decidim::EngineRouter.main_proxy(@opts[:conference]).conference_conference_registration_path(conference_slug: @opts[:conference]), host: @resource.organization.host) %>
6
6
 
7
7
  <% if @resource.invitation_due_at %>
8
8
  <%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :long)) %>
@@ -1,5 +1,5 @@
1
1
  <section class="extended hero"
2
- style="background-image:url('<%= current_participatory_space.attached_uploader(:banner_image).path %>');">
2
+ style="background-image:url(<%= current_participatory_space.attached_uploader(:banner_image).path %>);">
3
3
  <div class="hero__container">
4
4
  <div class="row">
5
5
  <div class="columns large-10 text-left">
@@ -16,7 +16,7 @@
16
16
  active: is_active_link?(decidim_conferences.conference_conference_speakers_path(current_participatory_space), :inclusive)
17
17
  } : nil
18
18
  ] + meeting_components.map do |component|
19
- Decidim::Meetings::Meeting.visible_meeting_for(current_user).any? ? {
19
+ Decidim::Meetings::Meeting.visible_for(current_user).any? ? {
20
20
  name: translated_attribute(component.name),
21
21
  url: decidim_conferences.conference_conference_program_path(current_participatory_space, id: component.id),
22
22
  active: is_active_link?(decidim_conferences.conference_conference_program_path(current_participatory_space, id: component.id), :inclusive)
@@ -1 +1,2 @@
1
+ ---
1
2
  am:
@@ -1,3 +1,4 @@
1
+ ---
1
2
  ar:
2
3
  activemodel:
3
4
  attributes:
@@ -393,7 +394,7 @@ ar:
393
394
  invite_join_conference_mailer:
394
395
  invite:
395
396
  decline: رفض الدعوة "%{conference_title}"
396
- invited_existing_user_to_join_a_conference: "%{invited_by} للانضمام إلى مؤتمر في %{application}. يمكنك رفضه أو قبوله من خلال الروابط أدناه."
397
+ invited_you_to_join_a_conference: "%{invited_by} للانضمام إلى مؤتمر في %{application}. يمكنك رفضه أو قبوله من خلال الروابط أدناه."
397
398
  registration: التسجيل لـ "%{conference_title}"
398
399
  partners:
399
400
  index:
@@ -1,3 +1,4 @@
1
+ ---
1
2
  bg:
2
3
  activemodel:
3
4
  attributes:
@@ -1,3 +1,4 @@
1
+ ---
1
2
  ca:
2
3
  activemodel:
3
4
  attributes:
@@ -37,13 +38,13 @@ ca:
37
38
  date: Data
38
39
  link: Enllaç
39
40
  title: Títol
40
- weight: Ordre de posició
41
+ weight: Pes
41
42
  conference_partner:
42
43
  link: Enllaç
43
44
  logo: Logo
44
45
  name: Nom
45
46
  partner_type: Tipus de col·laboració
46
- weight: Ordre de posició
47
+ weight: Pes
47
48
  conference_registration_invite:
48
49
  email: Correu electrònic
49
50
  name: Nom
@@ -53,7 +54,7 @@ ca:
53
54
  description: Descripció
54
55
  price: Cost
55
56
  title: Títol
56
- weight: Odre de posició
57
+ weight: Pes
57
58
  conference_speaker:
58
59
  affiliation: Afiliació
59
60
  avatar: Imatge de perfil
@@ -379,8 +380,7 @@ ca:
379
380
  invite_join_conference_mailer:
380
381
  invite:
381
382
  decline: Rebutjar la invitació a '%{conference_title}'
382
- invited_existing_user_to_join_a_conference: "%{invited_by} t'ha convidat a unir-te a una conferència a l'%{application}. Pots rebutjar o acceptar a través dels enllaços a continuació."
383
- invited_user_to_join_a_conference: "%{invited_by} t'ha convidat a unir-te a una conferència a %{application}. Pots acceptar-la a través del següent enllaç."
383
+ invited_you_to_join_a_conference: "%{invited_by} t'ha convidat a unir-te a una conferència a l'%{application}. Pots rebutjar o acceptar a través dels enllaços a continuació."
384
384
  registration: Inscripció a '%{conference_title}'
385
385
  partners:
386
386
  index:
@@ -431,11 +431,9 @@ ca:
431
431
  create:
432
432
  invalid: S'ha produït un error en inscriure't a aquesta jornada.
433
433
  success: T'has inscrit a la jornada correctament.
434
- unauthorized: Cal que iniciïs la teva sessió abans d'inscriure't a la conferència.
435
434
  decline_invitation:
436
435
  invalid: S'ha produït un error en rebutjar la invitació.
437
436
  success: Has rebutjat la invitació correctament.
438
- unauthorized: Cal que iniciïs la teva sessió abans de rebutjar la invitació.
439
437
  destroy:
440
438
  invalid: S'ha produït un error en abandonar aquesta jornada.
441
439
  success: Has abandonat la jornada correctament.
@@ -1,3 +1,4 @@
1
+ ---
1
2
  cs:
2
3
  activemodel:
3
4
  attributes:
@@ -66,7 +67,7 @@ cs:
66
67
  user_id: Uživatel
67
68
  conference_user_role:
68
69
  email: E-mail
69
- name: Název
70
+ name: název
70
71
  role: Role
71
72
  errors:
72
73
  models:
@@ -99,7 +100,7 @@ cs:
99
100
  send_diplomas: Odeslání certifikátů o účasti
100
101
  conference_copies:
101
102
  new:
102
- copy: Kopírovat
103
+ copy: kopírovat
103
104
  select: Vyberte, která data chcete duplikovat
104
105
  title: Duplikovat konferenci
105
106
  conference_publications:
@@ -222,7 +223,7 @@ cs:
222
223
  conference_user_role:
223
224
  fields:
224
225
  email: E-mail
225
- name: Název
226
+ name: název
226
227
  role: Role
227
228
  name: Administrátor konference
228
229
  roles:
@@ -232,7 +233,7 @@ cs:
232
233
  valuator: Hodnotitel
233
234
  media_link:
234
235
  fields:
235
- date: Datum
236
+ date: datum
236
237
  link: Odkaz
237
238
  title: Název
238
239
  name: Odkaz na média
@@ -240,7 +241,7 @@ cs:
240
241
  fields:
241
242
  link: Odkaz
242
243
  logo: Logo
243
- name: Název
244
+ name: název
244
245
  partner_type: Typ
245
246
  name: Partner
246
247
  types:
@@ -387,8 +388,7 @@ cs:
387
388
  invite_join_conference_mailer:
388
389
  invite:
389
390
  decline: Odmítnout pozvánku '%{conference_title}'
390
- invited_existing_user_to_join_a_conference: "%{invited_by} vás zve na konferenci na %{application}. Můžete jej odmítnout nebo přijmout prostřednictvím níže uvedených odkazů."
391
- invited_user_to_join_a_conference: "%{invited_by} vás pozval, abyste se připojili ke konferenci v %{application}. Můžete ji přijmout prostřednictvím níže uvedeného odkazu."
391
+ invited_you_to_join_a_conference: "%{invited_by} vás zve na konferenci na %{application}. Můžete jej odmítnout nebo přijmout prostřednictvím níže uvedených odkazů."
392
392
  registration: Registrace pro "%{conference_title}"
393
393
  partners:
394
394
  index:
@@ -410,7 +410,7 @@ cs:
410
410
  success: Konferenční certifikáty o návštěvě byly zaslány správně
411
411
  conference:
412
412
  registration_confirm:
413
- cancel: Zrušit
413
+ cancel: zrušení
414
414
  confirm: Potvrdit
415
415
  show:
416
416
  free: Volný, uvolnit
@@ -439,11 +439,9 @@ cs:
439
439
  create:
440
440
  invalid: Do této konference došlo k problému.
441
441
  success: Do konference jste se úspěšně připojili.
442
- unauthorized: Před registrací na konferenci se musíte přihlásit.
443
442
  decline_invitation:
444
443
  invalid: Došlo k potížím s odmítnutím pozvánky.
445
444
  success: Odmítli jste pozvánku úspěšně.
446
- unauthorized: Před odmítnutím pozvání se musíte přihlásit.
447
445
  destroy:
448
446
  invalid: Při této konferenci došlo k problému.
449
447
  success: Konference jste úspěšně opustili.
@@ -491,7 +489,7 @@ cs:
491
489
  conference_invite:
492
490
  fields:
493
491
  email: E-mail
494
- name: Název
492
+ name: název
495
493
  registration_type: Typ registrace
496
494
  sent_at: Odeslané
497
495
  status: Postavení
@@ -502,12 +500,12 @@ cs:
502
500
  conference_registration:
503
501
  fields:
504
502
  email: E-mail
505
- name: Název
503
+ name: název
506
504
  registration_type: Typ registrace
507
505
  state: Stav
508
506
  states:
509
507
  confirmed: Potvrzeno
510
- pending: Čekající
508
+ pending: čekající
511
509
  pages:
512
510
  home:
513
511
  highlighted_conferences:
@@ -1 +1,2 @@
1
+ ---
1
2
  da:
@@ -1,3 +1,4 @@
1
+ ---
1
2
  de:
2
3
  activemodel:
3
4
  attributes:
@@ -379,7 +380,7 @@ de:
379
380
  invite_join_conference_mailer:
380
381
  invite:
381
382
  decline: Einladung '%{conference_title}' ablehnen
382
- invited_existing_user_to_join_a_conference: "%{invited_by} hat Sie eingeladen, an einer Konferenz um %{application}teilzunehmen. Sie können dies über die unten stehenden Links ablehnen oder akzeptieren."
383
+ invited_you_to_join_a_conference: "%{invited_by} hat Sie eingeladen, an einer Konferenz um %{application}teilzunehmen. Sie können dies über die unten stehenden Links ablehnen oder akzeptieren."
383
384
  registration: Registrierung für '%{conference_title}'
384
385
  partners:
385
386
  index:
@@ -1,3 +1,4 @@
1
+ ---
1
2
  el:
2
3
  activemodel:
3
4
  attributes:
@@ -376,7 +377,7 @@ el:
376
377
  invite_join_conference_mailer:
377
378
  invite:
378
379
  decline: Απόρριψη πρόσκλησης «%{conference_title}»
379
- invited_existing_user_to_join_a_conference: "Ο χρήστης %{invited_by} σάς προσκάλεσε να συμμετάσχετε σε μια διάσκεψη στην εφαρμογή %{application}. Μπορείτε να την απορρίψετε ή να την αποδεχτείτε μέσω των παρακάτω συνδέσμων."
380
+ invited_you_to_join_a_conference: "Ο χρήστης %{invited_by} σάς προσκάλεσε να συμμετάσχετε σε μια διάσκεψη στην εφαρμογή %{application}. Μπορείτε να την απορρίψετε ή να την αποδεχτείτε μέσω των παρακάτω συνδέσμων."
380
381
  registration: Εγγραφή για τη διάσκεψη «%{conference_title}»
381
382
  partners:
382
383
  index: