decidim-initiatives 0.26.1 → 0.26.2

data/config/locales/gl.yml

@@ -174,8 +174,6 @@ gl:
             actions_title: Acción
             preview: Vista previa
             print: Imprimir
-          show:
-            print: Imprimir
           update:
             error: Produciuse un erro
             success: A iniciativa cidadá foi actualizada con éxito

data/config/locales/hu.yml

@@ -189,8 +189,6 @@ hu:
             actions_title: Művelet
             preview: Előnézet
             print: Nyomtatás
-          show:
-            print: Nyomtatás
           update:
             error: Hiba történt
             success: Az állampolgári kezdeményezés frissítése sikeres

data/config/locales/id-ID.yml

@@ -168,8 +168,6 @@ id:
             actions_title: Tindakan
             preview: Preview
             print: Mencetak
-          show:
-            print: Mencetak
           update:
             error: Sebuah kesalahan telah terjadi
             success: Inisiatif warga telah berhasil diperbarui

data/config/locales/is-IS.yml

@@ -68,8 +68,6 @@ is-IS:
             actions_title: Aðgerð
             preview: Preview
             print: Prenta
-          show:
-            print: Prenta
           update:
             error: Villa hefur komið upp
         initiatives_type_scopes:

data/config/locales/it.yml

@@ -238,8 +238,6 @@ it:
             edit: Modifica
             new: Nuovo
             photos: Foto
-          show:
-            print: Stampare
           update:
             error: C'è stato un errore
             success: L'iniziativa cittadina è stata aggiornata con successo

data/config/locales/ja.yml

@@ -11,8 +11,8 @@ ja:
         signature_start_date: 署名の収集期間の開始
         signature_type: 署名のコレクションタイプ
         signature_type_values:
-          any: 混在しました
-          offline: In-person
+          any: ハイブリッド
+          offline: 対面
           online: オンライン
         state: ステータス
         title: タイトル
@@ -42,8 +42,8 @@ ja:
         postal_code: 郵便番号
       organization_data:
         address: 住所
-        id_document: ID ドキュメント
-        name: 完全な名前
+        id_document: 身分証
+        name: 氏名
     errors:
       models:
         initiative:
@@ -57,7 +57,7 @@ ja:
       decidim/initiative:
         other: イニシアチブ
       decidim/initiative_comittee:
-        other: Comittes
+        other: 委員
       decidim/initiative_vote:
         other: 署名
   decidim:
@@ -101,7 +101,7 @@ ja:
         initiatives_type_scope:
           fields:
             scope: スコープ
-            supports_required: 署名が必要です
+            supports_required: 必要署名数
           name: イニシアチブ種別のスコープ
         initiatives_types:
           fields:
@@ -118,7 +118,7 @@ ja:
             initiative_signatures_count: 署名の数
             initiative_start_date: 開始日
             initiative_title: イニシアチブのタイトル
-            name_and_surname: 氏名と姓名
+            name_and_surname: 名前と苗字
             postal_code: 郵便番号
             scope: スコープ
             time_and_date: 日時
@@ -192,14 +192,14 @@ ja:
             description: 説明
             initiative_votes_count: 投票数
             initiatives: イニシアチブ
-            state: 都道府県：
+            state: 都道府県
         committee_requests:
           index:
             approve: 承認
             confirm_revoke: よろしいですか？
             invite_to_committee_help: このリンクを共有して他の参加者を推進委員会に招待します
             no_members_yet: 推進委員会にメンバーがいません。
-            revoke: Revoke
+            revoke: 取り消し
             title: 委員会メンバー
         content_blocks:
           highlighted_initiatives:
@@ -235,8 +235,6 @@ ja:
             edit: 編集
             new: 新規作成
             photos: 写真
-          show:
-            print: 印刷
           update:
             error: エラーが発生しました
             success: イニシアチブが正常に更新されました
@@ -501,6 +499,7 @@ ja:
             title: 'タイトル:'
             type: イニシアチブの種別
           legal_text: 収集された個人データは、現行の法律に基づき、組織によって機密情報として取り扱われます。
+          members_header: 推進委員会のメンバー
           phone_number: 電話番号
           place_date: 場所、日付
           postal_code: 郵便番号

data/config/locales/lv.yml

@@ -203,8 +203,6 @@ lv:
             edit: Labot
             new: Jauns
             photos: Fotogrāfijas
