decidim-initiatives 0.26.7 → 0.26.8

data/config/locales/id-ID.yml

@@ -275,6 +275,8 @@ id:
           email_outro: Anda telah menerima pemberitahuan ini karena Anda mengikuti %{author_nickname}. Anda dapat berhenti menerima notifikasi mengikuti tautan sebelumnya.
           email_subject: Inisiatif yang didukung oleh %{author_nickname}
           notification_title: Prakarsa <a href="%{resource_path}">%{resource_title}</a> didukung oleh <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
+      form:
+        delete_attachment: Menghapus
       index:
         title: Inisiatif
       initiative_signatures:
@@ -310,6 +312,8 @@ id:
         author_list:
           hidden_authors_count:
             other: dan %{count} lebih banyak orang
+        committee_members:
+          revoke: Mencabut
         count:
           title:
             other: "%{count} inisiatif"
@@ -369,11 +373,6 @@ id:
         status_change_for: Inisiatif %{title} telah mengubah keadaannya
       last_activity:
         new_initiative: Inisiatif baru
-      pages:
-        home:
-          highlighted_initiatives:
-            active_initiatives: Inisiatif aktif
-            see_all_initiatives: Lihat semua inisiatif
       states:
         accepted: Diterima
         expired: Kadaluarsa

data/config/locales/is-IS.yml

@@ -170,6 +170,8 @@ is-IS:
       initiatives:
         author:
           deleted: Eytt
+        committee_members:
+          revoke: Afturkalla
         count:
           title:
             one: "%{count} frumkvæði"
@@ -207,11 +209,6 @@ is-IS:
         more_information: Hér hefur þú meiri upplýsingar um frumkvöðlunarferlið.
       last_activity:
         new_initiative: Nýtt frumkvæði
-      pages:
-        home:
-          highlighted_initiatives:
-            active_initiatives: Virk verkefni
-            see_all_initiatives: Sjá öll verkefni
       states:
         accepted: Samþykkt
         expired: Útrunnið
@@ -220,6 +217,7 @@ is-IS:
   layouts:
     decidim:
       initiative_creation_header:
+        back: Til baka
         fill_data: Búa til
         finish: Klára
         previous_form: Byrja

data/config/locales/it.yml

@@ -400,7 +400,7 @@ it:
           notification_title: <a href="%{applicant_profile_url}">%{applicant_nickname}</a> ha fatto domanda per il comitato promoter della tua iniziativa <a href="%{resource_url}">%{resource_title}</a>. Per accettare o rifiutare clicca <a href="%{resource_url}/edit">qui</a>.
       form:
         add_attachments: Documenti
-        delete_attachment: Cancella
+        delete_attachment: Elimina
       index:
         title: Iniziative
       initiative_signatures:
@@ -442,7 +442,7 @@ it:
           confirm_revoke: Sei sicuro?
           invite_to_committee_help: Condividi questo link per invitare altri utenti al comitato di promozione
           no_members_yet: Non vi sono membri nel comitato promotore
-          revoke: Revoca
+          revoke: Revocare
           title: Membri del comitato
         count:
           title:
@@ -544,11 +544,6 @@ it:
         status_change_for: L'iniziativa %{title} ha cambiato il suo stato
       last_activity:
         new_initiative: Nuova iniziativa
-      pages:
-        home:
-          highlighted_initiatives:
-            active_initiatives: Iniziative attive
-            see_all_initiatives: Vedi tutte le iniziative
       show:
         badge_name:
           accepted: Firme sufficienti

data/config/locales/ja.yml

@@ -14,7 +14,7 @@ ja:
         scope_id: スコープ
         signature_end_date: 署名の収集期間の終了
         signature_start_date: 署名の収集期間の開始
-        signature_type: 署名のコレクションタイプ
+        signature_type: 署名の収集種別
         signature_type_values:
           any: ハイブリッド
           offline: 対面
@@ -560,8 +560,8 @@ ja:
       pages:
         home:
           highlighted_initiatives:
