decidim-initiatives 0.11.2 → 0.12.0.pre

data/app/views/decidim/initiatives/initiatives/_vote_cabin.html.erb

@@ -17,7 +17,7 @@
                } if Decidim::Initiatives.online_voting_allowed %>
 <% end %>
 
-<% if cannot?(:vote, initiative) && cannot?(:unvote, initiative) %>
+<% if !allowed_to?(:vote, :initiative, initiative: initiative) && !allowed_to?(:unvote, :initiative, initiative: initiative) %>
   <button class='card__button button expanded button--sc disabled' disabled>
     <%= t(".votes_blocked") %>
   </button>

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

@@ -21,4 +21,3 @@
 
 <%= javascript_include_tag "decidim/filters" %>
 <%= javascript_include_tag "decidim/orders" %>
-<%= stylesheet_link_tag "decidim/initiatives/application" %>

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

@@ -70,5 +70,4 @@
 
 <%= comments_for current_initiative if current_initiative.published? %>
 <%= javascript_include_tag "decidim/initiatives/social_share" %>
-<%= stylesheet_link_tag "decidim/initiatives/application" %>
 <%= stylesheet_link_tag "decidim/initiatives/social_share" %>

data/app/views/decidim/initiatives/initiatives/signature_identities.html.erb

@@ -12,19 +12,21 @@
 <% current_user.user_groups.verified.each do |g| %>
   <br />
   <% if @voted_groups.include? g.id %>
-      <%= action_authorized_button_to :vote,
-                                      g.name,
-                                      initiative_initiative_vote_path(initiative_slug: current_initiative.slug, group_id: g.id),
-                                      method: :delete,
-                                      remote: true,
-                                      data: { disable: true },
-                                      class: "card__button button expanded button--sc success" %>
+    <%= button_to(
+      g.name,
+      initiative_initiative_vote_path(initiative_slug: current_initiative.slug, group_id: g.id),
+      method: :delete,
+      remote: true,
+      data: { disable: true },
+      class: "card__button button expanded button--sc success"
+    ) %>
   <% else %>
-    <%= action_authorized_button_to :vote,
-                                    g.name,
-                                    initiative_initiative_vote_path(initiative_slug: current_initiative.slug, group_id: g.id),
-                                    remote: true,
-                                    data: { disable: true },
-                                    class: "card__button button expanded button--sc" %>
+    <%= button_to(
+      g.name,
+      initiative_initiative_vote_path(initiative_slug: current_initiative.slug, group_id: g.id),
+      remote: true,
+      data: { disable: true },
+      class: "card__button button expanded button--sc"
+    ) %>
   <% end %>
 <% end %>

data/app/views/layouts/decidim/admin/initiative.html.erb

@@ -1,19 +1,19 @@
 <% content_for :secondary_nav do %>
   <div class="secondary-nav secondary-nav--subnav">
     <ul>
-      <% if can? :edit, current_initiative %>
+      <% if allowed_to? :edit, :initiative, initiative: current_initiative %>
         <li <% if is_active_link?(decidim_admin_initiatives.edit_initiative_path(current_initiative)) %> class="is-active" <% end %>>
           <%= aria_selected_link_to t(".information"), decidim_admin_initiatives.edit_initiative_path(current_initiative) %>
         </li>
       <% end %>
 
-      <% if can? :manage_membership, current_initiative %>
+      <% if allowed_to? :manage_membership, :initiative, initiative: current_initiative %>
         <li <% if is_active_link?(decidim_admin_initiatives.initiative_committee_requests_path(current_initiative)) %> class="is-active" <% end %>>
           <%= aria_selected_link_to t(".committee_members"), decidim_admin_initiatives.initiative_committee_requests_path(current_initiative) %>
         </li>
       <% end %>
 
-      <% if can? :read, Decidim::Component %>
+      <% if allowed_to? :read, :component, initiative: current_initiative %>
         <li <% if is_active_link?(decidim_admin_initiatives.components_path(current_initiative)) %> class="is-active" <% end %>>
           <%= aria_selected_link_to t(".components"), decidim_admin_initiatives.components_path(current_initiative) %>
           <ul>
@@ -35,7 +35,7 @@
         </li>
       <% end %>
 
-      <% if can? :read, Decidim::Attachment %>
+      <% if allowed_to? :read, :attachment, initiative: current_initiative %>
         <li <% if is_active_link?(decidim_admin_initiatives.initiative_attachments_path(current_initiative)) %> class="is-active" <% end %>>
           <%= aria_selected_link_to t(".attachments"), decidim_admin_initiatives.initiative_attachments_path(current_initiative) %>
         </li>