-          show:
-            print: Drukāt
           update:
             error: Ir radusies kļūda
             success: Iniciatīva tika veiksmīgi atjaunināta

data/config/locales/nl.yml

@@ -214,8 +214,6 @@ nl:
             edit: Bewerken
             new: Nieuw
             photos: Foto's
-          show:
-            print: Afdrukken
           update:
             error: er is een fout opgetreden
             success: Het burgerinitiatief is met succes bijgewerkt

data/config/locales/no.yml

@@ -238,8 +238,6 @@
             edit: Rediger
             new: Ny
             photos: Bilder
-          show:
-            print: Skriv ut
           update:
             error: Det oppstod en feil
             success: Initiativet er oppdatert

data/config/locales/pl.yml

@@ -244,8 +244,6 @@ pl:
             edit: Edytuj
             new: Nowy
             photos: Zdjęcia
-          show:
-            print: Drukuj
           update:
             error: Wystąpił błąd
             success: Inicjatywa została zaktualizowana

data/config/locales/pt-BR.yml

@@ -238,8 +238,6 @@ pt-BR:
             edit: Editar
             new: Novo
             photos: Fotos
-          show:
-            print: Impressão
           update:
             error: ocorreu um erro
             success: A iniciativa do cidadão foi atualizada com sucesso

data/config/locales/pt.yml

@@ -238,8 +238,6 @@ pt:
             edit: Editar
             new: Novo
             photos: Fotos
-          show:
-            print: Impressão
           update:
             error: Ocorreu um erro
             success: A iniciativa foi atualizada corretamente

data/config/locales/ro-RO.yml

@@ -241,8 +241,6 @@ ro:
             edit: Editare
             new: Nou
             photos: Poze
-          show:
-            print: Tipărește
           update:
             error: A apărut o eroare
             success: Inițiativa a fost actualizată cu succes

data/config/locales/ru.yml

@@ -113,8 +113,6 @@ ru:
             actions_title: Действие
             preview: Предпросмотр
             print: Распечатать
-          show:
-            print: Распечатать
           update:
             error: Произошла ошибка
             success: Гражданский почин успешно обновлен

data/config/locales/sk.yml

@@ -160,8 +160,6 @@ sk:
             actions_title: Akcia
             preview: Náhľad
             print: Tlač
-          show:
-            print: Vytlačiť
           update:
             error: Došlo k chybe
             success: Iniciatíva občanov bola úspešne aktualizovaná

data/config/locales/sv.yml

@@ -226,8 +226,6 @@ sv:
             edit: Redigera
             new: Ny
             photos: Foton
-          show:
-            print: Skriv ut
           update:
             error: Ett fel har inträffat
             success: Initiativet har uppdaterats

data/config/locales/tr-TR.yml

@@ -228,8 +228,6 @@ tr:
             edit: Düzenle
             new: Yeni
             photos: Resimler
-          show:
-            print: baskı
           update:
             error: bir hata oluştu
             success: Vatandaş girişimi başarıyla güncellendi

data/config/locales/uk.yml

@@ -113,8 +113,6 @@ uk:
             actions_title: Дія
             preview: Попередній перегляд
             print: Друк
-          show:
-            print: Друк
           update:
             error: Сталася помилка
             success: Громадський почин було успішно оновлено

data/config/locales/zh-CN.yml

@@ -219,8 +219,6 @@ zh-CN:
             edit: 编辑
             new: 新的
             photos: 照片
-          show:
-            print: 打印
           update:
             error: 发生错误
             success: 该倡议已成功更新

data/lib/decidim/initiatives/admin_engine.rb

@@ -19,7 +19,7 @@ module Decidim
           resources :initiatives_type_scopes, except: [:index, :show]
         end
 
-        resources :initiatives, only: [:index, :show, :edit, :update], param: :slug do
+        resources :initiatives, only: [:index, :edit, :update], param: :slug do
           member do
             get :send_to_technical_validation
             post :publish

data/lib/decidim/initiatives/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-initiatives version.
   module Initiatives
     def self.version
-      "0.26.1"
+      "0.26.2"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-initiatives
 version: !ruby/object:Gem::Version
-  version: 0.26.1
+  version: 0.26.2
 platform: ruby
 authors:
 - Juan Salvador Perez Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-25 00:00:00.000000000 Z
