decidim-conferences 0.32.0.rc2 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bde20dabbfde5c12530a22817d1b8fe3b192f897667948e1df6e8c99e787a6bb
-  data.tar.gz: c1d6f25af681ff7cb5b50838483b6c207a09c1048b8a7520292153150352b0eb
+  metadata.gz: c728cbbcbc75dd3e414ae5c3344e8ba0be7fe91d191259679e6b1debfdfa80b5
+  data.tar.gz: de61e8333515bfc13385d9946b57247ef8164fe177e64a78ab03271a4bc2e1d5
 SHA512:
-  metadata.gz: da831d3860f0bd6661ec27590c3dc3887b1ebcf7a4913a85d6f245dd5f6c087301499bb39b943eb4ff2748edb03a39243e88054bc98cf7ab0c3aef85a720cba0
-  data.tar.gz: 317af63fdea16c6b4143872f34ed1ab06ad048adbbcac50d7245be9228a200d2432e301ff57e698f84899a6c08709acc31ed8413b438233f5854dff8c38e8a52
+  metadata.gz: c3b641635c14bee60eb945480ac62684a0ea9b7c5f781d75506b57e50e58ce93c2b124226913461d36d2c8368768de5afcd307f26623ac265fdf6ef93d80af59
+  data.tar.gz: 35aee6d4cef2b53ff77beb12963cd157aa18c2bc584a776ca782f3f1d0da17a47b0f687596a4266e17dc44168900593ca8557e7764e4a22dadc0b0771ff9714b

data/app/forms/decidim/conferences/admin/conference_duplicate_form.rb

@@ -23,7 +23,7 @@ module Decidim
         private
 
         def slug_uniqueness
-          return unless OrganizationConferences.new(current_organization).query.where(slug:).where.not(id:).any?
+          return unless OrganizationConferences.new(current_organization).query.with_deleted.where(slug:).where.not(id:).any?
 
           errors.add(:slug, :taken)
         end

data/app/forms/decidim/conferences/admin/conference_form.rb

@@ -90,7 +90,7 @@ module Decidim
         end
 
         def slug_uniqueness
-          return unless OrganizationConferences.new(current_organization).query.where(slug:).where.not(id: context[:conference_id]).any?
+          return unless OrganizationConferences.new(current_organization).query.where(slug:).with_deleted.where.not(id: context[:conference_id]).any?
 
           errors.add(:slug, :taken)
         end

data/app/helpers/decidim/conferences/conference_helper.rb

@@ -42,7 +42,7 @@ module Decidim
             next unless Decidim::Meetings::Meeting.where(component:).published.not_hidden.visible_for(current_user).exists?
 
             items << {
-              name: decidim_escape_translated(component.name),
+              name: translated_attribute(component.name),
               url: decidim_conferences.conference_conference_program_path(participatory_space, id: component.id)
             }
           end
@@ -63,7 +63,7 @@ module Decidim
 
           other_components.each do |component|
             items << {
-              name: decidim_escape_translated(component.name),
+              name: translated_attribute(component.name),
               url: main_component_path(component)
             }
           end

data/app/views/decidim/conferences/admin/conferences/_actions.html.erb

@@ -88,7 +88,7 @@
         <% if conference.published? %>
           <li class="dropdown__item">
             <div class="dropdown__button-disabled">
-              <%= with_tooltip t("tooltips.deleted_conferences_info", scope: "decidim.admin") do %>
+              <%= with_tooltip t("tooltips.deleted_conferences_info", scope: "decidim.admin"), class: :left do %>
                 <%= icon "delete-bin-line", class: "text-gray" %>
                 <span>
                   <%= t("decidim.admin.actions.soft_delete") %>

data/app/views/decidim/conferences/conference_program/show.html.erb

@@ -14,7 +14,7 @@ end
 %>
 
 <%# NOTE: this page does not use a regular layout %>
-<main class="container">
+<main class="container" role="main">
   <h1 class="title-decorator my-12">
     <span class="not-sr-only"><%= t(".program") %></span>
     <span class="sr-only"><%= t(".program") %> (<%= translated_attribute current_participatory_space.title %>)</span>

data/app/views/decidim/conferences/conference_speakers/index.html.erb

