From 94279448f3c6229dcbb0fd145fba88fc0a726ecd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Fri, 19 Jan 2018 17:03:29 +0100 Subject: [PATCH] Replaced 'participatory budget' with 'budget' --- config/locales/en/activerecord.yml | 4 ++-- config/locales/en/budgets.yml | 6 +++--- spec/features/admin/budgets_spec.rb | 22 +++++++++++----------- spec/features/budgets/budgets_spec.rb | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/config/locales/en/activerecord.yml b/config/locales/en/activerecord.yml index ec3003010..81b25dcad 100644 --- a/config/locales/en/activerecord.yml +++ b/config/locales/en/activerecord.yml @@ -5,8 +5,8 @@ en: one: "activity" other: "activities" budget: - one: "Participatory budget" - other: "Participatory budgets" + one: "Budget" + other: "Budgets" budget/investment: one: "Investment" other: "Investments" diff --git a/config/locales/en/budgets.yml b/config/locales/en/budgets.yml index 193c0d9e7..e41c07535 100644 --- a/config/locales/en/budgets.yml +++ b/config/locales/en/budgets.yml @@ -43,7 +43,7 @@ en: section_header: icon_alt: Participatory budgets icon title: Participatory budgets - help: Help about participatory budgets + help: Help with participatory budgets all_phases: See all phases all_phases: Budget investment's phases map: Budget investments' proposals located geographically @@ -53,7 +53,7 @@ en: finished_budgets: Finished participatory budgets see_results: See results section_footer: - title: Help about participatory budgets + title: Help with participatory budgets description: With the participatory budgets the citizens decide to which projects presented by the neighbors is destined a part of the municipal budget. help_text_1: "Participatory budgets are processes in which citizens decide directly on what is spent part of the municipal budget. Any registered person over 16 years old can propose an investment project that is preselected in a phase of citizen supports." help_text_2: "The most voted projects are evaluated and passed to a final vote in which they decide the actions to be carried out by the City Council once the municipal budgets of the next year are approved." @@ -170,4 +170,4 @@ en: errors: dates_range_invalid: "Start date can't be equal or later than End date" prev_phase_dates_invalid: "Start date must be later than the start date of the previous enabled phase (%{phase_name})" - next_phase_dates_invalid: "End date must be earlier than the end date of the next enabled phase (%{phase_name})" \ No newline at end of file + next_phase_dates_invalid: "End date must be earlier than the end date of the next enabled phase (%{phase_name})" diff --git a/spec/features/admin/budgets_spec.rb b/spec/features/admin/budgets_spec.rb index f07fd7096..7bf48903f 100644 --- a/spec/features/admin/budgets_spec.rb +++ b/spec/features/admin/budgets_spec.rb @@ -92,7 +92,7 @@ feature 'Admin budgets' do fill_in 'budget_name', with: 'M30 - Summer campaign' select 'Accepting projects', from: 'budget[phase]' - click_button 'Create Participatory budget' + click_button 'Create Budget' expect(page).to have_content 'New participatory budget created successfully!' expect(page).to have_content 'M30 - Summer campaign' @@ -100,7 +100,7 @@ feature 'Admin budgets' do scenario 'Name is mandatory' do visit new_admin_budget_path - click_button 'Create Participatory budget' + click_button 'Create Budget' expect(page).not_to have_content 'New participatory budget created successfully!' expect(page).to have_css("label.error", text: "Name") @@ -119,7 +119,7 @@ feature 'Admin budgets' do click_button 'Delete budget' expect(page).to have_content('Budget deleted successfully') - expect(page).to have_content('participatory budgets cannot be found') + expect(page).to have_content('budgets cannot be found') end scenario 'Try to destroy a budget with investments' do @@ -130,7 +130,7 @@ feature 'Admin budgets' do click_button 'Delete budget' expect(page).to have_content('You cannot destroy a Budget that has associated investments') - expect(page).to have_content('There is 1 participatory budget') + expect(page).to have_content('There is 1 budget') end end @@ -167,7 +167,7 @@ feature 'Admin budgets' do click_link 'Edit budget' fill_in 'budget_name', with: 'More trees on the streets' - click_button 'Update Participatory budget' + click_button 'Update Budget' expect(page).to have_content('More trees on the streets') expect(page).to have_current_path(admin_budgets_path) @@ -205,7 +205,7 @@ feature 'Admin budgets' do context 'Manage groups and headings' do scenario 'Create group', :js do - budget = create(:budget, name: 'Yearly participatory budget') + budget = create(:budget, name: 'Yearly budget') visit admin_budgets_path @@ -223,7 +223,7 @@ feature 'Admin budgets' do expect(page).to have_content '1 Group of budget headings' expect(page).to have_content 'Health' - expect(page).to have_content 'Yearly participatory budget' + expect(page).to have_content 'Yearly budget' expect(page).not_to have_content 'No groups created yet.' visit admin_budgets_path @@ -233,12 +233,12 @@ feature 'Admin budgets' do expect(page).to have_content '1 Group of budget headings' expect(page).to have_content 'Health' - expect(page).to have_content 'Yearly participatory budget' + expect(page).to have_content 'Yearly budget' expect(page).not_to have_content 'No groups created yet.' end scenario 'Create heading', :js do - budget = create(:budget, name: 'Yearly participatory budget') + budget = create(:budget, name: 'Yearly budget') group = create(:budget_group, budget: budget, name: 'Districts improvments') visit admin_budget_path(budget) @@ -266,7 +266,7 @@ feature 'Admin budgets' do end scenario 'Update heading', :js do - budget = create(:budget, name: 'Yearly participatory budget') + budget = create(:budget, name: 'Yearly budget') group = create(:budget_group, budget: budget, name: 'Districts improvments') heading = create(:budget_heading, group: group, name: "District 1") heading = create(:budget_heading, group: group, name: "District 3") @@ -288,7 +288,7 @@ feature 'Admin budgets' do end scenario 'Delete heading', :js do - budget = create(:budget, name: 'Yearly participatory budget') + budget = create(:budget, name: 'Yearly budget') group = create(:budget_group, budget: budget, name: 'Districts improvments') heading = create(:budget_heading, group: group, name: "District 1") diff --git a/spec/features/budgets/budgets_spec.rb b/spec/features/budgets/budgets_spec.rb index 71e0b9a4a..ae30ca50c 100644 --- a/spec/features/budgets/budgets_spec.rb +++ b/spec/features/budgets/budgets_spec.rb @@ -21,7 +21,7 @@ feature 'Budgets' do expect(page).to have_content(last_budget.description) expect(page).to have_content("Actual phase") expect(page).to have_content("Accepting projects") - expect(page).to have_link 'Help about participatory budgets' + expect(page).to have_link 'Help with participatory budgets' expect(page).to have_link 'See all phases' end