+date: 2022-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.2
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.2
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.2
 - !ruby/object:Gem::Dependency
   name: decidim-verifications
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.2
 - !ruby/object:Gem::Dependency
   name: origami
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.2
 description: Citizen initiatives plugin for decidim.
 email:
 - jsperezg@gmail.com
@@ -196,7 +196,6 @@ files:
 - app/controllers/concerns/decidim/initiatives/admin/filterable.rb
 - app/controllers/concerns/decidim/initiatives/admin/initiative_admin.rb
 - app/controllers/concerns/decidim/initiatives/needs_initiative.rb
-- app/controllers/concerns/decidim/initiatives/needs_initiative_type.rb
 - app/controllers/concerns/decidim/initiatives/orderable.rb
 - app/controllers/concerns/decidim/initiatives/single_initiative_type.rb
 - app/controllers/concerns/decidim/initiatives/type_selector_options.rb
@@ -310,7 +309,6 @@ files:
 - app/views/decidim/initiatives/admin/initiatives/edit.html.erb
 - app/views/decidim/initiatives/admin/initiatives/export_pdf_signatures.pdf.erb
 - app/views/decidim/initiatives/admin/initiatives/index.html.erb
-- app/views/decidim/initiatives/admin/initiatives/show.html.erb
 - app/views/decidim/initiatives/admin/initiatives_type_scopes/_form.html.erb
 - app/views/decidim/initiatives/admin/initiatives_type_scopes/edit.html.erb
 - app/views/decidim/initiatives/admin/initiatives_type_scopes/new.html.erb

data/app/controllers/concerns/decidim/initiatives/needs_initiative_type.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-require "active_support/concern"
-
-module Decidim
-  module Initiatives
-    # Common methods for elements that need specific behaviour when there is only one initiative type.
-    module NeedsInitiativeType
-      extend ActiveSupport::Concern
-
-      included do
-        before_action :verify_initiative_type
-
-        private
-
-        def any_initiative_type?
-          Decidim::InitiativesType.where(organization: current_organization).any?
-        end
-
-        def verify_initiative_type
-          unless any_initiative_type?
-            flash[:error] = "There needs to be an initiative type created by an administrator for initiatives to work"
-            redirect_to decidim.root_path 
-          end
-        end
-      end
-    end
-  end
-end
-

data/app/views/decidim/initiatives/admin/initiatives/show.html.erb