-            active_initiatives: 積極的なイニシアチブ
-            see_all_initiatives: すべてのイニシアチブを見る
+            active_initiatives: 活動中のイニシアチブ
+            see_all_initiatives: すべてのイニシアチブを表示
       show:
         badge_name:
           accepted: 十分な署名

data/config/locales/lb.yml

@@ -277,7 +277,6 @@ lb:
           help: Woraus besteht die Initiative? Schreiben Sie den Titel und die Beschreibung auf. Wir empfehlen einen kurzen und prägnanten Titel und eine Beschreibung der vorgeschlagenen Lösung.
           more_information: "(Weitere Informationen)"
         promotal_committee:
-          back: Zréck
           individual_help_text: Diese Art der Bürgerinitiative erfordert einen Ausschuss der Initiatoren, der aus mindestens %{committee_size} Personen (Zeugen) besteht. Sie müssen den folgenden Link mit den anderen Personen teilen, die an dieser Initiative beteiligt sind. Wenn Ihre Kontakte diesen Link erhalten, müssen sie die angegebenen Schritte befolgen.
           more_information: "(Weitere Informationen)"
         select_initiative_type:
@@ -287,10 +286,9 @@ lb:
           select: Ich möchte diese Initiative fördern
           select_initiative_type_help: Bürgerinitiativen sind ein Mittel, mit dem die Bürger eingreifen können, damit die Organisation Maßnahmen zur Verteidigung des Allgemeininteresses ergreifen kann, die in den Zuständigkeitsbereich der Stadtverwaltung fallen. Welche Initiative möchten Sie starten?
         share_committee_link:
-          continue: Weider
+          continue: Fortsetzen
           invite_to_committee_help: Link, um Leute einzuladen, die Teil des Promoter-Komitees sein werden
         show_similar_initiatives:
-          back: Zréck
           compare_help: Wenn eine der folgenden Initiativen Ihrer ähnelt, empfehlen wir Ihnen, sie zu unterstützen. Ihr Vorschlag wird mehr Möglichkeiten haben, erledigt zu werden.
           continue: Meine Initiative ist anders
           more_information: "(Weitere Informationen)"
@@ -330,9 +328,6 @@ lb:
           email_outro: 'Sie haben diese Benachrichtigung erhalten, weil Sie der Autor der Initiative %{resource_title} sind'
           email_subject: "%{applicant_nickname} möchte Ihrer Initiative beitreten"
           notification_title: <a href="%{applicant_profile_url}">%{applicant_nickname}</a> hat sich für das Promoter-Komittee Ihrer Initiative <a href="%{resource_url}">%{resource_title}</a> beworben. Um anzunehmen oder abzulehnen, klicken Sie <a href="%{resource_url}/edit">hier</a>.
-      form:
-        add_attachments: Dokumente
-        delete_attachment: Löschen
       index:
         title: Initiativen
       initiative_signatures:
@@ -374,7 +369,6 @@ lb:
           confirm_revoke: Bist du dir sicher?
           invite_to_committee_help: Teilen Sie diesen Link, um andere Benutzer zum Promotionskomitee einzuladen
           no_members_yet: Es gibt keine Mitglieder im Promoter-Ausschuss
-          revoke: Widerrufen
           title: Ausschussmitglieder
         count:
           title:
@@ -415,11 +409,6 @@ lb:
           city: Uertschaft
       last_activity:
         new_initiative: Neue Initiative
-      pages:
-        home:
-          highlighted_initiatives:
-            active_initiatives: Aktive Initiativen
-            see_all_initiatives: Sehen Sie alle Initiativen
       show:
         badge_name:
           accepted: Ausreichend Unterschriften
@@ -451,7 +440,6 @@ lb:
   layouts:
     decidim:
       initiative_creation_header:
-        back: Zurück
         fill_data: Erstellen
         finish: Fertig
         previous_form: Anfang

data/config/locales/lt.yml

@@ -562,11 +562,6 @@ lt:
         status_change_for: Iniciatyvos %{title} būsena pasikeitė
       last_activity:
         new_initiative: Nauja iniciatyva
