From dac6c714cf15741b97a637454327bc818498d5a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 1 Apr 2022 16:19:08 +0200 Subject: [PATCH 1/9] Use "help with" instead of "help about" As suggested by Pomerange; the "help about" construction indeed sounds a bit strange. --- config/locales/en/general.yml | 12 ++++++------ config/locales/en/legislation.yml | 4 ++-- .../site_customization/information_texts_spec.rb | 8 ++++---- .../site_customization/information_texts_spec.rb | 12 ++++++------ 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 8fdff4448..982722474 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -115,9 +115,9 @@ en: section_header: icon_alt: Debates icon title: Debates - help: Help about debates + help: Help with debates section_footer: - title: Help about debates + title: Help with debates description: Start a debate to share opinions with others about the topics you are concerned about. help_text_1: "The space for citizen debates is aimed at anyone who can expose issues of their concern and those who want to share opinions with other people." help_text_2: 'To open a debate you need to sign up on %{org}. Users can also comment on open debates and rate them with the "I agree" or "I disagree" buttons found in each of them.' @@ -378,9 +378,9 @@ en: section_header: icon_alt: Proposals icon title: Proposals - help: Help about proposals + help: Help with proposals section_footer: - title: Help about proposals + title: Help with proposals description: Citizens' proposals are an opportunity for neighbours and collectives to decide directly how they want their city to be, after getting sufficient support and submitting to a citizens' vote. new: form: @@ -610,9 +610,9 @@ en: section_header: icon_alt: Voting icon title: Voting - help: Help about voting + help: Help with voting section_footer: - title: Help about voting + title: Help with voting description: Citizens' polls are a participatory mechanism by which citizens with voting rights can make direct decisions no_polls: "There are no open votings." show: diff --git a/config/locales/en/legislation.yml b/config/locales/en/legislation.yml index 2e777da2a..8fd58bc28 100644 --- a/config/locales/en/legislation.yml +++ b/config/locales/en/legislation.yml @@ -64,9 +64,9 @@ en: section_header: icon_alt: Collaborative legislation icon title: Collaborative legislation - help: Help about collaborative legislation + help: Help with collaborative legislation section_footer: - title: Help about collaborative legislation + title: Help with collaborative legislation description: Participate in the debates and processes prior to the approval of new regulations or strategies. Your opinion will be considered. phase_not_open: not_open: This phase is not open yet diff --git a/spec/system/admin/site_customization/information_texts_spec.rb b/spec/system/admin/site_customization/information_texts_spec.rb index a887ffca4..ff25bc967 100644 --- a/spec/system/admin/site_customization/information_texts_spec.rb +++ b/spec/system/admin/site_customization/information_texts_spec.rb @@ -5,10 +5,10 @@ describe "Admin custom information texts", :admin do visit admin_site_customization_information_texts_path click_link "Basic customization" - expect(page).to have_content "Help about debates" - expect(page).to have_content "Help about proposals" - expect(page).to have_content "Help about voting" - expect(page).to have_content "Help about collaborative legislation" + expect(page).to have_content "Help with debates" + expect(page).to have_content "Help with proposals" + expect(page).to have_content "Help with voting" + expect(page).to have_content "Help with collaborative legislation" expect(page).to have_content "Help with participatory budgets" within("#information-texts-tabs") { click_link "Debates" } diff --git a/spec/system/site_customization/information_texts_spec.rb b/spec/system/site_customization/information_texts_spec.rb index 9fa2de356..016ac6417 100644 --- a/spec/system/site_customization/information_texts_spec.rb +++ b/spec/system/site_customization/information_texts_spec.rb @@ -6,25 +6,25 @@ describe "Custom information texts", :admin do proposal_key = "proposals.index.section_footer.title" visit admin_site_customization_information_texts_path(tab: "debates") - fill_in "contents[content_#{debate_key}]values[value_en]", with: "Custom help about debates" + fill_in "contents[content_#{debate_key}]values[value_en]", with: "Custom help with debates" click_button "Save" visit admin_site_customization_information_texts_path(tab: "proposals") - fill_in "contents[content_#{proposal_key}]values[value_en]", with: "Custom help about proposals" + fill_in "contents[content_#{proposal_key}]values[value_en]", with: "Custom help with proposals" click_button "Save" visit debates_path within("#section_help") do - expect(page).to have_content "Custom help about debates" - expect(page).not_to have_content "Help about debates" + expect(page).to have_content "Custom help with debates" + expect(page).not_to have_content "Help with debates" end visit proposals_path within("#section_help") do - expect(page).to have_content "Custom help about proposals" - expect(page).not_to have_content "Help about proposals" + expect(page).to have_content "Custom help with proposals" + expect(page).not_to have_content "Help with proposals" end end From d776923ffea74588a212b0e028509c618b013b52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 1 Apr 2022 16:26:03 +0200 Subject: [PATCH 2/9] Use "withdraw" instead of "retire" We used "retire" because we translated it literally from the Spanish verb "retirar" which can mean both "retire" and "withdraw". Note we're still using "retire" in database fields and method names; changing that might make it harder to upgrade from a previous version of CONSUL. --- config/locales/en/activerecord.yml | 2 +- config/locales/en/admin.yml | 2 +- config/locales/en/general.yml | 22 +++++++++--------- spec/models/related_content_spec.rb | 2 +- spec/system/dashboard/dashboard_spec.rb | 2 +- spec/system/proposal_notifications_spec.rb | 2 +- spec/system/proposals_spec.rb | 26 +++++++++++----------- spec/system/users_spec.rb | 4 ++-- 8 files changed, 31 insertions(+), 31 deletions(-) diff --git a/config/locales/en/activerecord.yml b/config/locales/en/activerecord.yml index d02d6499c..6b9af4a44 100644 --- a/config/locales/en/activerecord.yml +++ b/config/locales/en/activerecord.yml @@ -256,7 +256,7 @@ en: question: "Question" description: "Description" responsible_name: "Full name of the person submitting the proposal" - retired_reason: "Reason to retire the proposal" + retired_reason: "Reason to withdraw the proposal" selected: "Mark as selected" terms_of_service: "Terms of service" video_url: "External video URL" diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index e234e08dc..4ef0cdb33 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -807,7 +807,7 @@ en: segment_recipient: all_users: All users administrators: Administrators - all_proposal_authors: Proposal authors (including archived and retired) + all_proposal_authors: Proposal authors (including archived and withdrawn) proposal_authors: Proposal authors investment_authors: Investment authors in the current budget feasible_and_undecided_investment_authors: "Authors of some investment in the current budget that does not comply with: [valuation finished unfesasible]" diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 982722474..ca2df47cc 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -195,7 +195,7 @@ en: proposal_header: published: Published draft: Draft - retired: Retired + retired: Withdrawn proposal_totals: active_resources: Active resources community: Participants in your community @@ -312,11 +312,11 @@ en: submit_button: Save changes show_link: View proposal retire_form: - title: Retire proposal - warning: "If you retire the proposal it would still accept supports, but will be removed from the main list and a message will be visible to all users stating that the author considers the proposal should not be supported anymore" + title: Withdraw proposal + warning: "If you withdraw the proposal it will still accept supports, but will be removed from the main list and a message will be visible to all users stating that the author considers the proposal should not be supported anymore" retired_reason_blank: Choose an option retired_explanation_placeholder: Explain shortly why you think this proposal should not receive more supports - submit_button: Retire proposal + submit_button: Withdraw proposal retire_options: duplicated: Duplicated started: Already underway @@ -351,8 +351,8 @@ en: actions: success: "Recommendations for proposals are now disabled for this account" error: "An error has occured. Please go to 'My account' page to manually disable recommendations for proposals" - retired_proposals: Retired proposals - retired_proposals_link: "Proposals retired by the author" + retired_proposals: Withdrawn proposals + retired_proposals_link: "Proposals withdrawn by the author" selected_proposals: Selected proposals selected_proposals_link: View selected proposals archived_proposals: Archived proposals @@ -392,7 +392,7 @@ en: recommendations_title: Recommendations for creating a proposal start_new: Create new proposal notice: - retired: Proposal retired + retired: The proposal has been withdrawn published: The proposal has been published proposal: created: "You've created a proposal!" @@ -436,7 +436,7 @@ en: milestones_tab: Milestones retired_warning: "The author considers this proposal should not receive more supports." retired_warning_link_to_explanation: Read the explanation before voting for it. - retired: Proposal retired by the author + retired: Proposal withdrawn by the author share: Share no_notifications: "This proposal has no notifications." embed_video_title: "Video on %{proposal}" @@ -476,7 +476,7 @@ en: title: Edition edit_proposal_link: Edit proposal publish: Publish proposal - retire: Retire proposal + retire: Withdraw proposal new_request: links: Links resources: @@ -837,12 +837,12 @@ en: send_private_message: "Send private message" delete_alert: "Are you sure you want to delete your investment project? This action can't be undone" proposals: - retired: "Retired proposal" + retired: "Withdrawn proposal" draft: Draft published: Published see: "See proposal" actions: Actions - retired_help_text: Dashboard not available for retired proposals + retired_help_text: Dashboard not available for withdrawn proposals votes: agree: I agree agree_label: "I agree with %{title}" diff --git a/spec/models/related_content_spec.rb b/spec/models/related_content_spec.rb index 2ccc62f09..827a50597 100644 --- a/spec/models/related_content_spec.rb +++ b/spec/models/related_content_spec.rb @@ -91,7 +91,7 @@ describe RelatedContent do expect(parent_relationable.relationed_contents).to eq [child_relationable] end - it "returns related contents without retired proposals" do + it "returns related contents without withdrawn proposals" do create( :related_content, parent_relationable: parent_relationable, diff --git a/spec/system/dashboard/dashboard_spec.rb b/spec/system/dashboard/dashboard_spec.rb index 1d423c4d3..97ee9d466 100644 --- a/spec/system/dashboard/dashboard_spec.rb +++ b/spec/system/dashboard/dashboard_spec.rb @@ -9,7 +9,7 @@ describe "Proposal's dashboard" do expect(page).to have_link("Edit my proposal") expect(page).to have_link("Edit proposal") - expect(page).to have_link("Retire proposal") + expect(page).to have_link("Withdraw proposal") expect(page).to have_link("Publish proposal") expect(page).to have_link("Polls") expect(page).to have_link("E-mail") diff --git a/spec/system/proposal_notifications_spec.rb b/spec/system/proposal_notifications_spec.rb index f41be4d65..d15889dcc 100644 --- a/spec/system/proposal_notifications_spec.rb +++ b/spec/system/proposal_notifications_spec.rb @@ -310,7 +310,7 @@ describe "Proposal Notifications" do expect(page).to have_content "This resource is not available anymore" end - scenario "Proposal retired by author" do + scenario "Proposal withdrawn by its author" do author = create(:user) user = create(:user) proposal = create(:proposal, :retired, author: author, followers: [user]) diff --git a/spec/system/proposals_spec.rb b/spec/system/proposals_spec.rb index 8c59e4a1f..3a05e4f63 100644 --- a/spec/system/proposals_spec.rb +++ b/spec/system/proposals_spec.rb @@ -585,8 +585,8 @@ describe "Proposals" do end end - context "Retired proposals" do - scenario "Retire" do + context "Withdrawn proposals" do + scenario "Withdraw" do proposal = create(:proposal) login_as(proposal.author) @@ -599,20 +599,20 @@ describe "Proposals" do click_link "Edit my proposal" end - within_window(window_opened_by { click_link "Retire proposal" }) do + within_window(window_opened_by { click_link "Withdraw proposal" }) do expect(page).to have_current_path(retire_form_proposal_path(proposal)) select "Duplicated", from: "proposal_retired_reason" fill_in "Explanation", with: "There are three other better proposals with the same subject" - click_button "Retire proposal" + click_button "Withdraw proposal" - expect(page).to have_content "Proposal retired" + expect(page).to have_content "The proposal has been withdrawn" end visit proposal_path(proposal) expect(page).to have_content proposal.title - expect(page).to have_content "Proposal retired by the author" + expect(page).to have_content "Proposal withdrawn by the author" expect(page).to have_content "Duplicated" expect(page).to have_content "There are three other better proposals with the same subject" end @@ -623,13 +623,13 @@ describe "Proposals" do visit retire_form_proposal_path(proposal) - click_button "Retire proposal" + click_button "Withdraw proposal" - expect(page).not_to have_content "Proposal retired" + expect(page).not_to have_content "The proposal has been withdrawn" expect(page).to have_content "can't be blank", count: 2 end - scenario "Index do not list retired proposals by default" do + scenario "Index does not list withdrawn proposals by default" do Setting["feature.featured_proposals"] = true create_featured_proposals not_retired = create(:proposal) @@ -644,20 +644,20 @@ describe "Proposals" do end end - scenario "Index has a link to retired proposals list" do + scenario "Index has a link to the list of withdrawn proposals" do not_retired = create(:proposal) retired = create(:proposal, :retired) visit proposals_path expect(page).not_to have_content retired.title - click_link "Proposals retired by the author" + click_link "Proposals withdrawn by the author" expect(page).to have_content retired.title expect(page).not_to have_content not_retired.title end - scenario "Retired proposals index interface elements" do + scenario "Withdrawn proposals index interface elements" do visit proposals_path(retired: "all") expect(page).not_to have_content "Advanced search" @@ -665,7 +665,7 @@ describe "Proposals" do expect(page).not_to have_content "Districts" end - scenario "Retired proposals index has links to filter by retired_reason" do + scenario "Withdrawn proposals index has links to filter by retired_reason" do unfeasible = create(:proposal, :retired, retired_reason: "unfeasible") duplicated = create(:proposal, :retired, retired_reason: "duplicated") diff --git a/spec/system/users_spec.rb b/spec/system/users_spec.rb index 127bb1b11..bae98741f 100644 --- a/spec/system/users_spec.rb +++ b/spec/system/users_spec.rb @@ -349,7 +349,7 @@ describe "Users" do expect(page).to have_content proposal.title end - scenario "Retired proposals do not have a link to the dashboard" do + scenario "Withdrawn proposals do not have a link to the dashboard" do proposal = create(:proposal, :retired, author: user) login_as user @@ -357,7 +357,7 @@ describe "Users" do expect(page).to have_content proposal.title expect(page).not_to have_link "Dashboard" - expect(page).to have_content("Dashboard not available for retired proposals") + expect(page).to have_content "Dashboard not available for withdrawn proposals" end scenario "Published proposals have a link to the dashboard" do From 4ddcfb2f2aa4b7144712018522d28348485957d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 1 Apr 2022 16:31:53 +0200 Subject: [PATCH 3/9] Use "participate in" instead of "participate on" As suggested by Pomerange. --- config/locales/en/general.yml | 8 ++++---- config/locales/en/verification.yml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index ca2df47cc..7fa2d102d 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -11,14 +11,14 @@ en: save_changes_submit: Save changes recommendations: Recommendations title: My account - user_permission_debates: Participate on debates + user_permission_debates: Participate in debates user_permission_info: With your account you can... user_permission_proposal: Create new proposals user_permission_support_proposal: Support proposals user_permission_title: Participation user_permission_verify: To perform all the actions verify your account. user_permission_verify_info: "* Only for users on Census." - user_permission_votes: Participate on final voting + user_permission_votes: Participate in final voting verified_account: Account verified verify_my_account: Verify my account application: @@ -893,14 +893,14 @@ en: go_to_index: Not now, go to index page start_using_consul: Go to index page title: Participate - user_permission_debates: Participate on debates + user_permission_debates: Participate in debates user_permission_info: With your account you can... user_permission_proposal: Create new proposals user_permission_support_proposal: Support proposals* user_permission_verify: "To perform the following actions verify your account." user_permission_verify_info: "* Only for users on Census." user_permission_verify_my_account: Verify my account - user_permission_votes: Participate on final voting + user_permission_votes: Participate in final voting invisible_captcha: sentence_for_humans: "If you are human, ignore this field" timestamp_error_message: "Sorry, that was too quick! Please resubmit." diff --git a/config/locales/en/verification.yml b/config/locales/en/verification.yml index e1bdb2883..818769a39 100644 --- a/config/locales/en/verification.yml +++ b/config/locales/en/verification.yml @@ -26,7 +26,7 @@ en: errors: incorrect_code: Verification code incorrect new: - explanation: "For participate on final voting you can:" + explanation: "In order to participate in final voting you can:" go_to_index: See proposals office: Verify in any Citizen Support Offices send_letter: Send me a letter with the code @@ -87,11 +87,11 @@ en: step_1: Residence step_2: Confirmation code step_3: Final verification - user_permission_debates: Participate on debates + user_permission_debates: Participate in debates user_permission_info: Verifying your information you'll be able to... user_permission_proposal: Create new proposals user_permission_support_proposal: Support proposals* - user_permission_votes: Participate on final voting* + user_permission_votes: Participate in final voting* verified_user: form: submit_button: Send code From 647a7dc4350d78f65fa84ca01d2de6c595028ddd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 1 Apr 2022 16:33:13 +0200 Subject: [PATCH 4/9] Fix text to subscribe to a newsletter In English, circumstancial complements usually go after the direct complement. --- config/locales/en/activerecord.yml | 2 +- spec/components/subscriptions/edit_component_spec.rb | 2 +- spec/system/emails_spec.rb | 2 +- spec/system/subscriptions_spec.rb | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/locales/en/activerecord.yml b/config/locales/en/activerecord.yml index 6b9af4a44..62aafbea2 100644 --- a/config/locales/en/activerecord.yml +++ b/config/locales/en/activerecord.yml @@ -276,7 +276,7 @@ en: email_on_comment: "Notify me by email when someone comments on my contents" email_on_comment_reply: "Notify me by email when someone replies to my comments" email_on_direct_message: "Receive emails about direct messages" - newsletter: "Receive by email website relevant information" + newsletter: "Receive relevant information by email" official_position: "Official position" official_position_badge: "Show official position badge" official_level: "Official level" diff --git a/spec/components/subscriptions/edit_component_spec.rb b/spec/components/subscriptions/edit_component_spec.rb index 4e8fa6323..53563feb6 100644 --- a/spec/components/subscriptions/edit_component_spec.rb +++ b/spec/components/subscriptions/edit_component_spec.rb @@ -10,7 +10,7 @@ describe Subscriptions::EditComponent do expect(page).to have_content "Notifications" expect(page).to have_field "Notify me by email when someone comments on my contents", type: :checkbox expect(page).to have_field "Notify me by email when someone replies to my comments", type: :checkbox - expect(page).to have_field "Receive by email website relevant information", type: :checkbox + expect(page).to have_field "Receive relevant information by email", type: :checkbox expect(page).to have_field "Receive a summary of proposal notifications", type: :checkbox expect(page).to have_field "Receive emails about direct messages", type: :checkbox expect(page).to have_button "Save changes" diff --git a/spec/system/emails_spec.rb b/spec/system/emails_spec.rb index 1231106ef..1e3ef1b82 100644 --- a/spec/system/emails_spec.rb +++ b/spec/system/emails_spec.rb @@ -497,7 +497,7 @@ describe "Emails" do expect(email).to have_body_text("To unsubscribe from these emails, visit") expect(email).to have_body_text( edit_subscriptions_path(token: user_with_newsletter_in_segment_2.subscriptions_token)) - expect(email).to have_body_text('and uncheck "Receive by email website relevant information"') + expect(email).to have_body_text('and uncheck "Receive relevant information by email"') end end diff --git a/spec/system/subscriptions_spec.rb b/spec/system/subscriptions_spec.rb index 8cc6b7244..063fcafdc 100644 --- a/spec/system/subscriptions_spec.rb +++ b/spec/system/subscriptions_spec.rb @@ -35,7 +35,7 @@ describe "Subscriptions" do check "Notify me by email when someone comments on my contents" uncheck "Notify me by email when someone replies to my comments" - uncheck "Receive by email website relevant information" + uncheck "Receive relevant information by email" check "Receive a summary of proposal notifications" uncheck "Receive emails about direct messages" click_button "Save changes" @@ -43,7 +43,7 @@ describe "Subscriptions" do expect(page).to have_content "Changes saved" expect(page).to have_field "Notify me by email when someone comments on my contents", checked: true expect(page).to have_field "Notify me by email when someone replies to my comments", checked: false - expect(page).to have_field "Receive by email website relevant information", checked: false + expect(page).to have_field "Receive relevant information by email", checked: false expect(page).to have_field "Receive a summary of proposal notifications", checked: true expect(page).to have_field "Receive emails about direct messages", checked: false end From 541c434e7d37ac8aeb63232b6880778a9a7d5246 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 1 Apr 2022 16:37:14 +0200 Subject: [PATCH 5/9] Fix show/hide recommendations text As suggested by Pomerange; "proposals" sounded strange as an adjective. --- config/locales/en/activerecord.yml | 4 ++-- config/locales/en/general.yml | 4 ++-- spec/system/account_spec.rb | 24 ++++++++++-------------- 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/config/locales/en/activerecord.yml b/config/locales/en/activerecord.yml index 62aafbea2..c9e4cd7c6 100644 --- a/config/locales/en/activerecord.yml +++ b/config/locales/en/activerecord.yml @@ -283,8 +283,8 @@ en: phone_number: "Phone number" public_activity: "Keep my list of activities public" public_interests: "Keep the elements I follow public" - recommended_debates: "Show debates recommendations" - recommended_proposals: "Show proposals recommendations" + recommended_debates: "Recommend debates to me" + recommended_proposals: "Recommend proposals to me" redeemable_code: "Verification code received via email" direct_message: title: "Title" diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 7fa2d102d..215ea9020 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -102,7 +102,7 @@ en: recommendations: without_results: There are no debates related to your interests without_interests: Follow proposals so we can give you recommendations - disable: "Debates recommendations will stop showing if you dismiss them. You can enable them again in 'My account' page" + disable: "Recommendations for debates will stop showing if you dismiss them. You can enable them again in 'My account' page" actions: success: "Recommendations for debates are now disabled for this account" error: "An error has occured. Please go to 'My account' page to manually disable recommendations for debates" @@ -347,7 +347,7 @@ en: recommendations: without_results: There are not proposals related to your interests without_interests: Follow proposals so we can give you recommendations - disable: "Proposals recommendations will stop showing if you dismiss them. You can enable them again in 'My account' page" + disable: "Recommendations for proposals will stop showing if you dismiss them. You can enable them again in 'My account' page" actions: success: "Recommendations for proposals are now disabled for this account" error: "An error has occured. Please go to 'My account' page to manually disable recommendations for proposals" diff --git a/spec/system/account_spec.rb b/spec/system/account_spec.rb index 63334d348..f1d0ea301 100644 --- a/spec/system/account_spec.rb +++ b/spec/system/account_spec.rb @@ -199,31 +199,27 @@ describe "Account" do scenario "are enabled by default" do visit account_path - expect(page).to have_content("Recommendations") - expect(page).to have_content("Show debates recommendations") - expect(page).to have_content("Show proposals recommendations") - expect(find("#account_recommended_debates")).to be_checked - expect(find("#account_recommended_proposals")).to be_checked + expect(page).to have_content "Recommendations" + expect(page).to have_field "Recommend debates to me", checked: true + expect(page).to have_field "Recommend proposals to me", checked: true end scenario "can be disabled through 'My account' page" do visit account_path - expect(page).to have_content("Recommendations") - expect(page).to have_content("Show debates recommendations") - expect(page).to have_content("Show proposals recommendations") - expect(find("#account_recommended_debates")).to be_checked - expect(find("#account_recommended_proposals")).to be_checked + expect(page).to have_content "Recommendations" + expect(page).to have_field "Recommend debates to me", checked: true + expect(page).to have_field "Recommend proposals to me", checked: true - uncheck "account_recommended_debates" - uncheck "account_recommended_proposals" + uncheck "Recommend debates to me" + uncheck "Recommend proposals to me" click_button "Save changes" expect(page).to have_content "Changes saved" - expect(find("#account_recommended_debates")).not_to be_checked - expect(find("#account_recommended_proposals")).not_to be_checked + expect(page).to have_field "Recommend debates to me", checked: false + expect(page).to have_field "Recommend proposals to me", checked: false visit debates_path From ca4a0bd4b230e1551f0302598e52cf269b8603d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Thu, 5 May 2022 12:49:44 +0200 Subject: [PATCH 6/9] Use "login details" instead of "credentials" As suggested by Pomerange, "credentials" also refers to academic qualifications, and so might be confusing. --- config/locales/en/general.yml | 2 +- spec/system/account_spec.rb | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 215ea9020..fb672e02f 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -1,7 +1,7 @@ en: account: show: - change_credentials_link: Change my credentials + change_credentials_link: Change my login details erase_account_link: Erase my account finish_verification: Complete verification notifications: Notifications diff --git a/spec/system/account_spec.rb b/spec/system/account_spec.rb index f1d0ea301..ed1ab76b9 100644 --- a/spec/system/account_spec.rb +++ b/spec/system/account_spec.rb @@ -53,7 +53,7 @@ describe "Account" do scenario "Edit email address" do visit account_path - click_link "Change my credentials" + click_link "Change my login details" fill_in "user_email", with: "new_user_email@example.com" fill_in "user_password", with: "new_password" fill_in "user_password_confirmation", with: "new_password" @@ -80,7 +80,7 @@ describe "Account" do expect(page).to have_content "You have been signed in successfully." visit account_path - click_link "Change my credentials" + click_link "Change my login details" expect(page).to have_selector("input[value='new_user_email@example.com']") end @@ -150,8 +150,7 @@ describe "Account" do expect(page).to have_current_path(account_path, ignore_query: true) - expect(page).to have_link("Change my credentials") - click_link "Change my credentials" + click_link "Change my login details" click_button "Update" expect(page).to have_content error_message From 67e9c68662cf5b349bfdb249371614ecf4b21ce3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Thu, 5 May 2022 15:39:18 +0200 Subject: [PATCH 7/9] Remove confusing permission info in "my account" We were saying that actions marked with an asterisk were only possible when users were verified. However, there were no actions marked with an asterisk; instead, we didn't show these actions to non-verified users. Besides, the concept of Census doesn't exist in many CONSUL installations, where verification is done through other means, so the text saying that only users on Census could do certain things wasn't correct in these cases. Due to that, we're removing the asterisk in the Spanish version as well. We're also removing the asterisk in the default welcome pages, since we're already saying which action can't be done until the account is verified. In the case of the residence verification page, we had asterisks but we didn't explain what the asterisk stood for, so we're also removing it. --- app/views/account/show.html.erb | 3 --- config/locales/en/general.yml | 4 +--- config/locales/en/verification.yml | 4 ++-- config/locales/es/general.yml | 10 ++++------ config/locales/es/verification.yml | 2 +- db/pages/welcome_level_three_verified.rb | 2 -- db/pages/welcome_level_two_verified.rb | 2 -- db/pages/welcome_not_verified.rb | 2 -- 8 files changed, 8 insertions(+), 21 deletions(-) diff --git a/app/views/account/show.html.erb b/app/views/account/show.html.erb index f4f2fe010..1a1d4dbea 100644 --- a/app/views/account/show.html.erb +++ b/app/views/account/show.html.erb @@ -114,9 +114,6 @@ -

- <%= t("account.show.user_permission_verify_info") %> -

<%= t("account.show.user_permission_verify") %>

diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index fb672e02f..5065bac6c 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -17,7 +17,6 @@ en: user_permission_support_proposal: Support proposals user_permission_title: Participation user_permission_verify: To perform all the actions verify your account. - user_permission_verify_info: "* Only for users on Census." user_permission_votes: Participate in final voting verified_account: Account verified verify_my_account: Verify my account @@ -896,9 +895,8 @@ en: user_permission_debates: Participate in debates user_permission_info: With your account you can... user_permission_proposal: Create new proposals - user_permission_support_proposal: Support proposals* + user_permission_support_proposal: Support proposals user_permission_verify: "To perform the following actions verify your account." - user_permission_verify_info: "* Only for users on Census." user_permission_verify_my_account: Verify my account user_permission_votes: Participate in final voting invisible_captcha: diff --git a/config/locales/en/verification.yml b/config/locales/en/verification.yml index 818769a39..d760284ac 100644 --- a/config/locales/en/verification.yml +++ b/config/locales/en/verification.yml @@ -90,8 +90,8 @@ en: user_permission_debates: Participate in debates user_permission_info: Verifying your information you'll be able to... user_permission_proposal: Create new proposals - user_permission_support_proposal: Support proposals* - user_permission_votes: Participate in final voting* + user_permission_support_proposal: Support proposals + user_permission_votes: Participate in final voting verified_user: form: submit_button: Send code diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index a9cc36d3e..fc4bfdfc8 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -14,11 +14,10 @@ es: user_permission_debates: Participar en debates user_permission_info: Con tu cuenta ya puedes... user_permission_proposal: Crear nuevas propuestas - user_permission_support_proposal: Apoyar propuestas* + user_permission_support_proposal: Apoyar propuestas user_permission_title: Participación user_permission_verify: Para poder realizar todas las acciones, verifica tu cuenta. - user_permission_verify_info: "* Sólo usuarios empadronados." - user_permission_votes: Participar en las votaciones finales* + user_permission_votes: Participar en las votaciones finales verified_account: Cuenta verificada verify_my_account: Verificar mi cuenta application: @@ -896,11 +895,10 @@ es: user_permission_debates: Participar en debates user_permission_info: Con tu cuenta ya puedes... user_permission_proposal: Crear nuevas propuestas - user_permission_support_proposal: Apoyar propuestas* + user_permission_support_proposal: Apoyar propuestas user_permission_verify: "Para poder realizar las siguientes acciones, verifica tu cuenta." - user_permission_verify_info: "* Sólo usuarios empadronados." user_permission_verify_my_account: Verificar mi cuenta - user_permission_votes: Participar en las votaciones finales* + user_permission_votes: Participar en las votaciones finales invisible_captcha: sentence_for_humans: "Si eres humano, por favor ignora este campo" timestamp_error_message: "Eso ha sido demasiado rápido. Por favor, reenvía el formulario." diff --git a/config/locales/es/verification.yml b/config/locales/es/verification.yml index c3191438b..dea171c38 100644 --- a/config/locales/es/verification.yml +++ b/config/locales/es/verification.yml @@ -91,7 +91,7 @@ es: user_permission_info: Al verificar tus datos podrás... user_permission_proposal: Crear nuevas propuestas user_permission_support_proposal: Apoyar propuestas - user_permission_votes: Participar en las votaciones finales* + user_permission_votes: Participar en las votaciones finales verified_user: form: submit_button: Enviar código diff --git a/db/pages/welcome_level_three_verified.rb b/db/pages/welcome_level_three_verified.rb index 3c32afb88..e0805862a 100644 --- a/db/pages/welcome_level_three_verified.rb +++ b/db/pages/welcome_level_three_verified.rb @@ -9,8 +9,6 @@ def generate_content(page)
  • #{I18n.t("welcome.welcome.user_permission_votes")}
    • -

    #{I18n.t("welcome.welcome.user_permission_verify_info")}

    -

    #{I18n.t("account.show.verified_account")}

    #{I18n.t("welcome.welcome.start_using_consul")}

    " diff --git a/db/pages/welcome_level_two_verified.rb b/db/pages/welcome_level_two_verified.rb index daff9fc42..bf9e1376f 100644 --- a/db/pages/welcome_level_two_verified.rb +++ b/db/pages/welcome_level_two_verified.rb @@ -13,8 +13,6 @@ def generate_content(page)
  • #{I18n.t("welcome.welcome.user_permission_votes")}
    • -

    #{I18n.t("welcome.welcome.user_permission_verify_info")}

    - #{I18n.t("welcome.welcome.user_permission_verify_my_account")} diff --git a/db/pages/welcome_not_verified.rb b/db/pages/welcome_not_verified.rb index 1922c1e80..a0d66fe68 100644 --- a/db/pages/welcome_not_verified.rb +++ b/db/pages/welcome_not_verified.rb @@ -13,8 +13,6 @@ def generate_content(page)
  • #{I18n.t("welcome.welcome.user_permission_votes")}
    • -

    #{I18n.t("welcome.welcome.user_permission_verify_info")}

    - #{I18n.t("welcome.welcome.user_permission_verify_my_account")} From 92b1e53fc3b8295e43beeef341d88f03d8de0e38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Thu, 5 May 2022 16:11:26 +0200 Subject: [PATCH 8/9] Unify user permission texts We had the same texts four times, with slight variations in the case of the management section. We're unifying them under the "verification" i18n namespace, since the texts are about actions which can be done depending on whether users are verified or not. Note the names of the i18n keys aren't very consistent, since we use "debates" in plural but "proposal" in singular. We're leaving it like this so existing translations aren't affected. --- app/views/account/show.html.erb | 8 ++++---- app/views/management/_user_permissions.html.erb | 4 ++-- .../document_verifications/invalid_document.html.erb | 2 +- app/views/management/document_verifications/new.html.erb | 2 +- .../management/document_verifications/verified.html.erb | 2 +- app/views/management/email_verifications/sent.html.erb | 2 +- app/views/management/users/new.html.erb | 2 +- app/views/management/users/show.html.erb | 2 +- config/locales/en/general.yml | 8 -------- config/locales/en/management.yml | 5 ----- config/locales/es/general.yml | 8 -------- config/locales/es/management.yml | 5 ----- db/pages/welcome_level_three_verified.rb | 8 ++++---- db/pages/welcome_level_two_verified.rb | 8 ++++---- db/pages/welcome_not_verified.rb | 8 ++++---- spec/system/management/document_verifications_spec.rb | 2 +- spec/system/management/managed_users_spec.rb | 2 +- 17 files changed, 26 insertions(+), 52 deletions(-) diff --git a/app/views/account/show.html.erb b/app/views/account/show.html.erb index 1a1d4dbea..22a1462cd 100644 --- a/app/views/account/show.html.erb +++ b/app/views/account/show.html.erb @@ -94,15 +94,15 @@

    <%= t("account.show.user_permission_info") %>

      -
    •  <%= t("account.show.user_permission_debates") %>
      • -
    •  <%= t("account.show.user_permission_proposal") %>
      • +
    •  <%= t("verification.user_permission_debates") %>
      • +
    •  <%= t("verification.user_permission_proposal") %>
    • <% if current_user.level_two_or_three_verified? %> <% else %> <% end %> - <%= t("account.show.user_permission_support_proposal") %> + <%= t("verification.user_permission_support_proposal") %>
    • <% if current_user.level_three_verified? %> @@ -110,7 +110,7 @@ <% else %> <% end %> - <%= t("account.show.user_permission_votes") %> + <%= t("verification.user_permission_votes") %>
    diff --git a/app/views/management/_user_permissions.html.erb b/app/views/management/_user_permissions.html.erb index f083cd322..37556f138 100644 --- a/app/views/management/_user_permissions.html.erb +++ b/app/views/management/_user_permissions.html.erb @@ -7,10 +7,10 @@

    <%= message %>

      - <% [:debates, :create_proposals, :support_proposals, :vote_proposals].each do |permission| %> + <% [:debates, :proposal, :support_proposal, :votes].each do |permission| %>
    • "> - <%= t("management.permissions.#{permission}") %> + <%= t("verification.user_permission_#{permission}") %>
      • <% end %>
    diff --git a/app/views/management/document_verifications/invalid_document.html.erb b/app/views/management/document_verifications/invalid_document.html.erb index 936e946c6..8de89d6f9 100644 --- a/app/views/management/document_verifications/invalid_document.html.erb +++ b/app/views/management/document_verifications/invalid_document.html.erb @@ -8,7 +8,7 @@ <%= render "management/user_permissions", message: t("management.document_verifications.not_in_census_info"), - permissions: [:debates, :create_proposals] %> + permissions: [:debates, :proposal] %>

    <%= sanitize(t("management.document_verifications.has_no_account", diff --git a/app/views/management/document_verifications/new.html.erb b/app/views/management/document_verifications/new.html.erb index 230e94459..a816520c5 100644 --- a/app/views/management/document_verifications/new.html.erb +++ b/app/views/management/document_verifications/new.html.erb @@ -4,7 +4,7 @@ <%= render "management/user_permissions", message: t("management.document_verifications.in_census_has_following_permissions"), - permissions: [:debates, :create_proposals, :support_proposals] %> + permissions: [:debates, :proposal, :support_proposal] %> <%= form_for @document_verification, as: :document_verification, diff --git a/app/views/management/document_verifications/verified.html.erb b/app/views/management/document_verifications/verified.html.erb index c491e15c8..b20af33d3 100644 --- a/app/views/management/document_verifications/verified.html.erb +++ b/app/views/management/document_verifications/verified.html.erb @@ -4,6 +4,6 @@ <%= render "management/user_permissions", message: t("management.document_verifications.in_census_has_following_permissions"), - permissions: [:debates, :create_proposals, :support_proposals, :vote_proposals] %> + permissions: [:debates, :proposal, :support_proposal, :votes] %> <%= t("management.print_info") %> diff --git a/app/views/management/email_verifications/sent.html.erb b/app/views/management/email_verifications/sent.html.erb index a996ead96..9eae46bff 100644 --- a/app/views/management/email_verifications/sent.html.erb +++ b/app/views/management/email_verifications/sent.html.erb @@ -4,7 +4,7 @@ <%= render "management/user_permissions", message: t("management.email_verifications.document_found_in_census"), - permissions: [:debates, :create_proposals, :support_proposals, :vote_proposals] %> + permissions: [:debates, :proposal, :support_proposal, :votes] %>

    <%= t("management.print_info") %> diff --git a/app/views/management/users/new.html.erb b/app/views/management/users/new.html.erb index cc62812be..632ce1cf7 100644 --- a/app/views/management/users/new.html.erb +++ b/app/views/management/users/new.html.erb @@ -25,6 +25,6 @@

    <%= render "management/user_permissions", message: t("management.document_verifications.in_census_has_following_permissions"), - permissions: [:debates, :create_proposals, :support_proposals, :vote_proposals] %> + permissions: [:debates, :proposal, :support_proposal, :votes] %>
    diff --git a/app/views/management/users/show.html.erb b/app/views/management/users/show.html.erb index ea7f758b4..89bf3bba5 100644 --- a/app/views/management/users/show.html.erb +++ b/app/views/management/users/show.html.erb @@ -6,6 +6,6 @@ <%= render "management/user_permissions", message: t("management.document_verifications.in_census_has_following_permissions"), - permissions: [:debates, :create_proposals, :support_proposals, :vote_proposals] %> + permissions: [:debates, :proposal, :support_proposal, :votes] %> <%= t("management.print_info") %> diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 5065bac6c..20c977dc7 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -11,13 +11,9 @@ en: save_changes_submit: Save changes recommendations: Recommendations title: My account - user_permission_debates: Participate in debates user_permission_info: With your account you can... - user_permission_proposal: Create new proposals - user_permission_support_proposal: Support proposals user_permission_title: Participation user_permission_verify: To perform all the actions verify your account. - user_permission_votes: Participate in final voting verified_account: Account verified verify_my_account: Verify my account application: @@ -892,13 +888,9 @@ en: go_to_index: Not now, go to index page start_using_consul: Go to index page title: Participate - user_permission_debates: Participate in debates user_permission_info: With your account you can... - user_permission_proposal: Create new proposals - user_permission_support_proposal: Support proposals user_permission_verify: "To perform the following actions verify your account." user_permission_verify_my_account: Verify my account - user_permission_votes: Participate in final voting invisible_captcha: sentence_for_humans: "If you are human, ignore this field" timestamp_error_message: "Sorry, that was too quick! Please resubmit." diff --git a/config/locales/en/management.yml b/config/locales/en/management.yml index a66790849..85ad93a64 100644 --- a/config/locales/en/management.yml +++ b/config/locales/en/management.yml @@ -64,11 +64,6 @@ en: users: Users management user_invites: Send invitations select_user: Select user - permissions: - create_proposals: Create proposals - debates: Engage in debates - support_proposals: Support proposals - vote_proposals: Vote proposals print: proposals_info: Create your proposal on http://url.consul proposals_title: "Proposals:" diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index fc4bfdfc8..8dc487a97 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -11,13 +11,9 @@ es: save_changes_submit: Guardar cambios recommendations: Recomendaciones title: Mi cuenta - user_permission_debates: Participar en debates user_permission_info: Con tu cuenta ya puedes... - user_permission_proposal: Crear nuevas propuestas - user_permission_support_proposal: Apoyar propuestas user_permission_title: Participación user_permission_verify: Para poder realizar todas las acciones, verifica tu cuenta. - user_permission_votes: Participar en las votaciones finales verified_account: Cuenta verificada verify_my_account: Verificar mi cuenta application: @@ -892,13 +888,9 @@ es: go_to_index: Ahora no, ir a la página de inicio start_using_consul: Ir a la página de inicio title: Empieza a participar - user_permission_debates: Participar en debates user_permission_info: Con tu cuenta ya puedes... - user_permission_proposal: Crear nuevas propuestas - user_permission_support_proposal: Apoyar propuestas user_permission_verify: "Para poder realizar las siguientes acciones, verifica tu cuenta." user_permission_verify_my_account: Verificar mi cuenta - user_permission_votes: Participar en las votaciones finales invisible_captcha: sentence_for_humans: "Si eres humano, por favor ignora este campo" timestamp_error_message: "Eso ha sido demasiado rápido. Por favor, reenvía el formulario." diff --git a/config/locales/es/management.yml b/config/locales/es/management.yml index e0e018d90..3740fc3da 100644 --- a/config/locales/es/management.yml +++ b/config/locales/es/management.yml @@ -64,11 +64,6 @@ es: users: Gestión de usuarios user_invites: Enviar invitaciones select_user: Seleccionar usuario - permissions: - create_proposals: Crear nuevas propuestas - debates: Participar en debates - support_proposals: Apoyar propuestas - vote_proposals: Participar en las votaciones finales print: proposals_info: Haz tu propuesta en http://url.consul proposals_title: "Propuestas:" diff --git a/db/pages/welcome_level_three_verified.rb b/db/pages/welcome_level_three_verified.rb index e0805862a..5467f5917 100644 --- a/db/pages/welcome_level_three_verified.rb +++ b/db/pages/welcome_level_three_verified.rb @@ -3,10 +3,10 @@ def generate_content(page) page.content = "

    #{I18n.t("welcome.welcome.user_permission_info")}

      -
    • #{I18n.t("welcome.welcome.user_permission_debates")}
      • -
    • #{I18n.t("welcome.welcome.user_permission_proposal")}
      • -
    • #{I18n.t("welcome.welcome.user_permission_support_proposal")}
      • -
    • #{I18n.t("welcome.welcome.user_permission_votes")}
      • +
    • #{I18n.t("verification.user_permission_debates")}
      • +
    • #{I18n.t("verification.user_permission_proposal")}
      • +
    • #{I18n.t("verification.user_permission_support_proposal")}
      • +
    • #{I18n.t("verification.user_permission_votes")}

    #{I18n.t("account.show.verified_account")}

    diff --git a/db/pages/welcome_level_two_verified.rb b/db/pages/welcome_level_two_verified.rb index bf9e1376f..251fc6b04 100644 --- a/db/pages/welcome_level_two_verified.rb +++ b/db/pages/welcome_level_two_verified.rb @@ -3,14 +3,14 @@ def generate_content(page) page.content = "

    #{I18n.t("welcome.welcome.user_permission_info")}

      -
    • #{I18n.t("welcome.welcome.user_permission_debates")}
      • -
    • #{I18n.t("welcome.welcome.user_permission_proposal")}
      • -
    • #{I18n.t("welcome.welcome.user_permission_support_proposal")}
      • +
    • #{I18n.t("verification.user_permission_debates")}
      • +
    • #{I18n.t("verification.user_permission_proposal")}
      • +
    • #{I18n.t("verification.user_permission_support_proposal")}

    #{I18n.t("welcome.welcome.user_permission_verify")}

      -
    • #{I18n.t("welcome.welcome.user_permission_votes")}
      • +
    • #{I18n.t("verification.user_permission_votes")}
    diff --git a/db/pages/welcome_not_verified.rb b/db/pages/welcome_not_verified.rb index a0d66fe68..4263130f0 100644 --- a/db/pages/welcome_not_verified.rb +++ b/db/pages/welcome_not_verified.rb @@ -3,14 +3,14 @@ def generate_content(page) page.content = "

    #{I18n.t("welcome.welcome.user_permission_info")}

      -
    • #{I18n.t("welcome.welcome.user_permission_debates")}
      • -
    • #{I18n.t("welcome.welcome.user_permission_proposal")}
      • +
    • #{I18n.t("verification.user_permission_debates")}
      • +
    • #{I18n.t("verification.user_permission_proposal")}

    #{I18n.t("welcome.welcome.user_permission_verify")}

      -
    • #{I18n.t("welcome.welcome.user_permission_support_proposal")}
      • -
    • #{I18n.t("welcome.welcome.user_permission_votes")}
      • +
    • #{I18n.t("verification.user_permission_support_proposal")}
      • +
    • #{I18n.t("verification.user_permission_votes")}
     diff --git a/spec/system/management/document_verifications_spec.rb b/spec/system/management/document_verifications_spec.rb index 2396fac54..17080e85d 100644 --- a/spec/system/management/document_verifications_spec.rb +++ b/spec/system/management/document_verifications_spec.rb @@ -20,7 +20,7 @@ describe "DocumentVerifications" do fill_in "document_verification_document_number", with: user.document_number click_button "Check document" - expect(page).to have_content "Vote proposals" + expect(page).to have_content "Participate in final voting" click_button "Verify" diff --git a/spec/system/management/managed_users_spec.rb b/spec/system/management/managed_users_spec.rb index 2dc605ac0..2d12fa53b 100644 --- a/spec/system/management/managed_users_spec.rb +++ b/spec/system/management/managed_users_spec.rb @@ -34,7 +34,7 @@ describe "Managed User" do fill_in "document_verification_document_number", with: user.document_number click_button "Check document" - expect(page).to have_content "Vote proposals" + expect(page).to have_content "Participate in final voting" click_button "Verify" From cd3b196a04d87a48ce41cab9441c098c4ca37d33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Thu, 5 May 2022 16:31:30 +0200 Subject: [PATCH 9/9] Make it clear what verified users can vote for "Participate in the final voting" was a concept which was hard to understand since many people would think it was related to the voting/polls section and that somehow there was going to be a "final" poll. So we use "Vote for budget projects" instead. Thanks Pomerange for the suggestion. --- config/locales/en/verification.yml | 4 ++-- config/locales/es/verification.yml | 4 ++-- spec/system/management/document_verifications_spec.rb | 2 +- spec/system/management/managed_users_spec.rb | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/locales/en/verification.yml b/config/locales/en/verification.yml index d760284ac..276d23791 100644 --- a/config/locales/en/verification.yml +++ b/config/locales/en/verification.yml @@ -26,7 +26,7 @@ en: errors: incorrect_code: Verification code incorrect new: - explanation: "In order to participate in final voting you can:" + explanation: "In order to vote for budget projects you can:" go_to_index: See proposals office: Verify in any Citizen Support Offices send_letter: Send me a letter with the code @@ -91,7 +91,7 @@ en: user_permission_info: Verifying your information you'll be able to... user_permission_proposal: Create new proposals user_permission_support_proposal: Support proposals - user_permission_votes: Participate in final voting + user_permission_votes: Vote for budget projects verified_user: form: submit_button: Send code diff --git a/config/locales/es/verification.yml b/config/locales/es/verification.yml index dea171c38..c3620df4c 100644 --- a/config/locales/es/verification.yml +++ b/config/locales/es/verification.yml @@ -26,7 +26,7 @@ es: errors: incorrect_code: Código de verificación incorrecto new: - explanation: "Para participar en las votaciones finales puedes:" + explanation: "Para votar proyectos en los presupuestos participativos puedes:" go_to_index: Ver propuestas office: Verificarte presencialmente en cualquier Oficina de Atención al Ciudadano send_letter: Solicitar una carta por correo postal @@ -91,7 +91,7 @@ es: user_permission_info: Al verificar tus datos podrás... user_permission_proposal: Crear nuevas propuestas user_permission_support_proposal: Apoyar propuestas - user_permission_votes: Participar en las votaciones finales + user_permission_votes: Votar proyectos en los presupuestos participativos verified_user: form: submit_button: Enviar código diff --git a/spec/system/management/document_verifications_spec.rb b/spec/system/management/document_verifications_spec.rb index 17080e85d..30cb8de69 100644 --- a/spec/system/management/document_verifications_spec.rb +++ b/spec/system/management/document_verifications_spec.rb @@ -20,7 +20,7 @@ describe "DocumentVerifications" do fill_in "document_verification_document_number", with: user.document_number click_button "Check document" - expect(page).to have_content "Participate in final voting" + expect(page).to have_content "Vote for budget projects" click_button "Verify" diff --git a/spec/system/management/managed_users_spec.rb b/spec/system/management/managed_users_spec.rb index 2d12fa53b..db1640796 100644 --- a/spec/system/management/managed_users_spec.rb +++ b/spec/system/management/managed_users_spec.rb @@ -34,7 +34,7 @@ describe "Managed User" do fill_in "document_verification_document_number", with: user.document_number click_button "Check document" - expect(page).to have_content "Participate in final voting" + expect(page).to have_content "Vote for budget projects" click_button "Verify"