Merge branch 'master' into polls

This commit is contained in:
Juanjo Bazán
2017-01-26 13:16:03 +01:00
3 changed files with 3 additions and 0 deletions

View File

@@ -14,6 +14,7 @@
<div class="row">
<div class="small-12 medium-6 column">
<%= check_box_tag :unfeasible, "1", params[:unfeasible].present? %>
<%= t("admin.budget_investments.search_unfeasible") %>
</div>
</div>

View File

@@ -154,6 +154,7 @@ en:
tags: Tags
tags_placeholder: "Write the tags you want separated by commas (,)"
undefined: Undefined
search_unfeasible: Search unfeasible
comments:
index:
filter: Filter

View File

@@ -154,6 +154,7 @@ es:
tags: Etiquetas
tags_placeholder: "Escribe las etiquetas que desees separadas por comas (,)"
undefined: Sin definir
search_unfeasible: Buscar inviables
comments:
index:
filter: Filtro