@@ -47,8 +47,11 @@
 <%= render "layouts/decidim/admin/application" do %>
   <div class="process-title">
     <div class="process-title-content">
-      <%= current_initiative.title.try(:[], I18n.locale.to_s) || current_initiative.title.values.compact.first %>
+      <%= link_to translated_attribute(current_initiative.title), decidim_initiatives.initiative_path(current_initiative), target: "_blank" %>
     </div>
   </div>
-  <%= yield %>
+
+  <div class="process-content">
+    <%= yield %>
+  </div>
 <% end %>

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

@@ -1,12 +1,12 @@
 <% content_for :secondary_nav do %>
   <div class="secondary-nav secondary-nav--subnav">
     <ul>
-      <% if can?(:index, Decidim::Initiative) %>
+      <% if allowed_to?(:index, :initiative) %>
         <li <% if is_active_link?(decidim_admin_initiatives.initiatives_path) %> class="is-active" <% end %>>
           <%= aria_selected_link_to I18n.t("menu.initiatives", scope: "decidim.admin"), decidim_admin_initiatives.initiatives_path %>
         </li>
       <% end %>
-      <% if can?(:manage, Decidim::InitiativesType) %>
+      <% if allowed_to?(:manage, :initiative_type) %>
         <li <% if is_active_link?(decidim_admin_initiatives.initiatives_types_path) %> class="is-active" <% end %>>
           <%= aria_selected_link_to I18n.t("menu.initiatives_types", scope: "decidim.admin"), decidim_admin_initiatives.initiatives_types_path %>
         </li>
@@ -16,5 +16,13 @@
 <% end %>
 
 <%= render "layouts/decidim/admin/application" do %>
-  <%= yield %>
+  <div class="process-title">
+    <div class="process-title-content">
+      <%= link_to t("decidim.admin.titles.initiatives"), decidim_initiatives.initiatives_path, target: "_blank" %>
+    </div>
+  </div>
+
+  <div class="process-content">
+    <%= yield %>
+  </div>
 <% end %>

data/app/views/layouts/decidim/initiative_creation.html.erb

@@ -3,6 +3,5 @@
     <%= render partial: "layouts/decidim/initiative_creation_header" %>
     <%= yield %>
   </div>
-  <%= stylesheet_link_tag "decidim/initiatives/application" %>
   <%= javascript_include_tag "decidim/initiatives/application" %>
 <% end %>

data/config/locales/ca.yml

@@ -32,6 +32,17 @@ ca:
         address: Adreça
         id_document: CIF
         name: Nom complet
+  activerecord:
+    models:
+      decidim/initiative:
+        one: Iniciativa
+        other: Iniciatives
+      decidim/initiative_comittee:
+        one: Comitè
+        other: Comitès
+      decidim/initiative_vote:
+        one: Signatura
+        other: Firmes
   decidim:
     admin:
       menu:
@@ -57,6 +68,13 @@ ca:
       titles:
         initiatives: Iniciatives
         initiatives_types: Tipus d'iniciatives
+    events:
+      initiatives:
+        milestone_completed:
+          email_intro: La iniciativa %{resource_title} ha aconseguit el %{percentage}% de les signatures!
+          email_outro: Has rebut aquesta notificació perquè estàs seguint %{resource_title}. Pots deixar de rebre notificacions seguint l'enllaç anterior.
+          email_subject: S'ha completat una nova fita!
+          notification_title: La iniciativa <a href="%{resource_path}">%{resource_title}</a> ha aconseguit el %{percentage}% de les signatures.
     initiatives:
       admin:
         committee_requests:
@@ -214,10 +232,14 @@ ca:
         title: Iniciatives
       initiative_votes:
         create:
-          error: Hi ha hagut errors en votar la iniciativa.
+          error: Hi ha hagut errors en signar la iniciativa.
       initiatives:
         author:
           deleted: S'ha suprimit
+        author_list:
+          hidden_authors_count:
+            one: i 1 persona més
+            other: i %{count} persones més
         count:
           title:
             one: "%{count} iniciativa"
@@ -242,7 +264,7 @@ ca:
         orders:
           label: 'Ordena iniciatives per:'
           most_commented: Els més comentats
-          most_voted: El més votat
+          most_voted: Més signades
           random: Aleatori
           recent: Més recent
         result:
@@ -253,22 +275,20 @@ ca:
           offline_method: Aquesta iniciativa ciutadana només recull suports presencials.
         signature_identities:
           select_identity: Selecciona la identitat de l'usuari
+        signatures_count:
+          one: " signatura"
+          other: " signatures"
         statistics:
           assistants_count_title: Assistents
           comments_count_title: Comentaris
           meetings_count_title: Trobades
-          supports_count_title: Adhesions
+          supports_count_title: Signatures
         supports:
