Merge branch 'master' into legislation-module-stable

This commit is contained in:
Amaia Castro
2017-03-07 23:19:26 +01:00
25 changed files with 114 additions and 43 deletions

View File

@@ -200,7 +200,7 @@ en:
external_link_transparency: Transparency
external_link_transparency_url: https://transparency.consul
locale: 'Language:'
logo: Consul
logo: Consul logo
management: Management
moderation: Moderation
valuation: Valuation
@@ -435,6 +435,7 @@ en:
search: 'Filter'
title: 'Advanced search'
to: 'To'
delete: Delete
author_info:
author_deleted: User deleted
back: Go back
@@ -479,6 +480,7 @@ en:
facebook: Facebook
twitter: Twitter
youtube: YouTube
whatsapp: WhatsApp
spending_proposals:
form:
association_name_label: 'If you propose in name of an assocation or collective add the name here'

View File

@@ -200,7 +200,7 @@ es:
external_link_transparency: Transparencia
external_link_transparency_url: https://transparency.consul
locale: 'Idioma:'
logo: Consul
logo: Consul logo
management: Gestión
moderation: Moderar
valuation: Evaluación
@@ -435,6 +435,7 @@ es:
search: 'Filtrar'
title: 'Búsqueda avanzada'
to: 'Hasta'
delete: 'Borrar'
author_info:
author_deleted: Usuario eliminado
back: Volver
@@ -479,6 +480,7 @@ es:
facebook: Facebook
twitter: Twitter
youtube: YouTube
whatsapp: WhatsApp
spending_proposals:
form:
association_name_label: 'Si propones en nombre de una asociación o colectivo añade el nombre aquí'

View File

@@ -874,7 +874,7 @@ fr:
external_link_transparency: Transparence
external_link_transparency_url: https://transparency.consul
locale: 'Langue :'
logo: Consul
logo: Consul logo
moderation: Modération
more_information: Plus d'information
my_account_link: Mon compte

View File

@@ -860,7 +860,7 @@ pt-BR:
external_link_transparency: Transparência
external_link_transparency_url: https://transparency.consul
locale: 'Idioma:'
logo: Consul
logo: Consul logotipo
moderation: Moderação
more_information: Mais informações
my_account_link: Minha conta

View File

@@ -16,4 +16,4 @@ en:
tumblr: "Tumblr"
plurk: "Plurk"
pinterest: "Pinterest"
email: "Email"
email: "Email"

View File

@@ -16,4 +16,4 @@ es:
tumblr: "Tumblr"
plurk: "Plurk"
pinterest: "Pinterest"
email: "Correo electrónico"
email: "Correo electrónico"

View File

@@ -331,7 +331,7 @@ Rails.application.routes.draw do
get :support_investments
get :print_investments
end
resources :investments, only: [:index, :new, :create, :show], controller: 'budgets/investments' do
resources :investments, only: [:index, :new, :create, :show, :destroy], controller: 'budgets/investments' do
post :vote, on: :member
get :print, on: :collection
end