decidim-core 0.28.3 → 0.29.0.rc1

data/app/validators/uploader_image_dimensions_validator.rb

@@ -28,7 +28,7 @@ class UploaderImageDimensionsValidator < ActiveModel::Validations::FileContentTy
     return unless uploader.validable_dimensions
     return if (image = extract_image(file)).blank?
 
-    record.errors.add attribute, I18n.t("carrierwave.errors.file_resolution_too_large") if image.dimensions.any? { |dimension| dimension > uploader.max_image_height_or_width }
+    record.errors.add attribute, I18n.t("decidim.errors.files.file_resolution_too_large") if image.dimensions.any? { |dimension| dimension > uploader.max_image_height_or_width }
   rescue MiniMagick::Error
     # The error may happen because of many reasons but most commonly the image
     # exceeds the default maximum dimensions set for ImageMagick when the
@@ -40,7 +40,7 @@ class UploaderImageDimensionsValidator < ActiveModel::Validations::FileContentTy
     # Note that the error can also happen because of other reasons than only
     # the image dimensions being too large. But as we do not really know the
     # reason every time, we default to that error.
-    record.errors.add attribute, I18n.t("carrierwave.errors.file_cannot_be_processed")
+    record.errors.add attribute, I18n.t("decidim.errors.files.file_cannot_be_processed")
   end
 
   def extract_image(file)

data/app/views/decidim/account/show.html.erb

@@ -4,7 +4,7 @@
 <%= render layout: "layouts/decidim/shared/layout_user_profile" do %>
   <% if current_user.unconfirmed_email.present? %>
     <%# NOTE: announcement cell clean_body method will purge the button %>
-    <div id="email-change-pending" class="flash secondary" data-announcement>
+    <div id="email-change-pending" class="flash warning" data-announcement>
       <div class="flash__message flex-none block leading-relaxed">
         <p>
           <strong><%= t("decidim.account.email_change.title") %></strong>

data/app/views/decidim/amendments/_wizard_header.html.erb

@@ -1,14 +1,13 @@
 <div class="flex justify-center">
   <h1 class="title-decorator my-12">
     <%= wizard_header_title %>
-    <%= "(#{similar_resources_count})" if local_assigns[:similar_resources_count] %>
   </h1>
 </div>
 
 <ol id="wizard-steps" class="wizard-steps">
   <% (1..total_steps).each do |wizard_step| %>
     <% attributes = @current_step == wizard_step ? { "aria-current": "step" } : {} %>
-    <%= content_tag :li, t(wizard_step, scope: "decidim.amendments.wizard_step_form.steps"), attributes %>
+    <%= content_tag :li, t(wizard_step, scope: "decidim.amendments.wizard_step_form.steps"), attributes.merge(class: "w-1/2") %>
   <% end %>
 </ol>
 

data/app/views/decidim/application/_collection.html.erb

@@ -12,7 +12,9 @@
 </button>
 
 <div id="dropdown-menu-documents-<%= attachment_collection.id %>" class="documents__collection-content" aria-hidden="true">
-  <p><%= decidim_escape_translated(attachment_collection.description) %></p>
+  <% if (description = attachment_collection.description).present? %>
+    <p><%= decidim_escape_translated(description) %></p>
+  <% end %>
 
   <div class="documents__container">
     <% documents.each do |document| %>

data/app/views/decidim/application/_component_documents.html.erb

@@ -0,0 +1,4 @@
+<% documents = collection.documents_visible_for(current_user) %>
+<% if documents.any? %>
+  <%= render partial: "decidim/application/collection", formats: [:html], locals: { attachment_collection: collection, documents: } %>
+<% end %>

data/app/views/decidim/application/_document.html.erb

@@ -8,16 +8,30 @@
     <% end %>
     <div class="card__list-metadata">
       <div><%= icon "file-text-line" %><%= document.file_type %></div>
-      <div><%= icon "scales-2-line" %><%= number_to_human_size(document.file_size) %></div>
+      <% if document.file? %>
+        <div><%= icon "scales-2-line" %><%= number_to_human_size(document.file_size) %></div>
+      <% end %>
     </div>
   </div>
