fixes conflicts with budgets

2017-01-09 13:33:01 +01:00
parent be10972406 b7788e0a1a
commit f2d23b56e0
36 changed files with 248 additions and 255 deletions
--- a/app/views/admin/budgets/index.html.erb
+++ b/app/views/admin/budgets/index.html.erb
@@ -25,7 +25,7 @@
          <%= budget.name %>
        </td>
        <td class="small">
-          <%= t("budget.phase.#{budget.phase}") %>
+          <%= t("budgets.phase.#{budget.phase}") %>
        </td>
        <td class="small">
          <%= link_to t("admin.budgets.index.budget_investments"), admin_budget_budget_investments_path(budget_id: budget.id) %>