@@ -14,7 +14,7 @@ edit_link(
 %>
 
 <%# NOTE: this page does not use a regular layout %>
-<main class="container">
+<main class="container" role="main">
 
   <section id="conference_speakers-grid">
     <h1 class="title-decorator my-12">

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

@@ -20,7 +20,7 @@ edit_link(
     include the hero inside the two-column layout.
     Therefore is mandatory to pass the "main_enabled: false" flag
     to the layout_two_col for disabling the original main. %>
-<main>
+<main role="main">
 
   <%= content_for :aside do %>
     <div class="conference__nav-container">

data/app/views/decidim/conferences/media/index.html.erb

@@ -13,7 +13,7 @@ edit_link(
 %>
 
 <%# NOTE: this page does not use a regular layout %>
-<main class="container">
+<main class="container" role="main">
   <h1 class="title-decorator my-12">
     <span class="not-sr-only"><%= t("media", scope: "layouts.decidim.conferences_nav") %></span>
     <span class="sr-only"><%= t("media", scope: "layouts.decidim.conferences_nav") %> (<%= translated_attribute current_participatory_space.title %>)</span>

data/app/views/decidim/conferences/registration_types/index.html.erb

@@ -16,7 +16,7 @@ edit_link(
 <%= append_stylesheet_pack_tag "decidim_conferences" %>
 
 <%# NOTE: this page does not use a regular layout %>
-<main class="container">
+<main class="container" role="main">
 
   <section>
     <h1 class="title-decorator my-12">

data/config/locales/eu.yml

@@ -216,7 +216,7 @@ eu:
             actions: Ekintzak
             affiliation: Afiliazioa
             full_name: Izen osoa
-            position: Ardura
+            position: Kokapena
           name: Hizlaria
         conference_user_role:
           fields:
@@ -610,7 +610,7 @@ eu:
           notification_title: <a href="%{resource_path}">%{resource_title}</a> jardunaldiak erregistroak gaitu ditu.
         role_assigned:
           email_intro: '%{role} rola esleitu zaizu <a href="%{resource_title}"> jardunaldian.'
-          email_outro: Jakinarazpen hau jaso duzu %{role} rola esleitu dizutelako "%{resource_title}" hitzaldian.
+          email_outro: Jakinarazpen hau jaso duzu %{role} rola esleitu dizutelako "%{resource_title}" jardunaldian.
           email_subject: '%{role} rola esleitu zaizu <a href="%{resource_title}"> batzarrean.'
           notification_title: '%{role} rola esleitu zaizu <a href="%{resource_url}">%{resource_title}</a> batzarrean.'
         upcoming_conference:
@@ -637,7 +637,7 @@ eu:
     open_data:
       help:
         conferences:
-          component_settings: Konferentzia-espazioaren osagaien konfigurazioa
+          component_settings: Jardunaldi-espazioaren osagaien konfigurazioa
           created_at: Zein datatan sortu da jardunaldi hau
           decidim_scope_id: Jardunaldiaren esparrua
           description: Jardunaldiaren deskribapen luzea
@@ -681,7 +681,7 @@ eu:
           promoted_conferences: Sustatutako jardunaldiak
         order_by_conferences:
           conferences:
-            one: "Jardunaldi %{count}"
+            one: "%{count} jardunaldi"
             other: "%{count} jardunaldi"
       conferences_nav:
         conference_partners_menu_item: Kideak

data/config/locales/sk.yml

@@ -514,7 +514,7 @@ sk:
         show:
           already_have_an_account?: Už máte účet?
           are_you_new?: Nový účastník?
-          login_as: Ste prihlásení ako %{name} %{email} 
+          login_as: Ste prihlásení ako %{name} %{email}
           make_conference_registration: Zaregistrovať sa na konferenciu
           manage_registration: Spravovať registráciu
           register: Registrovať
@@ -604,10 +604,10 @@ sk:
         conference_registration_validation_pending:
           notification_title: Vaša registrácia na konferencii <a href="%{resource_url}">%{resource_title}</a> čaká na potvrdenie.
         conference_registrations_over_percentage:
-          email_intro: Konferencia "%{resource_title}" je obsadená na viac, než%{percentage} %. 
+          email_intro: Konferencia "%{resource_title}" je obsadená na viac, než%{percentage} %.
           email_outro: Túto notifikáciu ste dostali, pretože ste administrátorom participatívneho priestoru konferencie.
-          email_subject: Konferencia "%{resource_title}" je obsadená na viac, než%{percentage} %. 
-          notification_title: Konferencia <a href="%{resource_path}">%{resource_title}</a> je obsadená na viac, než %{percentage} %. 
+          email_subject: Konferencia "%{resource_title}" je obsadená na viac, než%{percentage} %.
+          notification_title: Konferencia <a href="%{resource_path}">%{resource_title}</a> je obsadená na viac, než %{percentage} %.
         conference_updated:
           email_intro: 'Konferencia "%{resource_title}" bola aktualizovaná. Novú verziu si môžete pozrieť na jej stránke:'
           email_outro: Túto notifikáciu ste dostali, pretože sledujete konferenciu "%{resource_title}". Notifikácie môžete zrušiť po kliknutí na predchádzajúci odkaz.

data/decidim-conferences.gemspec

@@ -3,7 +3,7 @@
 $LOAD_PATH.push File.expand_path("lib", __dir__)
 
 Gem::Specification.new do |s|
-  version = "0.32.0.rc2"
+  version = "0.32.0"
   s.version = version
   s.authors = ["Isaac Massot Gil"]
   s.email = ["isaac.mg@coditramuntana.com"]

data/lib/decidim/conferences/test/factories.rb

@@ -44,6 +44,10 @@ FactoryBot.define do
       published_at { Time.current }
     end
 
+    trait :trashed do
+      deleted_at { Time.current }
+    end
+
     trait :diploma do
       main_logo { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") }
       signature { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") }

data/lib/decidim/conferences/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-conferences version.
   module Conferences
     def self.version
-      "0.32.0.rc2"
+      "0.32.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-conferences
 version: !ruby/object:Gem::Version
-  version: 0.32.0.rc2
+  version: 0.32.0
 platform: ruby
 authors:
 - Isaac Massot Gil
@@ -15,56 +15,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc2
+        version: 0.32.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc2
+        version: 0.32.0
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc2
+        version: 0.32.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc2
+        version: 0.32.0
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc2
+        version: 0.32.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc2
+        version: 0.32.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc2
+        version: 0.32.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc2
+        version: 0.32.0
 description: Conferences component for decidim.
 email:
 - isaac.mg@coditramuntana.com