-      pages:
-        home:
-          highlighted_initiatives:
-            active_initiatives: Aktyvios iniciatyvos
-            see_all_initiatives: Žiūrėti visas iniciatyvas
       show:
         badge_name:
           accepted: Parašų užtenka

data/config/locales/lv.yml

@@ -321,6 +321,9 @@ lv:
           email_outro: Jūs saņēmāt šo paziņojumu, jo sekojat %{author_nickname}. Jūs varat atteikties no paziņojumu saņemšanas, sekojot iepriekšējai saitei.
           email_subject: Iniciatīvu atbalstīja %{author_nickname}
           notification_title: <a href="%{resource_path}">%{resource_title}</a> iniciatīvu atbalstīja <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
+      form:
+        add_attachments: Dokumenti
+        delete_attachment: Dzēst
       index:
         title: Iniciatīvas
       initiative_signatures:
@@ -358,6 +361,8 @@ lv:
             zero: un vēl %{count} personas
             one: un vēl 1 persona
             other: un vēl %{count} personas
+        committee_members:
+          revoke: Atsaukt
         count:
           title:
             zero: "%{count} iniciatīvas"
@@ -424,11 +429,6 @@ lv:
         status_change_for: Iniciatīvas %{title} statuss ir mainīts
       last_activity:
         new_initiative: Jauna iniciatīva
-      pages:
-        home:
-          highlighted_initiatives:
-            active_initiatives: Aktīvās iniciatīvas
-            see_all_initiatives: Skatīt visas iniciatīvas
       show:
         badge_name:
           accepted: Pietiekami daudz parakstu

data/config/locales/nl.yml

@@ -354,7 +354,9 @@ nl:
           email_subject: "%{applicant_nickname} wil deelnemen aan je initiatief"
           notification_title: <a href="%{applicant_profile_url}">%{applicant_nickname}</a> wil graag deel uitmaken van de promotiecommissie voor jouw initiatief <a href="%{resource_url}">%{resource_title}</a>. Om te accepteren of te weigeren, klik <a href="%{resource_url}/edit">hier</a>.
       form:
+        add_attachments: Documenten
         attachment_legend: "(Optioneel) Voeg een bijlage toe"
+        delete_attachment: Verwijder
       index:
         title: Initiatieven
       initiative_signatures:
@@ -391,6 +393,8 @@ nl:
           hidden_authors_count:
             one: en nog 1 persoon
             other: en nog %{count} mensen
+        committee_members:
+          revoke: Intrekken
         count:
           title:
             one: "%{count} initiatief"
@@ -465,11 +469,6 @@ nl:
         status_change_for: Het initiatief %{title} is van status veranderd
       last_activity:
         new_initiative: Nieuw initiatief
-      pages:
-        home:
-          highlighted_initiatives:
-            active_initiatives: Actieve initiatieven
-            see_all_initiatives: Bekijk alle initiatieven
       show:
         badge_name:
           accepted: Genoeg handtekeningen

data/config/locales/no.yml

@@ -436,7 +436,7 @@
           confirm_revoke: Er du sikker?
           invite_to_committee_help: Del denne lenken for å invitere andre deltakere til promotørutvalget
           no_members_yet: Det er ingen medlemmer i promotørkomiteen
-          revoke: Tilbakekall
+          revoke: Tilbakekalle
           title: Utvalgets medlemmer
         count:
           title:
@@ -538,11 +538,6 @@
         status_change_for: Initiativet %{title} har endret sin status
       last_activity:
         new_initiative: Nytt initiativ
-      pages:
-        home:
-          highlighted_initiatives:
-            active_initiatives: Aktive initiativer
-            see_all_initiatives: Se alle initiativer
       show:
         badge_name:
           accepted: Nok signaturer

data/config/locales/pl.yml

@@ -559,11 +559,6 @@ pl:
         status_change_for: Inicjatywa %{title} zmieniła swój status
       last_activity:
         new_initiative: Nowa inicjatywa
-      pages:
-        home:
-          highlighted_initiatives:
-            active_initiatives: Aktualne inicjatywy
-            see_all_initiatives: Zobacz wszystkie inicjatywy
       show:
         badge_name:
           accepted: Wystarczająca liczba podpisów