-  <%= link_to document.url,
-              target: "_blank",
-              rel: "noopener noreferrer",
-              class: "button button__sm button__transparent-secondary flex-none",
-              title: t("decidim.application.document.download"),
-              data: { "external-link": false } do %>
-    <%= t("decidim.application.document.download") %>
-    <%= icon "download-line" %>
+  <% if document.file? %>
+    <%= link_to document.url,
+                target: "_blank",
+                rel: "noopener noreferrer",
+                class: "button button__sm button__transparent-secondary flex-none",
+                title: t("decidim.application.document.download"),
+                data: { "external-link": false } do %>
+      <%= t("decidim.application.document.download") %>
+      <%= icon "download-line" %>
+    <% end %>
+  <% else %>
+    <%= link_to document.url,
+                target: "_blank",
+                rel: "noopener noreferrer",
+                class: "button button__sm button__transparent-secondary flex-none",
+                title: t("decidim.application.document.visit_link"),
+                data: { "external-link": true } do %>
+      <%= t("decidim.application.document.visit_link") %>
+    <% end %>
+
   <% end %>
 </div>

data/app/views/decidim/block_user_mailer/notify.html.erb

@@ -1,7 +1,7 @@
 <p class="email-greeting"><%= t ".hello" %></p>
 
-<p class="email-instructions"><%= t ".body_1", organization_name: h(@organization.name) %></p>
+<p class="email-instructions"><%= t ".body_1", organization_name: organization_name(@organization) %></p>
 
 <p class="email-instructions"><%= t ".body_2", justification: h(@justification) %></p>
 
-<p class="email-closing"><%= t(".greetings", organization_name: h(@organization.name), organization_url: decidim.root_url(host: @organization.host)).html_safe %></p>
+<p class="email-closing"><%= t(".greetings", organization_name: organization_name(@organization), organization_url: decidim.root_url(host: @organization.host)).html_safe %></p>

data/app/views/decidim/devise/invitations/edit.html.erb

@@ -14,7 +14,7 @@
     <div class="form__wrapper">
       <%= f.hidden_field :invitation_token %>
 
-      <%= f.text_field :nickname, help_text: t("devise.invitations.edit.nickname_help", organization: current_organization.name), required: "required", autocomplete: "nickname" %>
+      <%= f.text_field :nickname, help_text: t("devise.invitations.edit.nickname_help", organization: current_organization_name), required: "required", autocomplete: "nickname" %>
 
       <% if f.object.class.require_password_on_accepting %>
         <%= render partial: "decidim/account/password_fields", locals: { form: f, user: :user } %>
@@ -24,7 +24,7 @@
     <div class="form__wrapper-block">
       <h4 class="h4"><%= t("tos_title", scope: "decidim.devise.registrations.new") %></h4>
 
-      <div class="tos-text">
+      <div>
         <% terms_of_service_summary_content_blocks.each do |content_block| %>
           <%= cell content_block.manifest.cell, content_block %>
         <% end %>

data/app/views/decidim/devise/omniauth_registrations/new.html.erb

@@ -18,7 +18,7 @@
     <div class="form__wrapper">
       <%= f.text_field :name, help_text: t("decidim.devise.omniauth_registrations.new.username_help"), autocomplete: "name", placeholder: "John Doe" %>
 
-      <%= f.text_field :nickname, help_text: t("decidim.devise.omniauth_registrations.new.nickname_help", organization: current_organization.name), autocomplete: "nickname", placeholder: "johndoe" %>
+      <%= f.text_field :nickname, help_text: t("decidim.devise.omniauth_registrations.new.nickname_help", organization: current_organization_name), autocomplete: "nickname", placeholder: "johndoe" %>
 
       <%= f.email_field :email, autocomplete: "email", placeholder: t("placeholder_email", scope: "decidim.devise.shared") %>
 

data/app/views/decidim/devise/registrations/new.html.erb

@@ -43,7 +43,7 @@
     <div id="card__tos" class="form__wrapper-block">
       <h2 class="h4"><%= t("decidim.devise.registrations.new.tos_title") %></h2>
 
-      <div class="tos-text">
+      <div>
         <% terms_of_service_summary_content_blocks.each do |content_block| %>
           <%= cell content_block.manifest.cell, content_block %>
         <% end %>