@@ -1,180 +0,0 @@
-<div class="initiative-letterhead">
-  <% if current_organization.logo.present? %>
-    <%= image_tag current_organization.logo.url, title: current_organization.name %>
-  <% end %>
-
-  <%= current_organization.name %>
-</div>
-
-<div class="initiative-print-title">
-  Sol·licitud d'admissió a tràmit iniciativa ciutadana
-</div>
-
-<div class="print-table">
-  <div class="print-table-header">
-    Dades personals persona representant
-  </div>
-
-  <div class="print-table-row">
-    <div class="print-table-cell">
-      <div class="cell-header">DNI/NIE</div>
-      <div class="cell-content"></div>
-    </div>
-  </div>
-
-  <div class="print-table-row">
-    <div class="print-table-cell">
-      <div class="cell-header">Nom i cognoms</div>
-      <div class="cell-content"></div>
-    </div>
-  </div>
-
-  <div class="print-table-row">
-    <div class="print-table-cell">
-      <div class="cell-header">Domicili</div>
-      <div class="cell-content"></div>
-    </div>
-  </div>
-
-  <div class="print-table-row">
-    <div class="print-table-cell w33">
-      <div class="cell-header">Població</div>
-      <div class="cell-content"></div>
-    </div>
-    <div class="print-table-cell w33">
-      <div class="cell-header">Provincia</div>
-      <div class="cell-content"></div>
-    </div>
-    <div class="print-table-cell w33">
-      <div class="cell-header">CP</div>
-      <div class="cell-content"></div>
-    </div>
-  </div>
-
-  <div class="print-table-row">
-    <div class="print-table-cell w33">
-      <div class="cell-header">Tel</div>
-      <div class="cell-content"></div>
-    </div>
-
-    <div class="print-table-cell">
-      <div class="cell-header">Email</div>
-      <div class="cell-content"><%= current_initiative.author.email %></div>
-    </div>
-  </div>
-
-  <div class="print-table-row">
-    <div class="print-table-cell w66">
-      <div class="cell-header">En representació de la comissió promotora</div>
-      <div class="cell-content">&nbsp;</div>
-    </div>
-
-    <div class="print-table-cell">
-      <div class="cell-header">DNI/NIE/NIF</div>
-      <div class="cell-content">&nbsp;</div>
-    </div>
-  </div>
-</div>
-<br><br>
-<div class="print-table">
-  <div class="print-table-header">
-    Membres de la comissió promotora de la iniciativa
-  </div>
-
-  <div class="print-table-row">
-    <div class="print-table-cell w33">Nom persona o entiat membre</div>
-    <div class="print-table-cell w33">DNI/NIE/NIF</div>
-    <div class="print-table-cell w33">Domicili</div>
-  </div>
-
-  <% 4.times do %>
-    <div class="print-table-row">
-      <div class="print-table-cell w33"></div>
-      <div class="print-table-cell w33"></div>
-      <div class="print-table-cell w33"></div>
-    </div>
-  <% end %>
-</div>
-
-<h2 class="print-section-title">Sol·liciten que sigui admesa a tràmit la Iniciativa Ciutadana que porta el títol de:</h2>
-<%= translated_attribute(current_initiative.title) %>
-
-<h2 class="print-section-title">Tipus de la Iniciativa:</h2>
-<%= translated_attribute(current_initiative.type.title) %>
-
-<h2 class="print-section-title">Definició de la Iniciativa:</h2>
-<%= decidim_sanitize_editor translated_attribute(current_initiative.description) %>
-
-<h2 class="print-section-title">Exposició de motius:</h2>
-<br><br><br><br><br>
-
-<h2 class="print-section-title page-break">En cas de Consulta, especificar:</h2>
-<ul>
-  <li>Pregunta que es proposa votar</li>
-  <li>Ambit: (ciutat o districte/s)</li>
-</ul>
-
-<div class="print-table">
-  <div class="print-table-header">
-    Documentació que s'aporta (marcar el que correspongui)
-  </div>
-
-  <div class="print-table-row">
-    <div class="print-table-cell checkbox-cell"></div>
-    <div class="print-table-cell">
-      <div class="cell-content">Memòria explicativa de les raons que aconsellen la iniciativa</div>
-    </div>
-  </div>
-
-  <div class="print-table-row">
-    <div class="print-table-cell checkbox-cell"></div>
-    <div class="print-table-cell">
-      <div class="cell-content"><div class="cell-content">Model de Plec de signatures</div></div>
-    </div>
-  </div>
-
-  <div class="print-table-row">
-    <div class="print-table-cell checkbox-cell"></div>
-    <div class="print-table-cell">
-      <div class="cell-content">Acta signada dels òrgans de direcció de les entitats membres de la Comissió Promotora</div>
-    </div>
-  </div>
-
-  <div class="print-table-row">
-    <div class="print-table-cell checkbox-cell"></div>
-    <div class="print-table-cell">
-      <div class="cell-content">Relació inicial de persones fedetàries i DNI/NIE de les mateixes</div>
-    </div>
-  </div>
-
-  <div class="print-table-row">
-    <div class="print-table-cell checkbox-cell"></div>
-    <div class="print-table-cell">
-      <div class="cell-content">Declaració jurada de les persones fedetàries</div>
-    </div>
-  </div>
-
-  <div class="print-table-row">
-    <div class="print-table-cell checkbox-cell"></div>
-    <div class="print-table-cell">
-      <div class="cell-content">Sol·licitud de permís d'ocupació de via pública per a la recollida de signatures</div>
-    </div>
-  </div>
-</div>
-<br>
-<div class="print-table no-border">
-  <div class="print-table-row no-border">
-    <div class="print-table-cell w50 no-border" style="font-weight: bold">Lloc i data de la sol·licitud</div>
-    <div class="print-table-cell w50 no-border" style="font-weight: bold">Signatura</div>
-  </div>
-</div>
-
-<p class="print-initiative-legal-text">
-Les dades personals recollides serán incorporades i tractades en el sistema informàtic de l'Ajuntament
-de Barcelona i només es podràn cedir de conformitat amb la Llei Orgànica 15/1999, del 13 de desembre,
-de Protecció de Dades de Caràcter Personal, podent la persona interessada exercir els drets d'accés,
-rectificació, cancel·lació i oposició, tal com estableix l'article 5 de l'esmentada llei.
-</p>
-
-<a href="#" onclick="window.print();return false;" class="button expanded"><%= t ".print" %></a>
-<%= stylesheet_pack_tag "decidim_initiatives_print", media: "all" %>