Rename Support to Vote in proposals (decidim#12873)

Co-authored-by: Alexandru Emil Lupu <[email protected]>

decidim-budgets/spec/system/orders_spec.rb

@@ -671,14 +671,14 @@
         end
       end
 
-      context "with supports enabled" do
+      context "with votes enabled" do
         let(:proposal_component) do
           create(:proposal_component, :with_votes_enabled, participatory_space: project.component.participatory_space)
         end
 
         let(:proposals) { create_list(:proposal, 1, :with_votes, component: proposal_component) }
 
-        it "does not show the amount of supports" do
+        it "does not show the amount of votes" do
           visit_budget
           click_on translated(project.title)
 

decidim-core/README.md

@@ -28,7 +28,7 @@ User authentication is set up with [`Devise`](https://github.com/plataformatec/d
 
 Core implements an Amendment feature that can be activated in the components. As of now, it is only implemented in the proposal component.
 
-This feature makes it possible for anyone to edit the text of an amendable resource and create a child resource as an amendment. This child resource may receive support and the author of the amendable resource may accept or reject the amendment (or child proposal). In case of rejection, the author of the rejected emendation may raise the child resource to an independent resource.
+This feature makes it possible for anyone to edit the text of an amendable resource and create a child resource as an amendment. This child resource may receive votes and the author of the amendable resource may accept or reject the amendment (or child proposal). In case of rejection, the author of the rejected emendation may raise the child resource to an independent resource.
 
 ### Key artifacts for Amendments
 

decidim-core/app/commands/decidim/amendable/withdraw.rb

@@ -18,7 +18,7 @@ def initialize(amendment, current_user)
       # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid, together with the resource.
-      # - :invalid if the resource already has supports or does not belong to current user.
+      # - :invalid if the resource already has votes or does not belong to current user.
       #
       # Returns nothing.
       def call

decidim-core/app/presenters/decidim/home_stats_presenter.rb

@@ -45,7 +45,7 @@ def component_stats(conditions)
       stats = {}
       Decidim.component_manifests.flat_map do |component|
         component
-          .stats.except([:supports_count])
+          .stats.except([:votes_count])
           .filter(conditions)
           .with_context(published_components)
           .each do |name, data|

decidim-core/lib/decidim/core/test/shared_examples/amendable/withdraw_amendment_examples.rb

@@ -4,15 +4,15 @@
   context "when current user is the author of the amendment" do
     let(:current_user) { amendment.amender }
 
-    context "and the amendment has no supports" do
+    context "and the amendment has no votes" do
       it "withdraws the amendment" do
         expect { command.call }.to broadcast(:ok)
         expect(amendment.state).to eq("withdrawn")
         expect(emendation.state).to eq("withdrawn")
       end
     end
 
-    context "and the amendment has some supports" do
+    context "and the amendment has some votes" do
       before do
         emendation.votes.create!(author: other_user)
       end

decidim-dev/lib/decidim/dev/assets/assemblies.json

@@ -509,7 +509,7 @@
           "proposal_length": 500,
           "proposal_edit_before_minutes": 5,
           "threshold_per_proposal": 0,
-          "can_accumulate_supports_beyond_threshold": false,
+          "can_accumulate_votes_beyond_threshold": false,
           "proposal_answering_enabled": true,
           "official_proposals_enabled": true,
           "comments_enabled": true,

decidim-participatory_processes/app/queries/decidim/participatory_processes/stats_participants_count.rb

@@ -22,9 +22,9 @@ def query
           debates_query,
           meetings_query,
           endorsements_query,
-          project_supports_query,
+          project_votes_query,
           proposals_query,
-          proposal_supports_query,
+          proposal_votes_query,
           survey_answer_query
         ].flatten.uniq.count
       end
@@ -93,7 +93,7 @@ def proposals_query
           .uniq
       end
 
-      def proposal_supports_query
+      def proposal_votes_query
         return [] unless Decidim.module_installed?(:proposals)
 
         Decidim::Proposals::ProposalVote
@@ -105,7 +105,7 @@ def proposal_supports_query
           .uniq
       end
 
-      def project_supports_query
+      def project_votes_query
         return [] unless Decidim.module_installed?(:budgets)
 
         Decidim::Budgets::Order.joins(budget: [:component])

decidim-proposals/app/commands/decidim/proposals/vote_proposal.rb

@@ -20,7 +20,7 @@ def initialize(proposal, current_user)
       #
       # Returns nothing.
       def call
-        return broadcast(:invalid) if @proposal.maximum_votes_reached? && !@proposal.can_accumulate_supports_beyond_threshold
+        return broadcast(:invalid) if @proposal.maximum_votes_reached? && !@proposal.can_accumulate_votes_beyond_threshold
 
         build_proposal_vote
         return broadcast(:invalid) unless vote.valid?

decidim-proposals/app/commands/decidim/proposals/withdraw_proposal.rb

@@ -16,11 +16,11 @@ def initialize(proposal, current_user)
       # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid, together with the proposal.
-      # - :has_supports if the proposal already has supports or does not belong to current user.
+      # - :has_votes if the proposal already has votes or does not belong to current user.
       #
       # Returns nothing.
       def call
-        return broadcast(:has_supports) if @proposal.votes.any?
+        return broadcast(:has_votes) if @proposal.votes.any?
 
         transaction do
           @proposal.withdraw!

decidim-proposals/app/controllers/decidim/proposals/proposals_controller.rb

@@ -188,8 +188,8 @@ def withdraw
             flash[:notice] = I18n.t("proposals.update.success", scope: "decidim")
             redirect_to Decidim::ResourceLocatorPresenter.new(@proposal).path
           end
-          on(:has_supports) do
-            flash[:alert] = I18n.t("proposals.withdraw.errors.has_supports", scope: "decidim")
+          on(:has_votes) do
+            flash[:alert] = I18n.t("proposals.withdraw.errors.has_votes", scope: "decidim")
             redirect_to Decidim::ResourceLocatorPresenter.new(@proposal).path
           end
         end

decidim-proposals/app/forms/decidim/proposals/admin/proposals_fork_form.rb

@@ -39,7 +39,7 @@ def mergeable_to_same_component
 
           proposals.each do |proposal|
             errors_set << :not_official unless proposal.official?
-            errors_set << :supported if proposal.votes.any? || proposal.endorsements.any?
+            errors_set << :voted if proposal.votes.any? || proposal.endorsements.any?
           end
 
           errors_set.each { |error| errors.add(:base, error) } if errors_set.any?

decidim-proposals/app/helpers/decidim/proposals/application_helper.rb

@@ -150,7 +150,7 @@ def show_voting_rules?
         return true if vote_limit_enabled?
         return true if threshold_per_proposal_enabled?
         return true if proposal_limit_enabled?
-        return true if can_accumulate_supports_beyond_threshold?
+        return true if can_accumulate_votes_beyond_threshold?
         return true if minimum_votes_per_user_enabled?
       end
 

decidim-proposals/app/helpers/decidim/proposals/proposal_votes_helper.rb

@@ -39,8 +39,8 @@ def threshold_per_proposal
       # Public: Checks if can accumulate more than maximum is enabled
       #
       # Returns true if enabled, false otherwise.
-      def can_accumulate_supports_beyond_threshold?
-        component_settings.can_accumulate_supports_beyond_threshold
+      def can_accumulate_votes_beyond_threshold?
+        component_settings.can_accumulate_votes_beyond_threshold
       end
 
       # Public: Checks if voting is enabled in this step.

decidim-proposals/app/models/decidim/proposals/proposal.rb

@@ -355,8 +355,8 @@ def maximum_votes_reached?
       # Public: Can accumulate more votes than maximum for this proposal.
       #
       # Returns true if can accumulate, false otherwise
-      def can_accumulate_supports_beyond_threshold
-        component.settings.can_accumulate_supports_beyond_threshold
+      def can_accumulate_votes_beyond_threshold
+        component.settings.can_accumulate_votes_beyond_threshold
       end
 
       # Checks whether the user can edit the given proposal.

decidim-proposals/app/queries/decidim/proposals/metrics/proposal_participants_metric_measure.rb

@@ -5,7 +5,7 @@ module Proposals
     module Metrics
       # Searches for Participants in the following actions
       #  - Create a proposal (Proposals)
-      #  - Give support to a proposal (Proposals)
+      #  - Vote to a proposal (Proposals)
       #  - Endorse (Proposals)
       class ProposalParticipantsMetricMeasure < Decidim::MetricMeasure
         def valid?

decidim-proposals/app/views/decidim/proposals/admin/proposals/show.html.erb

@@ -111,7 +111,7 @@
         <% end %>
 
         <div class="card-section">
-          <div class="row column" data-supports>
+          <div class="row column" data-votes>
             <span class="component__show-title"><%= t ".votes_count" %></span>
             <div class="flex items-center gap-x-2 mt-2">
               <%= icon "service-line", class: "fill-gray" %>

decidim-proposals/app/views/decidim/proposals/proposals/_vote_button.html.erb

@@ -35,7 +35,7 @@
             <span class="sr-only"><%= decidim_html_escape(present(proposal).title) %></span>
           <% end %>
         <% else %>
-          <% if proposal.maximum_votes_reached? && !proposal.can_accumulate_supports_beyond_threshold && current_component.participatory_space.can_participate?(current_user) %>
+          <% if proposal.maximum_votes_reached? && !proposal.can_accumulate_votes_beyond_threshold && current_component.participatory_space.can_participate?(current_user) %>
             <%= content_tag :button, t("decidim.proposals.proposals.vote_button.maximum_votes_reached"), class: button_classes, disabled: true %>
           <% else %>
             <% if vote_limit_enabled? && remaining_votes_count_for(current_user) == 0 %>

decidim-proposals/app/views/decidim/proposals/proposals/_voting_rules.html.erb

@@ -14,8 +14,8 @@
           <li><%= t(".threshold_per_proposal.description", limit: threshold_per_proposal) %></li>
         <% end %>
 
-        <% if can_accumulate_supports_beyond_threshold? %>
-          <li><%= t(".can_accumulate_supports_beyond_threshold.description", limit: threshold_per_proposal) %></li>
+        <% if can_accumulate_votes_beyond_threshold? %>
+          <li><%= t(".can_accumulate_votes_beyond_threshold.description", limit: threshold_per_proposal) %></li>
         <% end %>
 
         <% if minimum_votes_per_user_enabled? %>
@@ -24,7 +24,7 @@
             <% if votes_given >= minimum_votes_per_user %>
               <%= t(".minimum_votes_per_user.given_enough_votes") %>
             <% else %>
-              <%= t(".minimum_votes_per_user.supports_remaining", remaining_votes: minimum_votes_per_user - votes_given) %>
+              <%= t(".minimum_votes_per_user.votes_remaining", remaining_votes: minimum_votes_per_user - votes_given) %>
             <% end %>
           </li>
         <% end %>

decidim-proposals/app/views/decidim/proposals/proposals/participatory_texts/_proposal_vote_button.html.erb

@@ -33,7 +33,7 @@
           <span><%= decidim_html_escape(present(proposal).title) %></span>
         <% end %>
       <% else %>
-        <% if proposal.maximum_votes_reached? && !proposal.can_accumulate_supports_beyond_threshold && current_component.participatory_space.can_participate?(current_user) %>
+        <% if proposal.maximum_votes_reached? && !proposal.can_accumulate_votes_beyond_threshold && current_component.participatory_space.can_participate?(current_user) %>
           <%= content_tag :span, t("decidim.proposals.proposals.vote_button.maximum_votes_reached"), class: "column button light button--sc disabled", disabled: true %>
         <% else %>
           <% if vote_limit_enabled? && remaining_votes_count_for(current_user) == 0 %>

decidim-proposals/app/views/decidim/proposals/proposals/participatory_texts/_proposal_votes_count.html.erb

@@ -17,7 +17,7 @@
         <%= proposal.proposal_votes_count || 0 %>
       </button>
     <% else %>
-      <% if proposal.maximum_votes_reached? && !proposal.can_accumulate_supports_beyond_threshold && current_component.participatory_space.can_participate?(current_user) %>
+      <% if proposal.maximum_votes_reached? && !proposal.can_accumulate_votes_beyond_threshold && current_component.participatory_space.can_participate?(current_user) %>
         <button type="button" name="button" class="column button button--sc disabled" disabled id="proposal-<%= proposal.id %>-votes-count">
           <%= proposal.proposal_votes_count || 0 %>
         </button>