data/app/views/decidim/devise/shared/_login_boxes.html.erb

@@ -1,6 +1,6 @@
 <div class="login__box-container">
   <button type="button" class="login__box" data-dialog-open="loginModal">
-    <%= icon "login-box-line", class: "login__box-icon" %>
+    <%= icon "user-line", class: "login__box-icon" %>
     <p class="login__box-title">
       <%= t("already_have_an_account?", scope: ) %>
     </p>

data/app/views/decidim/doorkeeper/authorizations/new.html.erb

@@ -8,7 +8,7 @@
 
   <div class="login__info">
     <p>
-      <%= t("connect_your_account_html", scope: "decidim.doorkeeper.authorizations.new", organization: current_organization.name) %>
+      <%= t("connect_your_account_html", scope: "decidim.doorkeeper.authorizations.new", organization: current_organization_name) %>
     </p>
 
     <p><%= t("this_application_will_be_able_to", scope: "decidim.doorkeeper.authorizations.new") %></p>

data/app/views/decidim/endorsements/_identity.html.erb

@@ -1,4 +1,4 @@
-<button type="button" class="<%= selected ? "is-selected" : "" %>" data-user-identity data-method="<%= http_method.to_s.upcase %>" data-create_url="<%= create_url %>" data-destroy_url="<%= destroy_url %>">
+<button type="button" class="<%= "is-selected" if selected %>" data-user-identity data-method="<%= http_method.to_s.upcase %>" data-create_url="<%= create_url %>" data-destroy_url="<%= destroy_url %>">
   <%== cell "decidim/author", identity, skip_profile_link: true %>
   <%= icon("checkbox-circle-line") %>
 </button>

data/app/views/decidim/gamification/badges/index.html.erb

@@ -27,7 +27,7 @@
           </div>
         </div>
         <div class="col-span-7 ml-2">
-          <p><%= badge.description(current_organization.name) %></p>
+          <p><%= badge.description(current_organization_name) %></p>
           <p class="mt-4"><strong><%= t ".how" %></strong></p>
           <ol class="list-decimal">
             <% badge.conditions.each do |condition| %>

data/app/views/decidim/manifests/show.json.erb

