Merge branch 'budgets' of github.com:consul/consul into budgets

config/initializers/acts_as_taggable_on.rb

@@ -42,10 +42,6 @@ module ActsAsTaggableOn
       ActsAsTaggableOn::Tag.where('taggings.taggable_type' => 'SpendingProposal').includes(:taggings).order(:name).uniq
     end
 
-    def self.budget_investment_tags
-      ActsAsTaggableOn::Tag.where('taggings.taggable_type' => 'Budget::Investment').includes(:taggings).order(:name).uniq
-    end
-
     private
       def custom_counter_field_name_for(taggable_type)
         "#{taggable_type.underscore.pluralize}_count"

config/locales/activerecord.en.yml

@@ -53,6 +53,11 @@ en:
         phase: "Phase"
         currency_symbol: "Currency"
       budget/investment:
+        heading_id: "Sección de presupuesto"
+        title: "Title"
+        description: "Description"
+        external_url: "External url"
+        location: "Location"
         administrator_id: "Administrator"
         description: "Description"
         external_url: "Link to additional documentation"
@@ -116,6 +121,10 @@ en:
           attributes:
             tag_list:
               less_than_or_equal_to: "tags must be less than or equal to %{count}"
+        budget/investment:
+          attributes:
+            tag_list:
+              less_than_or_equal_to: "tags must be less than or equal to %{count}"
         proposal_notification:
           attributes:
             minimum_interval:

config/locales/budgets.en.yml

@@ -33,6 +33,11 @@ en:
     index:
       title: Participatory budgets
     investments:
+      form:
+        tag_category_label: "Categories"
+        tags_instructions: "Tag this proposal. You can choose from proposed categories or add your own"
+        tags_label: Tags
+        tags_placeholder: "Enter the tags you would like to use, separated by commas (',')"
       index:
         title: Participatory budgeting
         unfeasible: Unfeasible investment projects

config/locales/budgets.es.yml

@@ -33,6 +33,11 @@ es:
     index:
       title: Presupuestos participativos
     investments:
+      form:
+        tags_instructions: "Etiqueta esta propuesta. Puedes elegir entre las categorías propuestas o introducir las que desees"
+        tags_label: Temas
+        tag_category_label: "Categorías"
+        tags_placeholder: "Escribe las etiquetas que desees separadas por una coma (',')"
       index:
         title: Presupuestos participativos
         unfeasible: Propuestas de inversión no viables

config/locales/en.yml

@@ -152,6 +152,7 @@ en:
     proposal: Proposal
     proposal_notification: "Notification"
     spending_proposal: Spending proposal
+    budget/investment: Investment
     user: Account
     verification/sms: phone
     signature_sheet: Signature sheet

config/locales/es.yml

@@ -152,6 +152,7 @@ es:
     proposal: la propuesta
     proposal_notification: "la notificación"
     spending_proposal: la propuesta de gasto
+    budget/investment: la propuesta de inversión
     user: la cuenta
     verification/sms: el teléfono
     signature_sheet: la hoja de firmas