data/config/locales/pt-BR.yml

@@ -548,7 +548,7 @@ pt-BR:
         home:
           highlighted_initiatives:
             active_initiatives: Iniciativas ativas
-            see_all_initiatives: Veja todas as iniciativas
+            see_all_initiatives: Ver todas as iniciativas
       show:
         badge_name:
           accepted: Assinaturas suficientes
@@ -577,7 +577,7 @@ pt-BR:
   layouts:
     decidim:
       initiative_creation_header:
-        back: De volta
+        back: Costas
         fill_data: Criar
         finish: Finalizar
         previous_form: Começar

data/config/locales/pt.yml

@@ -544,11 +544,6 @@ pt:
         status_change_for: A iniciativa %{title} mudou o seu estado
       last_activity:
         new_initiative: Nova iniciativa
-      pages:
-        home:
-          highlighted_initiatives:
-            active_initiatives: Iniciativas ativas
-            see_all_initiatives: Ver todas as iniciativas
       show:
         badge_name:
           accepted: Assinaturas suficientes

data/config/locales/ro-RO.yml

@@ -354,7 +354,7 @@ ro:
           back: Înapoi
           continue: Continuă
           help: În ce constă inițiativa? Scrie titlul și descrierea. Recomandăm un titlu scurt și concis și o descriere axată pe soluția propusă.
-          more_information: "(Mai multe informații)"
+          more_information: "(Informaţii principale)"
         promotal_committee:
           back: Înapoi
           individual_help_text: Acest tip de inițiativă necesită o Comisie de promovare formată din cel puțin %{committee_size} de persoane (atestatori). Trebuie să diseminezi următorul link cu celelalte persoane care fac parte din această inițiativă. Când persoanele de contact primesc acest link vor trebui să urmeze pașii indicați.
@@ -362,7 +362,7 @@ ro:
         select_initiative_type:
           back: Înapoi
           choose_html: Vreau să creez un <strong>%{title}</strong>
-          more_information: "(Mai multe informații)"
+          more_information: "(Informaţii principale)"
           select: Doresc să promovez această iniţiativă
           select_initiative_type_help: Inițiativele reprezintă un mijloc prin care participanții pot interveni astfel încât organizația să poată întreprinde acțiuni de apărare a interesului general. Ce inițiativă dorești să lansezi?
         share_committee_link:
@@ -412,7 +412,7 @@ ro:
       form:
         add_attachments: Documente
         attachment_legend: "(Opțional) Adaugă un atașament"
-        delete_attachment: Șterge
+        delete_attachment: Ștergere
       index:
         title: Inițiative
       initiative_signatures:
@@ -561,11 +561,6 @@ ro:
         status_change_for: Inițiativa %{title} și-a schimbat statutul
       last_activity:
         new_initiative: Inițiativă nouă
-      pages:
-        home:
-          highlighted_initiatives:
-            active_initiatives: Inițiative active
-            see_all_initiatives: Vezi toate inițiativele
       show:
         badge_name:
           accepted: Semnături suficiente

data/config/locales/ru.yml

@@ -215,6 +215,8 @@ ru:
           email_outro: Вы получили это уведомление, потому что вы следите за «%{author_nickname}». Вы можете отписаться от уведомлений, перейдя по приведенной выше ссылке.
           email_subject: Инициатива поддержана %{author_nickname}
           notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> поддержал почин <a href="%{resource_path}">%{resource_title}</a>.
+      form:
+        delete_attachment: Удалить
       index:
         title: Почины
       initiative_votes:
@@ -229,6 +231,8 @@ ru:
             few: и еще %{count} людей
             many: и еще %{count} человек
             other: и еще %{count} человек
+        committee_members:
+          revoke: Отозвать
         count:
           title:
             one: "%{count} почин"
@@ -288,11 +292,6 @@ ru:
         status_change_for: Состояние почина %{title} изменилось
       last_activity:
         new_initiative: Добавить почин
