diff --git a/app/helpers/budgets_helper.rb b/app/helpers/budgets_helper.rb
index b6a412533..84f04139c 100644
--- a/app/helpers/budgets_helper.rb
+++ b/app/helpers/budgets_helper.rb
@@ -1,7 +1,7 @@
module BudgetsHelper
def budget_phases_select_options
- Budget::PHASES.map { |ph| [ t("budget.phase.#{ph}"), ph ] }
+ Budget::PHASES.map { |ph| [ t("budgets.phase.#{ph}"), ph ] }
end
def budget_currency_symbol_select_options
diff --git a/app/models/budget.rb b/app/models/budget.rb
index b974c89a9..2741ac014 100644
--- a/app/models/budget.rb
+++ b/app/models/budget.rb
@@ -76,7 +76,7 @@ class Budget < ActiveRecord::Base
end
def translated_phase
- I18n.t "budget.phase.#{phase}"
+ I18n.t "budgets.phase.#{phase}"
end
def formatted_amount(amount)
diff --git a/app/views/admin/budgets/index.html.erb b/app/views/admin/budgets/index.html.erb
index 7bf4b0659..87aaa8c66 100644
--- a/app/views/admin/budgets/index.html.erb
+++ b/app/views/admin/budgets/index.html.erb
@@ -25,7 +25,7 @@
<%= budget.name %>
- <%= t("budget.phase.#{budget.phase}") %>
+ <%= t("budgets.phase.#{budget.phase}") %>
|
<%= link_to t("admin.budgets.index.budget_investments"), admin_budget_budget_investments_path(budget_id: budget.id) %>
diff --git a/app/views/budgets/show.html.erb b/app/views/budgets/show.html.erb
index 71cb154e5..c43684363 100644
--- a/app/views/budgets/show.html.erb
+++ b/app/views/budgets/show.html.erb
@@ -14,24 +14,24 @@
<%= t('budgets.show.phase') %>
- <%= t("budget.phase.#{@budget.phase}") %>
+ <%= t("budgets.phase.#{@budget.phase}") %>
<% if can?(:create, Budget::Investment.new(budget: @budget))%>
<% if current_user %>
<% if current_user.level_two_or_three_verified? %>
- <%= link_to t("budget.investments.index.sidebar.create"), new_budget_investment_path(@budget), class: "button margin-top expanded" %>
+ <%= link_to t("budgets.investments.index.sidebar.create"), new_budget_investment_path(@budget), class: "button margin-top expanded" %>
<% else %>
- <%= t("budget.investments.index.sidebar.verified_only",
- verify: link_to(t("budget.investments.index.sidebar.verify_account"), verification_path)).html_safe %>
+ <%= t("budgets.investments.index.sidebar.verified_only",
+ verify: link_to(t("budgets.investments.index.sidebar.verify_account"), verification_path)).html_safe %>
<% end %>
<% else %>
- <%= t("budget.investments.index.sidebar.not_logged_in",
- sign_in: link_to(t("budget.investments.index.sidebar.sign_in"), new_user_session_path),
- sign_up: link_to(t("budget.investments.index.sidebar.sign_up"), new_user_registration_path)).html_safe %>
+ <%= t("budgets.investments.index.sidebar.not_logged_in",
+ sign_in: link_to(t("budgets.investments.index.sidebar.sign_in"), new_user_session_path),
+ sign_up: link_to(t("budgets.investments.index.sidebar.sign_up"), new_user_registration_path)).html_safe %>
<% end %>
<% end %>
diff --git a/app/views/valuation/budgets/index.html.erb b/app/views/valuation/budgets/index.html.erb
index 5df21fc3e..6d65f9ee6 100644
--- a/app/views/valuation/budgets/index.html.erb
+++ b/app/views/valuation/budgets/index.html.erb
@@ -18,7 +18,7 @@
<%= budget.name %>
|
- <%= t("budget.phase.#{budget.phase}") %>
+ <%= t("budgets.phase.#{budget.phase}") %>
|
<%= @investments_with_valuation_open[budget.id] %>
diff --git a/spec/features/admin/budgets_spec.rb b/spec/features/admin/budgets_spec.rb
index 8f17c27d4..3b34878af 100644
--- a/spec/features/admin/budgets_spec.rb
+++ b/spec/features/admin/budgets_spec.rb
@@ -23,7 +23,7 @@ feature 'Admin budgets' do
visit admin_budgets_path
expect(page).to have_content(budget.name)
- expect(page).to have_content(I18n.t("budget.phase.#{budget.phase}"))
+ expect(page).to have_content(I18n.t("budgets.phase.#{budget.phase}"))
end
scenario 'Filters by phase' do
diff --git a/spec/features/budgets/investments_spec.rb b/spec/features/budgets/investments_spec.rb
index 5a2598b25..3340f101a 100644
--- a/spec/features/budgets/investments_spec.rb
+++ b/spec/features/budgets/investments_spec.rb
@@ -148,7 +148,7 @@ feature 'Budget Investments' do
fill_in 'budget_investment_description', with: 'This is the description'
check 'budget_investment_terms_of_service'
- click_button 'Create'
+ click_button 'Create Investment'
expect(page.status_code).to eq(200)
expect(page.html).to be_empty
@@ -166,7 +166,7 @@ feature 'Budget Investments' do
fill_in 'budget_investment_description', with: 'This is the description'
check 'budget_investment_terms_of_service'
- click_button 'Create'
+ click_button 'Create Investment'
expect(page).to have_content 'Sorry, that was too quick! Please resubmit'
expect(current_path).to eq(new_budget_investment_path(budget_id: budget.id))
@@ -183,7 +183,7 @@ feature 'Budget Investments' do
fill_in 'budget_investment_external_url', with: 'http://http://skyscraperpage.com/'
check 'budget_investment_terms_of_service'
- click_button 'Create'
+ click_button 'Create Investment'
expect(page).to have_content 'Investment created successfully'
expect(page).to have_content 'You can access it from My activity'
@@ -201,7 +201,7 @@ feature 'Budget Investments' do
login_as(author)
visit new_budget_investment_path(budget_id: budget.id)
- click_button 'Create'
+ click_button 'Create Investment'
expect(page).to have_content error_message
end
|