fix modal title

openpoke · Nov 2, 2023 · 4979640 · 4979640
1 parent ed1776d
commit 4979640
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/app/cells/decidim/decidim_awesome/voting/voting_cards_proposal/show.erb b/app/cells/decidim/decidim_awesome/voting/voting_cards_proposal/show.erb
@@ -11,7 +11,7 @@
                                 voted_for?(0) ? t("decidim.decidim_awesome.voting.voting_cards.abstained") : proposal.manifest.label_for(0),
                                 proposal_vote_path(0),
                                 link_options(0).merge({
-                                  title: t("decidim.decidim_awesome.voting.voting_cards.voting_for", type: proposal.manifest.label_for(0)),
+                                  title: t("decidim.decidim_awesome.voting.voting_cards.voting_for", proposal: translated_attribute(proposal.title), type: proposal.manifest.label_for(0)),
                                   class: "button expanded vote-action abstain-button small #{classes_for(0)}"
                                   }) %>
 <% end %>

diff --git a/app/cells/decidim/decidim_awesome/voting/voting_cards_proposal/vote_block_for.erb b/app/cells/decidim/decidim_awesome/voting/voting_cards_proposal/vote_block_for.erb
@@ -8,7 +8,7 @@
                                   **link_options(weight) do %>
       <span class="vote-label"><%= proposal.manifest.label_for(weight) %></span>
       <%= content_tag :svg, role: "img" do
-        content_tag(:title, t("decidim.decidim_awesome.voting.voting_cards.voting_for", type: proposal.manifest.label_for(weight))) +
+        content_tag(:title, t("decidim.decidim_awesome.voting.voting_cards.voting_for", proposal: translated_attribute(proposal.title), type: proposal.manifest.label_for(weight))) +
         content_tag(:use, "", "href" => svg_path(weight))
       end %>
     <% end %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -527,7 +527,7 @@ en:
             skip: Check here to skip this window in the future
           vote_button: Click to vote
           voted: Voted
-          voting_for: My vote is "%{type}"
+          voting_for: My vote is on "%{proposal}" is "%{type}"
           weights:
             a: A
             g: G

diff --git a/spec/system/voting_cards_spec.rb b/spec/system/voting_cards_spec.rb
@@ -55,7 +55,7 @@
 
       click_link "Abstain"
       within ".vote_proposal_modal" do
-        expect(page).to have_content('My vote is "Abstain"')
+        expect(page).to have_content("My vote on \"#{proposals_title}\" is \"Abstain\"")
         expect(page).to have_content("Please read the election rules carefully to understand how your vote will be used by #{organization.name}")
         click_button "Cancel"
       end
@@ -64,7 +64,7 @@
           click_link color
         end
         within ".vote_proposal_modal" do
-          expect(page).to have_content("My vote is \"#{color}\"")
+          expect(page).to have_content("My vote on \"#{proposals_title}\" is \"#{color}\"")
           click_button "Cancel"
         end
       end