-      pages:
-        home:
-          highlighted_initiatives:
-            active_initiatives: Действующие почины
-            see_all_initiatives: Просмотреть все инициативы
       states:
         accepted: Принятые
         expired: Истекшие
@@ -301,6 +300,7 @@ ru:
   layouts:
     decidim:
       initiative_creation_header:
+        back: Вернуться
         fill_data: Создать
         finish: Закончить
         previous_form: Начать

data/config/locales/sk.yml

@@ -262,6 +262,8 @@ sk:
           email_outro: Toto oznámenie ste dostali, pretože sledujete %{author_nickname}. Notifikácie môžete zrušiť po kliknutí na predchádzajúci odkaz.
           email_subject: Iniciatíva bola schválená od%{author_nickname}
           notification_title: Iniciatíva <a href="%{resource_path}">% {resource_title} </a> bola schválená <a href="%{author_path}">% {AUTHOR_NAME}% {author_nickname} </a>.
+      form:
+        delete_attachment: Odstrániť
       index:
         title: Iniciatívy
       initiative_signatures:
@@ -300,6 +302,8 @@ sk:
             few: a%{count} ďalších ľudí
             many: a%{count} ďalších ľudí
             other: a%{count} ďalších ľudí
+        committee_members:
+          revoke: Zrušiť
         count:
           title:
             one: "%{count} iniciatíva"
@@ -369,11 +373,6 @@ sk:
         status_change_for: Iniciatíva%{title} zmenila svoj stav
       last_activity:
         new_initiative: Nová iniciatíva
-      pages:
-        home:
-          highlighted_initiatives:
-            active_initiatives: Aktívne iniciatívy
-            see_all_initiatives: Zobraziť všetky iniciatívy
       states:
         accepted: Prijal
         expired: Platnosť vypršala

data/config/locales/sv.yml

@@ -342,7 +342,7 @@ sv:
           more_information: "(Mer information)"
           select: Jag vill arbeta för detta initiativ
         share_committee_link:
-          continue: Fortsätt
+          continue: Fortsätta
           invite_to_committee_help: Länk för att bjuda in personer till kampanjutskottet
         show_similar_initiatives:
           back: Tillbaka
@@ -509,11 +509,6 @@ sv:
         status_change_for: Initiativet %{title} har ändrat status
       last_activity:
         new_initiative: Nytt initiativ
-      pages:
-        home:
-          highlighted_initiatives:
-            active_initiatives: Pågående initiativ
-            see_all_initiatives: Visa alla initiativ
       show:
         badge_name:
           accepted: Nog med signaturer

data/config/locales/tr-TR.yml

@@ -515,11 +515,6 @@ tr:
         status_change_for: Girişim %{title} durumu değişti
       last_activity:
         new_initiative: Yeni girişim
-      pages:
-        home:
-          highlighted_initiatives:
-            active_initiatives: Aktif girişimler
-            see_all_initiatives: Tüm girişimleri görün
       show:
         badge_name:
           accepted: Yeterince imza
@@ -555,7 +550,7 @@ tr:
         promotal_committee: Tanıtım komitesi
         select_initiative_type: Seç
         show_similar_initiatives: Karşılaştır
-        step: '%{total} adımdan %{current}. adımda'
+        step: Adım %{current} / %{total}
         title: Yeni girişim oluştur
       initiative_header:
         initiative_menu_item: girişim

data/config/locales/uk.yml

@@ -215,6 +215,8 @@ uk:
           email_outro: Ви отримали це сповіщення, тому що ви стежите за %{author_nickname}. Ви можете відписатися від цих сповіщень, перейшовши за наведеним вище посиланням.
           email_subject: '%{author_nickname} підтримав почин'
           notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> підтримав почин <a href="%{resource_path}">%{resource_title}</a>.
+      form:
+        delete_attachment: Видалити
       index:
         title: Почини
       initiative_votes:
@@ -229,6 +231,8 @@ uk:
             few: і ще %{count} людей
             many: і ще %{count} людей
             other: і ще %{count} людей
+        committee_members:
+          revoke: Відкликати
         count:
           title:
             one: "%{count} почин"