-          title: Llistat d'adhesions
-        supports_count:
-          count:
-            one: " suport"
-            other: " suports"
+          title: Llistat de signatures
         vote_cabin:
-          already_voted: Ja votat
-          supports_required: "%{total_supports} vots obligatoris"
+          already_voted: Ja has signat
           vote: Signar
-          votes_blocked: Votació inhabilitada
+          votes_blocked: S'ha desactivat la signatura
         votes_count:
           count:
             one: SIGNATURA

data/config/locales/en.yml

@@ -33,6 +33,17 @@ en:
         address: Address
         id_document: CIF
         name: Complete name
+  activerecord:
+    models:
+      decidim/initiative:
+        one: Initative
+        other: Initatives
+      decidim/initiative_comittee:
+        one: Comittee
+        other: Comittees
+      decidim/initiative_vote:
+        one: Signature
+        other: Signatures
   decidim:
     admin:
       menu:
@@ -58,6 +69,13 @@ en:
       titles:
         initiatives: Initiatives
         initiatives_types: Initiative types
+    events:
+      initiatives:
+        milestone_completed:
+          email_intro: The initiative %{resource_title} has achieved the %{percentage}% of signatures!
+          email_outro: You have received this notification because you are following %{resource_title}. You can stop receiving notifications following the previous link.
+          email_subject: New milestone completed!
+          notification_title: The <a href="%{resource_path}">%{resource_title}</a> initiative has achieved the %{percentage}% of signatures.
     initiatives:
       admin:
         committee_requests:
@@ -215,10 +233,14 @@ en:
         title: Initiatives
       initiative_votes:
         create:
-          error: There's been errors when voting the initiative.
+          error: There's been errors when signing the initiative.
       initiatives:
         author:
           deleted: Deleted
+        author_list:
+          hidden_authors_count:
+            one: and 1 more person
+            other: and %{count} more people
         count:
           title:
             one: "%{count} initiative"
@@ -243,7 +265,7 @@ en:
         orders:
           label: 'Sort initiatives by:'
           most_commented: Most commented
-          most_voted: Most voted
+          most_voted: Most signed
           random: Random
           recent: Most recent
         result:
@@ -254,22 +276,21 @@ en:
           offline_method: This citizen initiative only collects face to face supports.
         signature_identities:
           select_identity: Select user identity
+        signatures_count:
+          one: " signature"
+          other: " signatures"
         statistics:
           assistants_count_title: Assistants
           comments_count_title: Comments
           meetings_count_title: Meetings
-          supports_count_title: Adhesions
+          supports_count_title: Signatures
         supports:
-          title: Listing of adhesions
-        supports_count:
-          count:
-            one: " support"
-            other: " supports"
+          title: Listing of signatures
         vote_cabin:
-          already_voted: Already voted
-          supports_required: "%{total_supports} votes required"
+          already_voted: Already signed
+          supports_required: "%{total_supports} signatures required"
           vote: Sign
-          votes_blocked: Voting disabled
+          votes_blocked: Signing disabled
         votes_count:
           count:
             one: SIGNATURE

data/config/locales/es.yml

@@ -32,6 +32,17 @@ es:
         address: Dirección
         id_document: CIF
         name: Nombre completo
+  activerecord:
+    models:
+      decidim/initiative:
+        one: Iniciativa
+        other: Iniciativas
+      decidim/initiative_comittee:
+        one: Comité
+        other: Comités
+      decidim/initiative_vote:
+        one: Firma
+        other: Firmas
   decidim:
     admin:
       menu:
@@ -57,6 +68,13 @@ es:
       titles:
         initiatives: Iniciativas
         initiatives_types: Tipos de Iniciativa
+    events:
+      initiatives:
+        milestone_completed:
+          email_intro: '¡La iniciativa %{resource_title} ha logrado el %{percentage}% de firmas!'
+          email_outro: Has recibido esta notificación porque estás siguiendo %{resource_title}. Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
+          email_subject: '¡Nuevo hito completado!'
+          notification_title: La iniciativa <a href="%{resource_path}">%{resource_title}</a> ha logrado el %{percentage}% de las firmas.
     initiatives:
       admin:
         committee_requests:
@@ -120,7 +138,7 @@ es:
         initiatives_types:
           create:
             error: Se ha producido un error
-            success: Se ha creado un nuevo tipo de iniciativa con éxito
+            success: Se ha creado con éxito un nuevo tipo de iniciativa
           destroy:
             success: El tipo de iniciativa se ha eliminado correctamente
           edit:
@@ -214,10 +232,14 @@ es:
         title: Iniciativas
       initiative_votes:
         create:
-          error: Ha habido errores al apoyar la iniciativa.
+          error: Ha habido errores al firmar la iniciativa.
       initiatives:
         author:
           deleted: Eliminado
+        author_list:
+          hidden_authors_count:
+            one: y 1 persona más
+            other: y %{count} personas más
         count:
           title:
             one: "%{count} iniciativa"
@@ -242,7 +264,7 @@ es:
         orders:
           label: 'Clasificar las iniciativas por:'
           most_commented: Más comentado
-          most_voted: Los más votados
+          most_voted: Más firmadas
           random: Aleatorio
           recent: Más reciente
         result:
@@ -253,22 +275,21 @@ es:
           offline_method: Esta iniciativa ciudadana solo recoge apoyos cara a cara.
         signature_identities:
           select_identity: Seleccionar identidad de usuario
+        signatures_count:
+          one: " firma"
+          other: " firmas"
         statistics:
           assistants_count_title: Asistentes
           comments_count_title: Comentarios
           meetings_count_title: Reuniones
-          supports_count_title: Adhesiones
+          supports_count_title: Firmas
         supports:
-          title: Listado de adhesiones
-        supports_count:
-          count:
-            one: " apoyo"
-            other: " apoyos"
+          title: Listado de firmas
         vote_cabin:
-          already_voted: Ya votado
-          supports_required: "Se requieren %{total_supports} votos"
+          already_voted: Ha sido firmado
+          supports_required: "Se requieren %{total_supports} firmas"
           vote: Firmar
-          votes_blocked: Votación deshabilitada
+          votes_blocked: Firma desactivada
         votes_count:
           count:
             one: FIRMA

data/config/locales/eu.yml

@@ -32,6 +32,17 @@ eu:
         address: Helbidea
         id_document: CIF
         name: Izen osoa
+  activerecord:
+    models:
+      decidim/initiative:
+        one: Initative
+        other: Initatives
+      decidim/initiative_comittee:
+        one: batzordea
+        other: Comittees
+      decidim/initiative_vote:
+        one: Sinadura
+        other: sinadurak
   decidim:
     admin:
       menu:
@@ -57,6 +68,13 @@ eu:
       titles:
         initiatives: Ekimenak
         initiatives_types: Ekimen motak
+    events:
+      initiatives:
+        milestone_completed:
+          email_intro: '%{resource_title} ekimena sinadurak% %{percentage}lortu ditu!'
+          email_outro: Jakinarazpen hau jaso duzu %{resource_title}jarraitzen duzulako. Aurreko esteka jarraituz jakinarazpenak jasotzeari uztea erabaki dezakezu.
+          email_subject: Mugarri berria osatu da!
+          notification_title: <a href="%{resource_path}">%{resource_title}</a> ekimenek sinadurak% %{percentage}lortu dituzte.
     initiatives:
       admin:
         committee_requests:
@@ -214,10 +232,14 @@ eu:
         title: Ekimenak
       initiative_votes:
         create:
-          error: Erroreak gertatu dira ekimena botatzean.
+          error: Ekimena sinatu zenean akatsak izan dira.
       initiatives:
         author:
           deleted: Ezabatutako
+        author_list:
+          hidden_authors_count:
+            one: eta beste 1 pertsona
+            other: eta beste %{count} pertsona
         count:
           title:
             one: "%{count} ekimena"
@@ -242,7 +264,7 @@ eu:
         orders:
           label: 'Sortu ekintzak honela:'
           most_commented: Iruzkinik gehien
-          most_voted: Bozkatuena
+          most_voted: Gehien sinatuta
           random: Random
           recent: Berrienak
         result:
@@ -253,22 +275,21 @@ eu:
           offline_method: Herritarren ekimen honek aurrez aurrekoak baino ez ditu biltzen.
         signature_identities:
           select_identity: Hautatu erabiltzailearen identitatea
+        signatures_count:
+          one: " sinadura"
+          other: " sinadurak"
         statistics:
           assistants_count_title: laguntzaileak
           comments_count_title: Oharrak
           meetings_count_title: Bilerak
-          supports_count_title: atxikimendu
+          supports_count_title: sinadurak
         supports:
-          title: Iragarkien zerrenda
-        supports_count:
-          count:
-            one: " laguntza"
-            other: " euskarri"
+          title: Sinadura zerrenda
         vote_cabin:
-          already_voted: Bozkatu
-          supports_required: "%{total_supports} boto behar dira"
+          already_voted: Dagoeneko sinatuta
+          supports_required: "%{total_supports} sinadura beharrezkoa da"
           vote: Saioa
-          votes_blocked: Voting disabled
+          votes_blocked: Sinadura desgaituta dago
         votes_count:
           count:
             one: SIGNATURE