diff --git a/.rubocop_ruby.yml b/.rubocop_ruby.yml index 212f6a95..82796d68 100644 --- a/.rubocop_ruby.yml +++ b/.rubocop_ruby.yml @@ -73,11 +73,6 @@ AllCops: # Otherwise we fallback to the oldest officially supported Ruby version (2.0). TargetRubyVersion: 2.7 - RSpec: - Patterns: - - "(?:^|/)spec/" - - "(?:^|/)test/" - # Indent private/protected/public as deep as method definitions Layout/AccessModifierIndentation: EnforcedStyle: indent diff --git a/app/cells/decidim/meetings/online_meeting_link/show.erb b/app/cells/decidim/meetings/online_meeting_link/show.erb new file mode 100644 index 00000000..7815d39f --- /dev/null +++ b/app/cells/decidim/meetings/online_meeting_link/show.erb @@ -0,0 +1,44 @@ +<% if online_meeting_url? %> + <% if live? || future? %> +
+
+ <% if live? %> +
+ <%= icon "audio", class: "heading4" %> +
+
+ <%= t("live_event", scope: "decidim.meetings.meetings.show") %> + <% unless show_embed? %> +

<%= t("micro_camera_permissions_warning", scope: "decidim.meetings.meetings.show") %>

+ <% end %> +
+ <% end %> + + <% if show_embed? && live? %> +
absolutes aspect-ratio-16-9"> + <%== embed_code(request.host) %> +
+ <% elsif live? || future? %> +
+ <% if live? %> + <%= link_to t("started", scope: "decidim.meetings.meetings.show"), live_event_url, target: "_blank", class: "button button--sc" %> + <% elsif future? %> + <%= t("link_closed", scope: "decidim.meetings.meetings.show") %> + <% end %> +
+ <% end %> +
+
+ <% end %> +<% else %> +
+
+
+ <%= icon "timer", role: "img", "aria-hidden": true, remove_icon_class: true, width: 40, height: 70 %> +
+ <%= t("link_available_soon", scope: "decidim.meetings.meetings.show") %> +
+
+
+
+<% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 55ad4337..9f4675af 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -19,6 +19,11 @@ en: email_outro: You have received this notification because you are following %{amendable_title}. You can stop receiving notifications following the previous link. email_subject: Amendment rejected for %{amendable_title} from %{emendation_author_nickname} notification_title: The amendment created by %{emendation_author_nickname} has been rejected for %{amendable_title}. + meetings: + meetings: + show: + join: Sign-up for meeting + started: Join meeting devise: mailer: direct_invite: diff --git a/config/locales/fr.yml b/config/locales/fr.yml index ac420c9d..811e3020 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -19,6 +19,11 @@ fr: email_outro: Vous avez reçu cette notification parce que vous suivez %{amendable_title}. Si vous souhaitez vous désabonner des notifications, connectez-vous à la plateforme, puis rendez-vous dans l'onglet “Mon compte” > “Paramètres des notifications”. email_subject: Un amendement rejeté pour %{amendable_title} à %{emendation_author_nickname} notification_title: Le amendement créé par %{emendation_author_nickname} a été rejetée pour %{amendable_title}. + meetings: + meetings: + show: + join: S'inscrire à la réunion + started: Rejoindre la réunion devise: mailer: direct_invite: diff --git a/spec/lib/overrides_spec.rb b/spec/lib/overrides_spec.rb index 0d9ca052..a0305481 100644 --- a/spec/lib/overrides_spec.rb +++ b/spec/lib/overrides_spec.rb @@ -39,7 +39,8 @@ files: { "/app/controllers/decidim/meetings/admin/invites_controller.rb" => "2cf91718146e0223d7b7794f44d5d8c6", "/app/cells/decidim/meetings/meeting_m/single_date.erb" => "d7bb73188f6c1299c926bafa59aedc24", - "/app/views/decidim/meetings/meetings/show.html.erb" => "69914b0ea3e30b47506bb254269fbd3d" + "/app/cells/decidim/meetings/online_meeting_link/show.erb" => "9557df6e46040a6395c71c75cd84792c", + "/app/views/decidim/meetings/meetings/show.html.erb" => "1a1ed9e537d856fede9834cde396293d" } }, { @@ -79,7 +80,7 @@ files: { "/app/controllers/decidim/proposals/proposals_controller.rb" => "b263741e3335110fa0e37c488c777190", "/app/views/decidim/proposals/proposals/index.html.erb" => "48fbf7a8332f5f4c026b793e7922bdbc", - "/app/views/decidim/proposals/proposals/show.html.erb" => "f27bbec257eb6da28dbdd07ac0a224a5", + "/app/views/decidim/proposals/proposals/show.html.erb" => "23188e6a12cc1ac6ce44c857b3b81a4c", "/app/cells/decidim/proposals/highlighted_proposals_for_component_cell.rb" => "b8a9a1b573b2f888b293d10a7fab6577", "/app/views/decidim/proposals/proposals/_proposals.html.erb" => "a4057670154210aff98e5f206d0fdfc2", "/app/views/decidim/proposals/proposals/_wizard_aside.html.erb" => "45dc17085fabc549bee6474b8a3e79df",