@@ -288,11 +292,6 @@ uk:
         status_change_for: Стан почину %{title} змінився
       last_activity:
         new_initiative: Започаткувати почин
-      pages:
-        home:
-          highlighted_initiatives:
-            active_initiatives: Діючі почини
-            see_all_initiatives: Переглянути всі почини
       states:
         accepted: Прийняті
         expired: Строк дії яких закінчився
@@ -301,6 +300,7 @@ uk:
   layouts:
     decidim:
       initiative_creation_header:
+        back: Повернутись
         fill_data: Внести
         finish: Завершити
         previous_form: Почати

data/config/locales/zh-CN.yml

@@ -341,6 +341,9 @@ zh-CN:
           email_outro: 您收到此通知是因为您正在关注 %{author_nickname}。您可以停止收到跟随上一个链接的通知。
           email_subject: '%{author_nickname} 认可的倡议'
           notification_title: <a href="%{resource_path}">%{resource_title}</a> 倡议已被 <a href="%{author_path}">%{author_name} %{author_nickname}</a> 认可。
+      form:
+        add_attachments: www.un.org/webcast
+        delete_attachment: 删除
       index:
         title: 倡议
       initiative_signatures:
@@ -376,6 +379,8 @@ zh-CN:
         author_list:
           hidden_authors_count:
             other: 和更多 %{count} 人
+        committee_members:
+          revoke: Revoke
         count:
           title:
             other: "%{count} 倡议"
@@ -446,11 +451,6 @@ zh-CN:
         status_change_for: 倡议 %{title} 改变了其状态
       last_activity:
         new_initiative: 新举措
-      pages:
-        home:
-          highlighted_initiatives:
-            active_initiatives: 积极的倡议
-            see_all_initiatives: 查看所有倡议
       show:
         badge_name:
           accepted: 足够的签名

data/config/locales/zh-TW.yml

@@ -557,11 +557,6 @@ zh-TW:
         status_change_for: 倡議「%{title}」的狀態已更改。
       last_activity:
         new_initiative: 新的倡議
-      pages:
-        home:
-          highlighted_initiatives:
-            active_initiatives: 進行中的倡議
-            see_all_initiatives: 查看所有倡議
       show:
         badge_name:
           accepted: 足夠的簽署數

data/db/migrate/20181003082010_fix_user_groups_ids_on_initiatives.rb

@@ -1,16 +1,31 @@
 # frozen_string_literal: true
 
 class FixUserGroupsIdsOnInitiatives < ActiveRecord::Migration[5.2]
+  class UserGroup < ApplicationRecord
+    self.table_name = :decidim_users
+    self.inheritance_column = nil # disable the default inheritance
+
+    default_scope { where(type: "Decidim::UserGroup") }
+  end
+
+  class Initiative < ApplicationRecord
+    self.table_name = :decidim_initiatives
+  end
+
+  class InitiativesVote < ApplicationRecord
+    self.table_name = :decidim_initiatives_votes
+  end
+
   # rubocop:disable Rails/SkipsModelValidations
   def change
-    Decidim::UserGroup.find_each do |group|
+    UserGroup.find_each do |group|
       old_id = group.extended_data["old_user_group_id"]
       next unless old_id
 
-      Decidim::Initiative
+      Initiative
         .where(decidim_user_group_id: old_id)
         .update_all(decidim_user_group_id: group.id)
-      Decidim::InitiativesVote
+      InitiativesVote
         .where(decidim_user_group_id: old_id)
         .update_all(decidim_user_group_id: group.id)
     end

data/lib/decidim/initiatives/engine.rb

@@ -89,7 +89,7 @@ module Decidim
                         I18n.t("menu.initiatives", scope: "decidim"),
                         decidim_initiatives.initiatives_path,
                         position: 2.4,
-                        active: :inclusive,
+                        active: %r{^/(initiatives|create_initiative)},
                         if: !Decidim::InitiativesType.joins(:scopes).where(organization: current_organization).all.empty?
         end
       end

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.7"
+      "0.26.8"
     end
   end
 end