diff --git a/app/helpers/budgets_helper.rb b/app/helpers/budgets_helper.rb
index 8ace7ccfb..24dd935c2 100644
--- a/app/helpers/budgets_helper.rb
+++ b/app/helpers/budgets_helper.rb
@@ -1,5 +1,12 @@
module BudgetsHelper
+ def heading_name_and_price_html(heading, budget)
+ content_tag :div do
+ concat(heading.name + ' ')
+ concat(content_tag(:span, budget.formatted_heading_price(heading)))
+ end
+ end
+
def csv_params
csv_params = params.clone.merge(format: :csv).symbolize_keys
csv_params.delete(:page)
diff --git a/app/models/budget/phase.rb b/app/models/budget/phase.rb
index 704d0b85f..432c4b609 100644
--- a/app/models/budget/phase.rb
+++ b/app/models/budget/phase.rb
@@ -26,7 +26,7 @@ class Budget
scope :enabled, -> { where(enabled: true) }
scope :published, -> { enabled.where.not(kind: 'drafting') }
scope :drafting, -> { find_by_kind('drafting') }
- scope :informing, -> { find_by_kind('informing') }
+ scope :informing, -> { find_by_kind('informing') }
scope :accepting, -> { find_by_kind('accepting')}
scope :reviewing, -> { find_by_kind('reviewing')}
scope :selecting, -> { find_by_kind('selecting')}
diff --git a/app/views/budgets/index.html.erb b/app/views/budgets/index.html.erb
index dccaad5aa..1c9b546d9 100644
--- a/app/views/budgets/index.html.erb
+++ b/app/views/budgets/index.html.erb
@@ -69,13 +69,11 @@
<% unless @budget.informing? %>
<%= link_to budget_investments_path(@budget.id, heading_id: heading.id) do %>
- <%= heading.name %>
- <%= @budget.formatted_heading_price(heading) %>
+ <%= heading_name_and_price_html(heading, @budget) %>
<% end %>
<% else %>
- <%= heading.name %>
- <%= @budget.formatted_heading_price(heading) %>
+ <%= heading_name_and_price_html(heading, @budget) %>
<% end %>
diff --git a/config/locales/en/budgets.yml b/config/locales/en/budgets.yml
index 612c628da..b224cef34 100644
--- a/config/locales/en/budgets.yml
+++ b/config/locales/en/budgets.yml
@@ -30,7 +30,7 @@ en:
unselected: See investments not selected for balloting phase
phase:
drafting: Draft (Not visible to the public)
- informing: Informating
+ informing: Informing
accepting: Accepting projects
reviewing: Reviewing projects
selecting: Selecting projects
diff --git a/spec/features/budgets/budgets_spec.rb b/spec/features/budgets/budgets_spec.rb
index 1665fadce..7f6d98a62 100644
--- a/spec/features/budgets/budgets_spec.rb
+++ b/spec/features/budgets/budgets_spec.rb
@@ -16,22 +16,26 @@ feature 'Budgets' do
heading1 = create(:budget_heading, group: group1)
heading2 = create(:budget_heading, group: group2)
+ last_budget.update_attributes(phase: 'informing')
+
visit budgets_path
+
within("#budget_heading") do
expect(page).to have_content(last_budget.name)
expect(page).to have_content(last_budget.description)
- expect(page).to have_content("Actual phase (2/9)")
- expect(page).to have_content("Accepting projects")
+ expect(page).to have_content(I18n.t('budgets.phase.informing'))
expect(page).to have_link 'Help about participatory budgets'
expect(page).to have_link 'See all phases'
end
+ expect(page).to have_content("Accepting projects")
+
last_budget.update_attributes(phase: 'publishing_prices')
visit budgets_path
within("#budget_heading") do
- expect(page).to have_content("Actual phase (6/9)")
+ expect(page).to have_content(I18n.t('budgets.phase.publishing_prices'))
end
within('#budget_info') do