@@ -8,22 +8,22 @@
   "background_color": "#FFFFFF",
   "icons": [
     {
-      "src": "<%= current_organization.attached_uploader(:favicon).variant_url :small %>",
+      "src": "<%= current_organization.attached_uploader(:favicon).variant_path :small %>",
       "sizes": "32x32",
       "type": "image/png"
     },
     {
-      "src": "<%= current_organization.attached_uploader(:favicon).variant_url :medium %>",
+      "src": "<%= current_organization.attached_uploader(:favicon).variant_path :medium %>",
       "sizes": "180x180",
       "type": "image/png"
     },
     {
-      "src": "<%= current_organization.attached_uploader(:favicon).variant_url :big %>",
+      "src": "<%= current_organization.attached_uploader(:favicon).variant_path :big %>",
       "sizes": "192x192",
       "type": "image/png"
     },
     {
-      "src": "<%= current_organization.attached_uploader(:favicon).variant_url :huge %>",
+      "src": "<%= current_organization.attached_uploader(:favicon).variant_path :huge %>",
       "sizes": "512x512",
       "type": "image/png"
     }

data/app/views/decidim/messaging/conversations/_add_conversation_users.html.erb

@@ -12,10 +12,10 @@
           autocomplete="off"
           placeholder="<%= t("add_users_placeholder", scope: "decidim.messaging.conversations.add_conversation_users") %>"
           data-noresults="<%= t("no_results", scope: "decidim.messaging.conversations.add_conversation_users") %>"
-          data-selected="multiple-mentions-selected"
+          data-selected="conversation__modal-results"
           contenteditable="true"
           data-direct-messages-disabled="<%= t("participant_with_disabled_message_reception", scope: "decidim.messaging.conversations.add_conversation_users") %>">
     </div>
-    <ul class="conversation__modal-results multiple-mentions-selected"></ul>
+    <ul class="conversation__modal-results"></ul>
   </div>
 </div>

data/app/views/decidim/messaging/conversations/_error_modal.html.erb

@@ -1,6 +1,6 @@
-<div class="reveal" id="messageErrorModal" data-reveal>
-  <div class="reveal__header">
-    <h2 class="reveal__title"><%= error %></h2>
+<div id="messageErrorModal" data-reveal>
+  <div>
+    <h2><%= error %></h2>
     <button class="close-button" data-close aria-label="<%= t(".close") %>"
       type="button">
       <span aria-hidden="true">&times;</span>
@@ -13,8 +13,8 @@
     </p>
     <p><%= t(".correct_errors") %></p>
   </div>
-  <div class="reveal__footer">
-    <div class="buttons button--double">
+  <div>
+    <div>
       <a class="button" role="button" href="#" data-close aria-label="<%= t(".ok") %>"><%= t(".ok") %></a>
     </div>
   </div>

data/app/views/decidim/newsletter_mailer/newsletter.html.erb

@@ -1,7 +1,7 @@
 <%= decidim_sanitize_newsletter cell.to_s %>
 
 <% content_for :note do %>
-  <%== t ".note", organization_name: h(@organization.name), link: @newsletter.notifications_settings_url %>
+  <%== t ".note", organization_name: organization_name(@organization), link: @newsletter.notifications_settings_url %>
 <% end %>
 
 <% content_for :unsubscribe do %>

data/app/views/decidim/newsletters/show.html.erb

@@ -8,7 +8,7 @@
 <%= decidim_sanitize_newsletter @cell.to_s %>
 
 <% content_for :note do %>
-  <%== t "note", scope: "decidim.newsletter_mailer.newsletter", organization_name: h(@organization.name), link: decidim.notifications_settings_url(host: @organization.host) %>
+  <%== t "note", scope: "decidim.newsletter_mailer.newsletter", organization_name: current_organization_name, link: decidim.notifications_settings_url(host: @organization.host) %>
 <% end %>
 
 <% if @user.present? %>

data/app/views/decidim/newsletters_opt_in_mailer/notify.html.erb

@@ -1,6 +1,6 @@
 <p class="email-greeting"><%= t ".hello" %></p>
 
-<p class="email-instructions"><%= t ".body_1", organization_name: h(@organization.name) %></p>
+<p class="email-instructions"><%= t ".body_1", organization_name: organization_name(@organization) %></p>
 
 <p class="email-instructions"><%= t ".body_2" %></p>
 
@@ -20,4 +20,4 @@
 
 <p class="email-instructions"><%= t ".body_3" %></p>
 
-<p class="email-closing"><%= t(".greetings", organization_name: h(@organization.name), organization_url: decidim.root_url(host: @organization.host)).html_safe %></p>
+<p class="email-closing"><%= t(".greetings", organization_name: organization_name(@organization), organization_url: decidim.root_url(host: @organization.host)).html_safe %></p>

data/app/views/decidim/pages/index.html.erb

@@ -8,13 +8,12 @@ edit_link(
 %>
 
 <%= render layout:"layouts/decidim/shared/layout_center", locals: { columns: 8 } do %>
-
   <div class="text-center py-10">
     <h1 class="title-decorator inline-block text-left mb-12">
       <%= t "decidim.pages.index.title" %>
     </h1>
     <p class="text-lg text-gray-2">
-      <%= t("decidim.pages.index.subheading", name: current_organization.name) %>
+      <%= t("decidim.pages.index.subheading", name: current_organization_name) %>
     </p>
   </div>
 

data/app/views/decidim/reported_mailer/report.html.erb

@@ -13,7 +13,7 @@
 <p><%= link_to translated_attribute(@participatory_space.title), resource_locator(@participatory_space).url %></p>
 
 <p><b><%= t(".reason") %></b></p>
-<p><%= t(@report.reason, organization_name: @participatory_space.organization.name, scope: "decidim.shared.flag_modal") %></p>
+<p><%= t(@report.reason, organization_name: organization_name(@participatory_space.organization), scope: "decidim.shared.flag_modal") %></p>
 
 <% if @report.details.present? %>
   <p><b><%= t(".details") %></b></p>
@@ -37,7 +37,9 @@
   <% else %>
     <p>
       <%=
-        if @author.respond_to?(:name)
+        if @author.is_a?(Decidim::Organization)
+          organization_name(@author)
+        elsif @author.respond_to?(:name)
           @author.name
         elsif @author.respond_to?(:title)
           translated_attribute(@author.title)

data/app/views/decidim/scopes/picker.html.erb

@@ -1,4 +1,4 @@
-  <div class="scope-picker picker-header picker-list">
+  <div class="picker-header" data-scope-picker>
     <h6 id="data_picker-title" class="h2"><%= title %></h6>
     <button class="close-button" data-close type="button" data-reveal-id="data_picker-modal"><span aria-hidden="true">×</span></button>
     <div>
@@ -21,8 +21,8 @@
     </div>
   </div>
 
-  <div class="scope-picker picker-content picker-list">
-    <div class="picker-scrollable-content">
+  <div data-scope-picker data-content>
+    <div>
       <% if scopes&.any? %>
         <ul role="group" aria-label="<%= t("decidim.scopes.picker.change") %>">
           <% scopes.each do |scope| %>
@@ -37,8 +37,8 @@
     </div>
   </div>
 
-  <div class="scope-picker picker-footer reveal__footer">
-    <div class="buttons button--double">
+  <div class="picker-footer" data-scope-picker>
+    <div>
       <% if current || !required %>
         <a class="button button__sm md:button__lg button__transparent-secondary" role="button" href="<%= scopes_picker_path(current: current&.id, **context) %>" aria-controls="<%= picker_target_id %>" data-picker-value="<%= current&.id || global_value %>" data-picker-text="<%= scope_name_for_picker(current, t("decidim.scopes.global")) %>" data-picker-choose>
           <%= t("decidim.scopes.picker.choose") %>

data/app/views/decidim/searches/_resources_filter_block.html.erb

@@ -1,17 +1,17 @@
 <% resources = @sections.select { |type, _results| types.include?(type) } %>
-<div class="card card--secondary">
-  <div class="filters">
+<div class="card">
+  <div>
     <% resources.each do |type, results| %>
     <div class="filters__section--general<%= " no-results" if results[:count].zero? %>">
       <% if results[:count].positive? %>
         <%= link_to search_path_by_resource_type(type) do %>
-          <strong class="section-title"><%= searchable_resource_human_name(type) %></strong>
-          <span class="muted">&nbsp;<%= results[:count] %></span>
+          <strong><%= searchable_resource_human_name(type) %></strong>
+          <span>&nbsp;<%= results[:count] %></span>
         <% end %>
       <% else %>
         <div>
-          <strong class="section-title"><%= searchable_resource_human_name(type) %></strong>
-          <span class="muted">&nbsp;<%= results[:count] %></span>
+          <strong><%= searchable_resource_human_name(type) %></strong>
+          <span>&nbsp;<%= results[:count] %></span>
         </div>
       <% end %>
     </div>

data/app/views/decidim/shared/_extended_navigation_bar.html.erb

@@ -1,17 +1,17 @@
 <div class="row expanded">
-  <div class="process-nav">
+  <div>
     <div class="row">
-      <button class="process-nav__trigger hide-for-medium" data-toggle="process-nav-content">
+      <button data-toggle="process-nav-content">
         <%= icon "caret-bottom", class: "icon--small process-nav__trigger__icon", aria_label: t("decidim.shared.extended_navigation_bar.unfold"), role: "img" %>
         <% default_item = active_item || items.first %>
-        <span class="process-nav__link">
+        <span>
           <%= default_item[:name] %>
         </span>
       </button>
-      <div class="row column process-nav__content <%= browser.mobile? ? "is-active" : "" %>" id="process-nav-content" data-toggler=".is-active">
+      <div class="row column <%= browser.mobile? ? "is-active" : "" %>" id="process-nav-content" data-toggler=".is-active">
         <ul>
           <% items.each_with_index do |item, index| %>
-            <li class="<%= "is-active" if item[:active] %> <%= "hide-for-medium" if index > max_items %>">
+            <li class="<%= "is-active" if item[:active] %>">
               <%= link_to item[:url], class: "process-nav__link #{item[:active] ? "active" : nil}" do %>
                 <%= item[:name] %>
               <% end %>
@@ -20,17 +20,17 @@
         </ul>
 
         <% if extra_items.any? %>
-          <button class="button tiny process-nav__more show-for-medium" data-toggle="process-nav__hide-content">
+          <button class="button" data-toggle="process-nav__hide-content">
             <%= t("decidim.shared.extended_navigation_bar.more") %> <i></i><i></i><i></i>
           </button>
-          <div class="dropdown-pane process-nav__hidden-content" id="process-nav__hide-content"
+          <div class="dropdown-pane" id="process-nav__hide-content"
               data-dropdown
               data-hover="true"
               data-hover-pane="true"
               data-v-offset="-25"
               data-position="bottom"
               data-alignment="right">
-            <div class="process-nav__hidden-content__more">
+            <div>
               <%= t("decidim.shared.extended_navigation_bar.more") %> <i></i><i></i><i></i>
             </div>
             <ul>

data/app/views/decidim/shared/_login_modal.html.erb

@@ -10,7 +10,7 @@
 
   <%= decidim_form_for(Decidim::User.new, namespace: "login", as: :user, url: path, html: { class: nil }) do |f| %>
     <div data-dialog-container>
-      <%= icon "login-box-line", class: "w-6 h-6 text-gray fill-current" %>
+      <%= icon "user-line", class: "w-6 h-6 text-gray fill-current" %>
       <h3 id="dialog-title-loginModal" class="h3"><%= t(".please_log_in") %></h3>
       <div>
         <% if current_organization.sign_in_enabled? %>

data/app/views/decidim/user_interests/_areas.html.erb

@@ -1,10 +1,10 @@
 <ul>
   <% areas.each do |area| %>
-    <li class="switch tiny switch-with-label">
+    <li>
       <%= f.fields_for "areas[]", area do |form| %>
         <%= form.label "checked" do %>
           <%= form.check_box "checked", label: false, class: "switch-input" %>
-          <span class="switch-paddle"></span>
+          <span></span>
           <span class="switch-label"><%= translated_attribute area.name %></span>
         <% end %>
         <%= form.hidden_field "id", value: area.id %>

data/app/views/decidim/user_report_mailer/notify.html.erb

@@ -2,7 +2,7 @@
 
 <p class="email-instructions"><%= t ".body_1", user: h(@report.moderation.user.name), token: h(@report.user.name) %></p>
 
-<p class="email-instructions"><%= t ".body_2", reason: t(@report.reason, organization_name: @report.moderation.user.organization.name, scope: "decidim.shared.flag_user_modal") %></p>
+<p class="email-instructions"><%= t ".body_2", reason: t(@report.reason, organization_name: organization_name(@report.moderation.user.organization), scope: "decidim.shared.flag_user_modal") %></p>
 
 <% if @report.details.present? %>
   <p class="email-instructions"><%= t(".details") %></p>
@@ -11,4 +11,4 @@
   </blockquote>
 <% end %>
 
-<p class="email-closing"><%= t(".greetings", organization_name: h(@report.moderation.user.organization.name), organization_url: decidim.root_url(host: @report.moderation.user.organization.host)).html_safe %></p>
+<p class="email-closing"><%= t(".greetings", organization_name: organization_name(@report.moderation.user.organization), organization_url: decidim.root_url(host: @report.moderation.user.organization.host)).html_safe %></p>

data/app/views/decidim/user_update_mailer/notify.html.erb

@@ -6,4 +6,4 @@
 
 <p class="email-instructions"><%= t ".body_2" %></p>
 
-<p class="email-closing"><%= t(".greetings", organization_name: h(@organization.name), organization_url: decidim.root_url(host: @organization.host)).html_safe %></p>
+<p class="email-closing"><%= t(".greetings", organization_name: organization_name(@organization), organization_url: decidim.root_url(host: @organization.host)).html_safe %></p>

data/app/views/decidim/widgets/_data_picker.html.erb

@@ -1,6 +1,6 @@
 <div id="<%= picker_options[:id] %>" class="data-picker <%= picker_options[:class] %>" data-picker-name="<%= picker_options[:name] %>">
   <div class="picker-values"><% items.each do |item, params| %>
-    <div><a href="<%= params[:url] %>" class="label primary" data-picker-value="<%= item.id %>"><span aria-hidden="true">×</span> <%= params[:text] %></a></div>
+    <div><a href="<%= params[:url] %>" class="label" data-picker-value="<%= item.id %>"><span aria-hidden="true">×</span> <%= params[:text] %></a></div>
   <% end %></div>
   <div class="picker-prompt"><a href="<%= prompt_params[:url] %>"><%= prompt_params[:text] %></a></div>
 </div>

data/app/views/devise/mailer/invitation_instructions.html.erb

@@ -1,7 +1,7 @@
 <p class="email-greeting"><%= t("devise.mailer.invitation_instructions.hello", email: @resource.name) %></p>
 
 <p class="email-instructions">
-  <%= t("devise.mailer.invitation_instructions.someone_invited_you", application: @resource.organization.name) %>
+  <%= t("devise.mailer.invitation_instructions.someone_invited_you", application: organization_name(@resource.organization)) %>
 </p>
 
 <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.root_path, host: @resource.organization.host) %></p>

data/app/views/devise/mailer/invitation_instructions.text.erb

@@ -1,6 +1,6 @@
 <%= t("devise.mailer.invitation_instructions.hello", email: @resource.name) %>
 
-<%= t("devise.mailer.invitation_instructions.someone_invited_you", application: @resource.organization.name) %>
+<%= t("devise.mailer.invitation_instructions.someone_invited_you", application: organization_name(@resource.organization)) %>
 
 <%= accept_invitation_url(@resource, invitation_token: @token, invite_redirect: decidim.root_path, host: @resource.organization.host) %>
 

data/app/views/devise/mailer/invite_admin.html.erb

@@ -2,9 +2,9 @@
 
 <p class="email-instructions">
   <% if @resource.invited_by.present? %>
-    <%= t("devise.mailer.invitation_instructions.invited_you_as_admin", invited_by: @resource.invited_by.name, application: @resource.organization.name) %>
+    <%= t("devise.mailer.invitation_instructions.invited_you_as_admin", invited_by: @resource.invited_by.name, application: organization_name(@resource.organization)) %>
   <% else %>
-    <%= t("devise.mailer.invitation_instructions.someone_invited_you_as_admin", application: @resource.organization.name) %>
+    <%= t("devise.mailer.invitation_instructions.someone_invited_you_as_admin", application: organization_name(@resource.organization)) %>
   <% end %>
 </p>
 

data/app/views/devise/mailer/invite_admin.text.erb

@@ -1,9 +1,9 @@
 <%= t("devise.mailer.invitation_instructions.hello", email: @resource.name) %>
 
 <% if @resource.invited_by.present? %>
-<%= t("devise.mailer.invitation_instructions.invited_you_as_admin", invited_by: @resource.invited_by.name, application: @resource.organization.name) %>
+<%= t("devise.mailer.invitation_instructions.invited_you_as_admin", invited_by: @resource.invited_by.name, application: organization_name(@resource.organization)) %>
 <% else %>
-<%= t("devise.mailer.invitation_instructions.someone_invited_you_as_admin", application: @resource.organization.name) %>
+<%= t("devise.mailer.invitation_instructions.someone_invited_you_as_admin", application: organization_name(@resource.organization)) %>
 <% end %>
 
 <%= accept_invitation_url(@resource, invitation_token: @token, invite_redirect: decidim_admin.root_path, host: @resource.organization.host) %>

data/app/views/devise/mailer/invite_collaborator.html.erb

@@ -2,9 +2,9 @@
 
 <p class="email-instructions">
   <% if @resource.invited_by.present? %>
-    <%= t("devise.mailer.invitation_instructions.invited_you_as_admin", invited_by: @resource.invited_by.name, application: @resource.organization.name) %>
+    <%= t("devise.mailer.invitation_instructions.invited_you_as_admin", invited_by: @resource.invited_by.name, application: organization_name(@resource.organization)) %>
   <% else %>
-    <%= t("devise.mailer.invitation_instructions.someone_invited_you_as_admin", application: @resource.organization.name) %>
+    <%= t("devise.mailer.invitation_instructions.someone_invited_you_as_admin", application: organization_name(@resource.organization)) %>
   <% end %>
 </p>
 

data/app/views/devise/mailer/invite_collaborator.text.erb

@@ -1,9 +1,9 @@
 <%= t("devise.mailer.invitation_instructions.hello", email: @resource.name) %>
 
 <% if @resource.invited_by.present? %>
-<%= t("devise.mailer.invitation_instructions.invited_you_as_admin", invited_by: @resource.invited_by.name, application: @resource.organization.name) %>
+<%= t("devise.mailer.invitation_instructions.invited_you_as_admin", invited_by: @resource.invited_by.name, application: organization_name(@resource.organization)) %>
 <% else %>
-<%= t("devise.mailer.invitation_instructions.someone_invited_you_as_admin", application: @resource.organization.name) %>
+<%= t("devise.mailer.invitation_instructions.someone_invited_you_as_admin", application: organization_name(@resource.organization)) %>
 <% end %>
 
 <%= accept_invitation_url(@resource, invitation_token: @token, invite_redirect: decidim_admin.root_path, host: @resource.organization.host) %>

data/app/views/devise/mailer/invite_private_user.html.erb

@@ -2,9 +2,9 @@
 
 <p class="email-instructions">
   <% if @resource.invited_by.present? %>
-    <%= t("devise.mailer.invitation_instructions.invited_you_as_private_user", invited_by: @resource.invited_by.name, application: @resource.organization.name) %>
+    <%= t("devise.mailer.invitation_instructions.invited_you_as_private_user", invited_by: @resource.invited_by.name, application: organization_name(@resource.organization)) %>
   <% else %>
-    <%= t("devise.mailer.invitation_instructions.someone_invited_you_as_private_user", application: @resource.organization.name) %>
+    <%= t("devise.mailer.invitation_instructions.someone_invited_you_as_private_user", application: organization_name(@resource.organization)) %>
   <% end %>
 </p>
 

data/app/views/devise/mailer/invite_private_user.text.erb

@@ -1,9 +1,9 @@
 <%= t("devise.mailer.invitation_instructions.hello", email: @resource.name) %>
 
 <% if @resource.invited_by.present? %>
-<%= t("devise.mailer.invitation_instructions.invited_you_as_private_user", invited_by: @resource.invited_by.name, application: @resource.organization.name) %>
+<%= t("devise.mailer.invitation_instructions.invited_you_as_private_user", invited_by: @resource.invited_by.name, application: organization_name(@resource.organization)) %>
 <% else %>
-<%= t("devise.mailer.invitation_instructions.someone_invited_you_as_private_user", application: @resource.organization.name) %>
+<%= t("devise.mailer.invitation_instructions.someone_invited_you_as_private_user", application: organization_name(@resource.organization)) %>
 <% end %>
 
 <%= accept_invitation_url(@resource, invitation_token: @token, host: @resource.organization.host) %>

data/app/views/devise/mailer/organization_admin_invitation_instructions.html.erb

@@ -1,6 +1,6 @@
 <p class="email-greeting"><%= t("devise.mailer.invitation_instructions.hello", email: @resource.email) %></p>
 
-<p class="email-instructions"><%= t("devise.mailer.invitation_instructions.someone_invited_you", application: @resource.organization.name) %></p>
+<p class="email-instructions"><%= t("devise.mailer.invitation_instructions.someone_invited_you", application: organization_name(@resource.organization)) %></p>
 
 <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_admin.root_path, host: @resource.organization.host) %></p>
 

data/app/views/devise/mailer/organization_admin_invitation_instructions.text.erb

@@ -1,6 +1,6 @@
 <%= t("devise.mailer.invitation_instructions.hello", email: @resource.email) %>
 
-<%= t("devise.mailer.invitation_instructions.someone_invited_you", application: @resource.organization.name) %>
+<%= t("devise.mailer.invitation_instructions.someone_invited_you", application: organization_name(@resource.organization)) %>
 
 <%= accept_invitation_url(@resource, invitation_token: @token, invite_redirect: decidim_admin.root_path, host: @resource.organization.host) %>