merge with master

This commit is contained in:
kikito
2016-12-12 16:09:05 +01:00
43 changed files with 381 additions and 254 deletions

View File

@@ -38,7 +38,7 @@ set(:config_files, %w(
unicorn.rb
))
set :whenever_roles, -> { :cron }
set :whenever_roles, -> { :app }
namespace :deploy do
before :starting, 'rvm1:install:rvm' # install/update RVM

View File

@@ -198,6 +198,7 @@ en:
transparency_url: https://transparency.consul
header:
administration: Administration
available_locales: Available languages
debates: Debates
external_link_blog: Blog
external_link_opendata: Open data
@@ -439,6 +440,7 @@ en:
check_none: None
collective: Collective
flag: Flag as inappropriate
hide: Hide
print:
print_button: Print this info
search: Search
@@ -467,7 +469,6 @@ en:
debates: Debates
proposals: Proposals
budget: Participatory budget
pagination: Pagination
searcher: Searcher
social:
blog: Blog

View File

@@ -198,6 +198,7 @@ es:
transparency_url: https://transparency.consul
header:
administration: Administrar
available_locales: Idiomas disponibles
debates: Debates
external_link_blog: Blog
external_link_opendata: Datos abiertos
@@ -225,6 +226,7 @@ es:
proposal_ballot: Votaciones
see_all: Ver propuestas
budgets: Presupuestos ciudadanos
spending_proposals: Presupuestos participativos
legislation:
help:
alt: Selecciona el texto que quieres comentar y pulsa en el botón con el lápiz.
@@ -439,6 +441,7 @@ es:
check_none: Ninguno
collective: Colectivo
flag: Denunciar como inapropiado
hide: Ocultar
print:
print_button: Imprimir esta información
search: Buscar
@@ -466,8 +469,7 @@ es:
outline:
debates: Debates
proposals: Propuestas
budget: Presupuestos ciudadanos
pagination: Paginación
budget: Presupuestos participativos
searcher: Buscador
social:
blog: Blog

View File

@@ -22,3 +22,7 @@
every 1.minute do
command "date > ~/cron-test.txt"
end
every 1.day, at: '5:00 am' do
rake "-s sitemap:refresh"
end

36
config/sitemap.rb Normal file
View File

@@ -0,0 +1,36 @@
# not use compression
class SitemapGenerator::FileAdapter
def gzip(stream, data); stream.write(data); stream.close end
end
SitemapGenerator::Sitemap.namer = SitemapGenerator::SimpleNamer.new(:sitemap, extension: '.xml')
# default host
SitemapGenerator::Sitemap.default_host = Setting["url"]
# sitemap generator
SitemapGenerator::Sitemap.create do
pages = Dir.entries(File.join(Rails.root,"app","views","pages"))
pages.each do |page|
page_name = page.split(".").first
add page_name if page_name.present?
end
add "help_translate"
add debates_path, priority: 0.7, changefreq: "daily"
Debate.find_each do |debate|
add debate_path(debate), lastmod: debate.updated_at
end
add proposals_path, priority: 0.7, changefreq: "daily"
Proposal.find_each do |proposal|
add proposal_path(proposal), lastmod: proposal.updated_at
end
add proposal_ballots_path
add spending_proposals_path, priority: 0.7, changefreq: "daily"
SpendingProposal.find_each do |spending_proposal|
add spending_proposal_path(spending_proposal), lastmod: spending_proposal.updated_at
end
end