diff options
49 files changed, 766 insertions, 312 deletions
@@ -8,6 +8,8 @@ # echo "rvm use 1.8.7" > .rvmrc environment_id="ruby-1.8.7-p370" +rubygems_version="1.6.2" + # Uncomment the following lines if you want to verify rvm version per project # rvmrc_rvm_version="1.14.10 (stable)" # 1.10.1 seams as a safe start # eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || { @@ -37,6 +39,10 @@ else } fi +if [[ "$(gem --version)" != "${rubygems_version}" ]] ; then + rvm rubygems ${rubygems_version} +fi + # If you use bundler, this might be useful to you: # if [[ -s Gemfile ]] && { # ! builtin command -v bundle >/dev/null || diff --git a/Capfile b/Capfile new file mode 100644 index 000000000..6a798eb2b --- /dev/null +++ b/Capfile @@ -0,0 +1,4 @@ +load 'deploy' +# Uncomment if you are using Rails' asset pipeline + # load 'deploy/assets' +load 'config/deploy' # remove this line to skip loading any of the default tasks
\ No newline at end of file @@ -1,5 +1,5 @@ # Work around bug in Debian Squeeze - see https://github.com/mysociety/alaveteli/pull/297#issuecomment-4101012 -if File.exist? "/etc/debian_version" and File.open("/etc/debian_version").read.strip =~ /^(squeeze|6\.0\.[45])$/ +if File.exist? "/etc/debian_version" and File.open("/etc/debian_version").read.strip =~ /^(squeeze.*|6\.0\.[45])$/ if File.exist? "/lib/libuuid.so.1" require 'dl' DL::dlopen('/lib/libuuid.so.1') @@ -11,6 +11,7 @@ gem 'rails', '2.3.14' gem 'pg' gem 'fast_gettext', '>= 0.6.0' +gem 'fastercsv', '>=1.5.5' gem 'gettext_i18n_rails', '>= 0.6.0', :git => "git://github.com/sebbacon/gettext_i18n_rails.git" gem 'gettext', '>= 1.9.3' gem 'json', '~> 1.5.1' @@ -25,6 +26,7 @@ gem 'recaptcha', '~> 0.3.1', :require => 'recaptcha/rails' # :require avoids "already initialized constant" warnings gem 'rmagick', :require => 'RMagick' gem 'routing-filter', '~> 0.2.4' +gem 'rake', '~> 0.9.2.2' gem 'rspec', '~> 1.3.2' gem 'rspec-rails', '~> 1.3.4' gem 'ruby-msg', '~> 1.5.0' @@ -35,11 +37,11 @@ gem 'will_paginate', '~> 2.3.11' gem 'xapian-full-alaveteli', '~> 1.2.9.5' gem 'xml-simple' gem 'zip' +gem 'capistrano' group :test do gem 'fakeweb' gem 'rspec-rails', '~> 1.3.4' - gem 'rake' end group :develop do diff --git a/Gemfile.lock b/Gemfile.lock index 0d9d5cc1d..f243ffaad 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -19,11 +19,19 @@ GEM activesupport (= 2.3.14) activesupport (2.3.14) annotate (2.4.0) + capistrano (2.13.3) + highline + net-scp (>= 1.0.0) + net-sftp (>= 2.0.0) + net-ssh (>= 2.0.14) + net-ssh-gateway (>= 1.1.0) columnize (0.3.6) fakeweb (1.3.0) fast_gettext (0.6.8) + fastercsv (1.5.5) gettext (2.2.1) locale + highline (1.6.13) json (1.5.4) linecache (0.46) rbx-require-relative (> 0.0.4) @@ -32,6 +40,13 @@ GEM memcache-client (1.8.5) net-http-local (0.1.2) net-purge (0.1.0) + net-scp (1.0.4) + net-ssh (>= 1.99.1) + net-sftp (2.0.5) + net-ssh (>= 2.0.9) + net-ssh (2.5.2) + net-ssh-gateway (1.1.0) + net-ssh (>= 1.99.1) pg (0.13.2) rack (1.1.3) rails (2.3.14) @@ -72,8 +87,10 @@ PLATFORMS DEPENDENCIES annotate + capistrano fakeweb fast_gettext (>= 0.6.0) + fastercsv (>= 1.5.5) gettext (>= 1.9.3) gettext_i18n_rails (>= 0.6.0)! json (~> 1.5.1) @@ -85,7 +102,7 @@ DEPENDENCIES pg rack (~> 1.1.0) rails (= 2.3.14) - rake + rake (~> 0.9.2.2) rdoc (~> 2.4.3) recaptcha (~> 0.3.1) rmagick diff --git a/app/controllers/admin_general_controller.rb b/app/controllers/admin_general_controller.rb index 2c961dfc5..7e8498d8a 100644 --- a/app/controllers/admin_general_controller.rb +++ b/app/controllers/admin_general_controller.rb @@ -61,16 +61,59 @@ class AdminGeneralController < AdminController @events_title = "Events, all time" date_back_to = Time.now - 1000.years end - @events = InfoRequestEvent.find(:all, :order => "created_at desc, id desc", - :conditions => ["created_at > ? ", date_back_to.getutc]) - @public_body_history = PublicBody.versioned_class.find(:all, :order => "updated_at desc, id desc", - :conditions => ["updated_at > ? ", date_back_to.getutc]) - for pbh in @public_body_history - pbh.created_at = pbh.updated_at + + # Get an array of event attributes within the timespan in the format + # [id, type_of_model, event_timestamp] + # Note that the relevent date for InfoRequestEvents is creation, but + # for PublicBodyVersions is update thoughout + connection = InfoRequestEvent.connection + timestamps = connection.select_rows("SELECT id,'InfoRequestEvent', + created_at AS timestamp + FROM info_request_events + WHERE created_at > '#{date_back_to.getutc}' + UNION + SELECT id, 'PublicBodyVersion', + updated_at AS timestamp + FROM #{PublicBody.versioned_class.table_name} + WHERE updated_at > '#{date_back_to.getutc}' + ORDER by timestamp desc") + @events = WillPaginate::Collection.create((params[:page] or 1), 100) do |pager| + # create a hash for each model type being returned + info_request_event_ids = {} + public_body_version_ids = {} + # get the relevant slice from the paginator + timestamps.slice(pager.offset, pager.per_page).each_with_index do |event, index| + # for each event in the slice, add an item to the hash for the model type + # whose key is the model id, and value is the position in the slice + if event[1] == 'InfoRequestEvent' + info_request_event_ids[event[0].to_i] = index + else + public_body_version_ids[event[0].to_i] = index + end + end + # get all the models in the slice, eagerly loading the associations we use in the view + public_body_versions = PublicBody.versioned_class.find(:all, + :conditions => ['id in (?)', public_body_version_ids.keys], + :include => [ { :public_body => :translations }]) + info_request_events = InfoRequestEvent.find(:all, + :conditions => ['id in (?)', info_request_event_ids.keys], + :include => [:info_request]) + @events = [] + # drop the models into a combined array, ordered by their position in the timestamp slice + public_body_versions.each do |version| + @events[public_body_version_ids[version.id]] = [version, version.updated_at] + end + info_request_events.each do |event| + @events[info_request_event_ids[event.id]] = [event, event.created_at] + end + + # inject the result array into the paginated collection: + pager.replace(@events) + + # set the total entries for the page to the overall number of results + pager.total_entries = timestamps.size end - @events += @public_body_history - @events.sort! { |a,b| b.created_at <=> a.created_at } end def stats diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb index c5abf8769..7cf23e61e 100644 --- a/app/controllers/admin_request_controller.rb +++ b/app/controllers/admin_request_controller.rb @@ -16,12 +16,25 @@ class AdminRequestController < AdminController def list @query = params[:query] - @info_requests = InfoRequest.paginate :order => "created_at desc", :page => params[:page], :per_page => 100, + @info_requests = InfoRequest.paginate :order => "created_at desc", + :page => params[:page], + :per_page => 100, :conditions => @query.nil? ? nil : ["lower(title) like lower('%'||?||'%')", @query] end def list_old_unclassified - @info_requests = InfoRequest.find_old_unclassified(:conditions => ["prominence = 'normal'"]) + @info_requests = WillPaginate::Collection.create((params[:page] or 1), 50) do |pager| + info_requests = InfoRequest.find_old_unclassified(:conditions => ["prominence = 'normal'"], + :limit => pager.per_page, + :offset => pager.offset) + # inject the result array into the paginated collection: + pager.replace(info_requests) + + unless pager.total_entries + # the pager didn't manage to guess the total count, do it manually + pager.total_entries = InfoRequest.count_old_unclassified(:conditions => ["prominence = 'normal'"]) + end + end end def show diff --git a/app/controllers/public_body_controller.rb b/app/controllers/public_body_controller.rb index 95d936e54..b8ea82a66 100644 --- a/app/controllers/public_body_controller.rb +++ b/app/controllers/public_body_controller.rb @@ -7,7 +7,7 @@ # # $Id: public_body_controller.rb,v 1.8 2009-09-14 13:27:00 francis Exp $ -require 'csv' +require 'fastercsv' class PublicBodyController < ApplicationController # XXX tidy this up with better error messages, and a more standard infrastructure for the redirect to canonical URL @@ -148,10 +148,10 @@ class PublicBodyController < ApplicationController end def list_all_csv - public_bodies = PublicBody.find(:all, :order => 'url_name') - report = StringIO.new - CSV::Writer.generate(report, ',') do |title| - title << [ + public_bodies = PublicBody.find(:all, :order => 'url_name', + :include => [:translations, :tags]) + report = FasterCSV.generate() do |csv| + csv << [ 'Name', 'Short name', # deliberately not including 'Request email' @@ -164,7 +164,7 @@ class PublicBodyController < ApplicationController 'Version', ] public_bodies.each do |public_body| - title << [ + csv << [ public_body.name, public_body.short_name, # DO NOT include request_email (we don't want to make it @@ -179,8 +179,7 @@ class PublicBodyController < ApplicationController ] end end - report.rewind - send_data(report.read, :type=> 'text/csv; charset=utf-8; header=present', + send_data(report, :type=> 'text/csv; charset=utf-8; header=present', :filename => 'all-authorities.csv', :disposition =>'attachment', :encoding => 'utf8') end diff --git a/app/models/info_request.rb b/app/models/info_request.rb index f2d8929bc..2e16d0f58 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -35,7 +35,7 @@ class InfoRequest < ActiveRecord::Base belongs_to :user validate :must_be_internal_or_external - belongs_to :public_body + belongs_to :public_body, :counter_cache => true validates_presence_of :public_body_id has_many :outgoing_messages, :order => 'created_at' @@ -977,8 +977,9 @@ public def InfoRequest.find_old_unclassified(extra_params={}) params = old_unclassified_params(extra_params, include_last_response_time=true) - params[:limit] = extra_params[:limit] if extra_params[:limit] - params[:include] = extra_params[:include] if extra_params[:include] + [:limit, :include, :offset].each do |extra| + params[extra] = extra_params[extra] if extra_params[extra] + end if extra_params[:order] params[:order] = extra_params[:order] params.delete(:select) diff --git a/app/models/public_body.rb b/app/models/public_body.rb index fb30da234..77da81d4c 100644 --- a/app/models/public_body.rb +++ b/app/models/public_body.rb @@ -45,6 +45,8 @@ class PublicBody < ActiveRecord::Base has_many :censor_rules, :order => 'created_at desc' has_tag_string + before_save :set_api_key, :set_default_publication_scheme + translates :name, :short_name, :request_email, :url_name, :notes, :first_letter, :publication_scheme @@ -89,13 +91,13 @@ class PublicBody < ActiveRecord::Base end end - def after_initialize + def set_default_publication_scheme # Make sure publication_scheme gets the correct default value. # (This would work automatically, were publication_scheme not a translated attribute) self.publication_scheme = "" if self.publication_scheme.nil? end - def before_save + def set_api_key self.api_key = SecureRandom.base64(33) if self.api_key.nil? end @@ -184,7 +186,7 @@ class PublicBody < ActiveRecord::Base end acts_as_versioned - self.non_versioned_columns << 'created_at' << 'updated_at' << 'first_letter' << 'api_key' + self.non_versioned_columns << 'created_at' << 'updated_at' << 'first_letter' << 'api_key' << 'info_requests_count' class Version attr_accessor :created_at @@ -549,9 +551,10 @@ class PublicBody < ActiveRecord::Base def notes_as_html self.notes end + def notes_without_html # assume notes are reasonably behaved HTML, so just use simple regexp on this - self.notes.nil? ? '' : self.notes.gsub(/<\/?[^>]*>/, "") + @notes_without_html ||= (self.notes.nil? ? '' : self.notes.gsub(/<\/?[^>]*>/, "")) end def json_for_api diff --git a/app/views/admin_general/timeline.rhtml b/app/views/admin_general/timeline.rhtml index eecab4823..e84539970 100644 --- a/app/views/admin_general/timeline.rhtml +++ b/app/views/admin_general/timeline.rhtml @@ -11,25 +11,25 @@ | <a href="?all=1">All time</a></p> <% last_date = nil %> -<% for event in @events %> - <% if last_date != event.created_at.to_date %> +<% for event, event_at in @events %> + <% if last_date != event_at.to_date %> <% if last_date.nil? %> <p> <% end %> - <h3><%= simple_date(event.created_at) %></h3> + <h3><%= simple_date(event_at) %></h3> <p> <% else %> <br> <% end %> - <% last_date = event.created_at.to_date %> - - <%= simple_time(event.created_at) %> + <% last_date = event_at.to_date %> - <% if event.class.to_s == 'InfoRequestEvent' %> + <%= simple_time(event_at) %> + + <% if event.is_a? InfoRequestEvent %> <%= request_both_links(event.info_request) %> <% if event.event_type == 'edit' %> was edited by administrator <strong><%=h event.params[:editor] %></strong>. - <% for p in ['title', 'prominence', 'described_state', 'awaiting_description'] + <% for p in ['title', 'prominence', 'described_state', 'awaiting_description'] if event.params[p.to_sym] != event.params[('old_'+p).to_sym] %> Changed <%=p%> from '<%=h event.params[('old_'+p).to_sym]%>' to '<%=h event.params[p.to_sym] %>'. <% end @@ -39,7 +39,7 @@ <% outgoing_message = OutgoingMessage.find(event.params[:outgoing_message_id].to_i) %> had outgoing message edited by administrator <strong><%=h event.params[:editor] %></strong>. <% if outgoing_message %> - <% for p in ['body'] + <% for p in ['body'] if event.params[p.to_sym] != event.params[('old_'+p).to_sym] %> Changed <%=p%> from '<%=h event.params[('old_'+p).to_sym]%>' to '<%=h event.params[p.to_sym] %>'. <% end @@ -52,7 +52,7 @@ <% comment = Comment.find(event.params[:comment_id].to_i) %> had annotation edited by administrator <strong><%=h event.params[:editor] %></strong>. <% if comment %> - <% for p in ['body'] + <% for p in ['body'] if event.params[p.to_sym] != event.params[('old_'+p).to_sym] %> Changed <%=p%> from '<%=h event.params[('old_'+p).to_sym]%>' to '<%=h event.params[p.to_sym] %>'. <% end @@ -71,7 +71,7 @@ had incoming message redelivered to another request by administrator <strong><%=h event.params[:editor] %></strong>. <% elsif event.event_type == 'response' %> <% incoming_message = event.incoming_message %> - received + received <%= link_to 'a response', main_url(incoming_message_url(incoming_message)) %> from <%=h event.info_request.public_body.name %>. <% elsif event.event_type == 'sent' %> @@ -95,5 +95,5 @@ <% if not @events.empty? %> </p> <% end %> - +<%= will_paginate(@events) %> diff --git a/app/views/admin_request/list_old_unclassified.rhtml b/app/views/admin_request/list_old_unclassified.rhtml index f42ed0d43..2e75c2174 100644 --- a/app/views/admin_request/list_old_unclassified.rhtml +++ b/app/views/admin_request/list_old_unclassified.rhtml @@ -6,10 +6,11 @@ <ul> <% for @request in @info_requests %> <li> - <%= request_both_links(@request) %> + <%= request_both_links(@request) %> – <%=simple_date(@request.get_last_response_event.created_at)%> </li> <% end %> </ul> +<%= will_paginate(@info_requests) %> diff --git a/app/views/api/request_events.atom.builder b/app/views/api/request_events.atom.builder index 4f0133051..44759ae7e 100644 --- a/app/views/api/request_events.atom.builder +++ b/app/views/api/request_events.atom.builder @@ -6,7 +6,7 @@ atom_feed("xmlns:alaveteli" => "http://www.alaveteli.org/API/v2/RequestEvents/At feed.entry(event) do |entry| request = event.info_request - entry.published(event.created_at) + entry.updated(event.created_at.utc.iso8601) entry.tag!("alaveteli:event_type", event.event_type) entry.tag!("alaveteli:request_url", main_url(request_url(request))) entry.title(request.title) diff --git a/config/.gitignore b/config/.gitignore index 28efb03ec..78d586ea8 100644 --- a/config/.gitignore +++ b/config/.gitignore @@ -1,8 +1,9 @@ -/config.tmp -/general -/general.yml -/database.yml -/rails_env.rb -/logrotate -/memcached.yml -/*.deployed +config.tmp +general +general.yml +database.yml +rails_env.rb +logrotate +memcached.yml +*.deployed +deploy.yml diff --git a/config/deploy.rb b/config/deploy.rb new file mode 100644 index 000000000..888710f83 --- /dev/null +++ b/config/deploy.rb @@ -0,0 +1,69 @@ +require 'bundler/capistrano' + +set :stage, 'staging' unless exists? :stage + +configuration = YAML.load_file('config/deploy.yml')[stage] + +set :application, 'alaveteli' +set :scm, :git +set :deploy_via, :remote_cache +set :repository, configuration['repository'] +set :branch, configuration['branch'] +set :git_enable_submodules, true +set :deploy_to, configuration['deploy_to'] +set :user, configuration['user'] +set :use_sudo, false + +server configuration['server'], :app, :web, :db, :primary => true + +namespace :rake do + namespace :themes do + task :install do + run "cd #{release_path} && bundle exec rake themes:install RAILS_ENV=#{rails_env}" + end + end +end + +# Not in the rake namespace because we're also specifying app-specific arguments here +namespace :xapian do + desc 'Rebuilds the Xapian index as per the ./scripts/rebuild-xapian-index script' + task :rebuild_index do + run "cd #{current_path} && bundle exec rake xapian:rebuild_index models='PublicBody User InfoRequestEvent' RAILS_ENV=#{rails_env}" + end +end + +namespace :deploy do + desc "Restarting mod_rails with restart.txt" + task :restart, :roles => :app, :except => { :no_release => true } do + run "touch #{current_path}/tmp/restart.txt" + end + + [:start, :stop].each do |t| + desc "#{t} task is a no-op with mod_rails" + task t, :roles => :app do ; end + end + + desc 'Link configuration after a code update' + task :symlink_configuration do + links = { + "#{release_path}/config/database.yml" => "#{shared_path}/database.yml", + "#{release_path}/config/general.yml" => "#{shared_path}/general.yml", + "#{release_path}/files" => "#{shared_path}/files", + "#{release_path}/cache" => "#{shared_path}/cache", + "#{release_path}/vendor/plugins/acts_as_xapian/xapiandbs" => "#{shared_path}/xapiandbs", + "#{release_path}/public/download" => "#{release_path}/cache/zips/download" + } + + # "ln -sf <a> <b>" creates a symbolic link but deletes <b> if it already exists + run links.map {|a| "ln -sf #{a.last} #{a.first}"}.join(";") + end + + after 'deploy:setup' do + run "mkdir -p #{shared_path}/files" + run "mkdir -p #{shared_path}/cache" + run "mkdir -p #{shared_path}/xapiandbs" + end +end + +after 'deploy:update_code', 'deploy:symlink_configuration' +after 'deploy:update_code', 'rake:themes:install' diff --git a/config/deploy.yml.example b/config/deploy.yml.example new file mode 100644 index 000000000..aea045dff --- /dev/null +++ b/config/deploy.yml.example @@ -0,0 +1,13 @@ +# Site-specific deployment configuration lives in this file +production: + repository: git://github.com:mysociety/alaveteli.git + branch: master + server: www.example.com + user: deploy + deploy_to: /srv/www/alaveteli_production +staging: + repository: git://github.com:mysociety/alaveteli.git + branch: develop + server: test.example.com + user: deploy + deploy_to: /srv/www/alaveteli_staging diff --git a/config/environment.rb b/config/environment.rb index 6234ae5c1..250d3eed0 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -32,7 +32,7 @@ require File.join(File.dirname(__FILE__), '../lib/old_rubygems_patch') # Application version -ALAVETELI_VERSION = '0.6.5.1' +ALAVETELI_VERSION = '0.6.6' Rails::Initializer.run do |config| # Load intial mySociety config diff --git a/db/migrate/20120912170035_add_info_requests_count_to_public_bodies.rb b/db/migrate/20120912170035_add_info_requests_count_to_public_bodies.rb new file mode 100644 index 000000000..d77dbaa64 --- /dev/null +++ b/db/migrate/20120912170035_add_info_requests_count_to_public_bodies.rb @@ -0,0 +1,17 @@ +class AddInfoRequestsCountToPublicBodies < ActiveRecord::Migration + def self.up + add_column :public_bodies, :info_requests_count, :integer, :null => false, :default => 0 + + PublicBody.reset_column_information + + PublicBody.find_each do |public_body| + public_body.update_attribute :info_requests_count, public_body.info_requests.length + end + + end + + def self.down + remove_column :public_bodies, :info_requests_count + end + +end diff --git a/db/migrate/20120913074940_add_incoming_message_index_to_outgoing_messages.rb b/db/migrate/20120913074940_add_incoming_message_index_to_outgoing_messages.rb new file mode 100644 index 000000000..893395f41 --- /dev/null +++ b/db/migrate/20120913074940_add_incoming_message_index_to_outgoing_messages.rb @@ -0,0 +1,9 @@ +class AddIncomingMessageIndexToOutgoingMessages < ActiveRecord::Migration + def self.up + add_index :outgoing_messages, :incoming_message_followup_id + end + + def self.down + remove_index :outgoing_messages, :incoming_message_followup_id + end +end diff --git a/db/migrate/20120913080807_add_info_request_event_index_to_track_things_sent_emails.rb b/db/migrate/20120913080807_add_info_request_event_index_to_track_things_sent_emails.rb new file mode 100644 index 000000000..d119f55b3 --- /dev/null +++ b/db/migrate/20120913080807_add_info_request_event_index_to_track_things_sent_emails.rb @@ -0,0 +1,9 @@ +class AddInfoRequestEventIndexToTrackThingsSentEmails < ActiveRecord::Migration + def self.up + add_index :track_things_sent_emails, :info_request_event_id + end + + def self.down + remove_index :track_things_sent_emails, :info_request_event_id + end +end diff --git a/db/migrate/20120913081136_add_info_request_event_index_to_user_info_request_sent_alerts.rb b/db/migrate/20120913081136_add_info_request_event_index_to_user_info_request_sent_alerts.rb new file mode 100644 index 000000000..aa9f404f7 --- /dev/null +++ b/db/migrate/20120913081136_add_info_request_event_index_to_user_info_request_sent_alerts.rb @@ -0,0 +1,9 @@ +class AddInfoRequestEventIndexToUserInfoRequestSentAlerts < ActiveRecord::Migration + def self.up + add_index :user_info_request_sent_alerts, :info_request_event_id + end + + def self.down + remove_index :user_info_request_sent_alerts, :info_request_event_id + end +end diff --git a/db/migrate/20120913135745_add_updated_at_index_to_public_body_versions.rb b/db/migrate/20120913135745_add_updated_at_index_to_public_body_versions.rb new file mode 100644 index 000000000..6ae58c884 --- /dev/null +++ b/db/migrate/20120913135745_add_updated_at_index_to_public_body_versions.rb @@ -0,0 +1,9 @@ +class AddUpdatedAtIndexToPublicBodyVersions < ActiveRecord::Migration + def self.up + add_index :public_body_versions, :updated_at + end + + def self.down + remove_index :public_body_versions, :updated_at + end +end diff --git a/doc/CHANGES.md b/doc/CHANGES.md index ae9418ef4..15df1dce5 100644 --- a/doc/CHANGES.md +++ b/doc/CHANGES.md @@ -1,3 +1,15 @@ +# Version 0.6.6 +## Highlighted features +* Adds deployment via Capistrano - see DEPLOY.md for details +* Speeds up several admin pages that were slow in large installs + +* [List of issues on github](https://github.com/mysociety/alaveteli/issues?milestone=22&state=closed) + +## Upgrade notes + +* Check out this version and run `rails-post-deploy` as usual. +* Run `rake temp:populate_request_classifications` to populate the new request_classifications table which is used in generating the request categorisation game league tables and progress widget. + # Version 0.6.5 * This is a minor release, to update all documentation and example files to reflect the move of the official repository to http://github.com/mysociety/alaveteli and the alavetelitheme and adminbootstraptheme themes to http://github.com/mysociety/alavetelitheme and http://github.com/mysociety/adminbootstraptheme respectively. * Some basic versioning has been added for themes. An ALAVETELI_VERSION constant has been added in config/environment.rb. When loading themes, `rails-post-deploy` now looks for a tag on the theme repository in the form 'use-with-alaveteli-0.6.5' that matches the ALAVETELI_VERSION being deployed - if it finds such a tag, the theme will be checked out from that tag, rather than from the HEAD of the theme repository. If no such tag is found, HEAD is used, as before [issue #573](https://github.com/mysociety/alaveteli/issues/573). diff --git a/doc/DEPLOY.md b/doc/DEPLOY.md new file mode 100644 index 000000000..adeb0e113 --- /dev/null +++ b/doc/DEPLOY.md @@ -0,0 +1,41 @@ +# Deployment + +mySociety uses a custom deployment and buildout system however Capistrano is included as part of Alaveteli as a standard deployment system. + +## Capistrano + +### Set up + +First you need to customise your deployment settings, e.g. the name of the server you're deploying to. This is done by copying the example file `config/deploy.yml.example` to `config/deploy.yml` and editing the settings to suit you. + +TODO: The following instructions could be greatly improved + +These are the general steps required to get your staging server up and running: + +* Install packages from `config/packages` +* Install Postgres and configure a user +* Create a directory to deploy to and make sure your deployment user can write to it +* Run `cap deploy:setup` to create directories, etc. +* Run `cap deploy:update_code` so that we've got a copy of the example config on the server. This process will take a long time installing gems, etc. it will also fail on `rake:themes:install` but that's OK +* SSH to the server, change to the `deploy_to` directory +* `cp releases/[SOME_DATE]/config/general.yml-example shared/general.yml` +* `cp releases/[SOME_DATE]/config/general.yml-example shared/general.yml` +* Edit those files to match your required settings +* Back on your machine run `cap deploy` and it should successfully deploy +* Run the DB migrations `cap deploy:migrate` +* Build the Xapian DB `cap xapian:rebuild_index` +* Configure Apache/Passenger with a DocumentRoot of `your_deploy_to/current/public` +* Phew. Time to admire your work by browsing to the server! + +### Usage + +Ensure you've got a `config/deploy.yml` file with the correct settings for your site. You'll need to share this with everyone in your team that deploys so it might be a good idea to keep the latest version in a [Gist](http://gist.github.com/). + +To deploy to staging just run `cap deploy` but if you want to deploy to production you need to run `cap -S stage=production deploy`. + +For additional usage instructions, see the [Capistrano wiki](https://github.com/capistrano/capistrano/wiki/). + +### TODO + +* Get `cap deploy:setup` to do most of the work described above in the *Set up* section +* Use [Whenever](https://github.com/javan/whenever) to set up cronjobs diff --git a/locale/aln/app.po b/locale/aln/app.po index b31c3d1bf..0b07e2754 100644 --- a/locale/aln/app.po +++ b/locale/aln/app.po @@ -8,15 +8,15 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-08-24 09:20+0100\n" -"PO-Revision-Date: 2012-08-24 08:21+0000\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" +"PO-Revision-Date: 2012-09-19 08:48+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: aln\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "" "\n" @@ -1968,6 +1968,9 @@ msgstr "" msgid "PublicBody|Home page" msgstr "" +msgid "PublicBody|Info requests count" +msgstr "" + msgid "PublicBody|Last edit comment" msgstr "" @@ -3453,6 +3456,9 @@ msgstr "" msgid "also called {{public_body_short_name}}" msgstr "" +msgid "an anonymous user" +msgstr "" + msgid "and" msgstr "" diff --git a/locale/app.pot b/locale/app.pot index 20433ad97..d927a0cb7 100644 --- a/locale/app.pot +++ b/locale/app.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: version 0.0.1\n" -"POT-Creation-Date: 2012-08-24 09:20+0100\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" "PO-Revision-Date: 2011-10-09 01:10+0200\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1779,6 +1779,9 @@ msgstr "" msgid "PublicBody|Home page" msgstr "" +msgid "PublicBody|Info requests count" +msgstr "" + msgid "PublicBody|Last edit comment" msgstr "" @@ -3137,6 +3140,9 @@ msgstr "" msgid "also called {{public_body_short_name}}" msgstr "" +msgid "an anonymous user" +msgstr "" + msgid "and" msgstr "" diff --git a/locale/bs/app.po b/locale/bs/app.po index 2576c296f..50f53128b 100644 --- a/locale/bs/app.po +++ b/locale/bs/app.po @@ -10,15 +10,15 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-08-24 09:20+0100\n" -"PO-Revision-Date: 2012-08-24 10:33+0000\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" +"PO-Revision-Date: 2012-09-19 08:48+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: bs\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" msgid "" "\n" @@ -1974,6 +1974,9 @@ msgstr "Javno tijelo|Početno slovo" msgid "PublicBody|Home page" msgstr "Javno tijelo|Home page" +msgid "PublicBody|Info requests count" +msgstr "" + msgid "PublicBody|Last edit comment" msgstr "Javno tijelo|Zadnji uređeni komentar" @@ -3465,6 +3468,9 @@ msgstr "svi zahtjevi" msgid "also called {{public_body_short_name}}" msgstr "takođe poznat/a kao {{public_body_short_name}}" +msgid "an anonymous user" +msgstr "" + msgid "and" msgstr "i" diff --git a/locale/ca/app.po b/locale/ca/app.po index 935ca5ae1..570e8ae50 100644 --- a/locale/ca/app.po +++ b/locale/ca/app.po @@ -10,15 +10,15 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-08-24 09:20+0100\n" -"PO-Revision-Date: 2012-08-24 10:31+0000\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" +"PO-Revision-Date: 2012-09-19 08:48+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ca\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "" "\n" @@ -1970,6 +1970,9 @@ msgstr "Primera letra" msgid "PublicBody|Home page" msgstr "Sitio web" +msgid "PublicBody|Info requests count" +msgstr "" + msgid "PublicBody|Last edit comment" msgstr "PublicBody|Last edit comment" @@ -3455,6 +3458,9 @@ msgstr "todas las solicitudes" msgid "also called {{public_body_short_name}}" msgstr "también conocido como {{public_body_short_name}}" +msgid "an anonymous user" +msgstr "" + msgid "and" msgstr "y" diff --git a/locale/cs/app.po b/locale/cs/app.po index 53d4df4ae..a0f227b48 100644 --- a/locale/cs/app.po +++ b/locale/cs/app.po @@ -5,20 +5,21 @@ # Translators: # Hana Huntova <>, 2012. # Jana Kneschke <>, 2012. +# <jana.kneschke@gmail.com>, 2012. # <josef.pospisil@laststar.eu>, 2012. msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-08-24 09:20+0100\n" -"PO-Revision-Date: 2012-08-24 10:32+0000\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" +"PO-Revision-Date: 2012-09-19 08:48+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: cs\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" msgid "" "\n" @@ -48,13 +49,13 @@ msgid " - view and make Freedom of Information requests" msgstr " - prohlížejte a vzneste dotaz" msgid " - wall" -msgstr "" +msgstr "- nástěnka" msgid "" " <strong>Note:</strong>\n" " We will send you an email. Follow the instructions in it to change\n" " your password." -msgstr " <strong>Upozornění:</strong>\n Pošleme vám e-mail s návodem, jak si změníte heslo." +msgstr " <strong>Upozornění:</strong>\n Pošleme vám e-mail s návodem, jak změnit heslo." msgid " <strong>Privacy note:</strong> Your email address will be given to" msgstr " <strong>Ochrana soukromí:</strong> Vaše e-mailová adresa bude předána" @@ -222,7 +223,7 @@ msgid "" " on other means to answer your question.\n" " </li>\n" " </ul>" -msgstr "" +msgstr "<p>Děkujeme vám! Dále můžete:</p> <ul> <li>vznést stejný dotaz na jinou instituci: nejdříve zkopírujte níže uvedený text dotazu a pak <a href=\"{{find_authority_url}}\">najděte požadovanou instituci</a>.</li> <li>Můžete také zpochybnit tvrzení instituce, pokud máte důvodné podezření, že tvrzení o nedostupnosti informací se nezakládá na skutečnosti: zde najdete <a href=\"{{complain_url}}\">popis, jak podat stížnost</a>. Také zde můžete</li> <li>pročíst další <a href=\"{{other_means_url}}\">tipy,</a> jak získat odpověď na svůj dotaz. </li> </ul>" msgid "" "<p>Thank you! Hope you don't have to wait much longer.</p> <p>By law, you " @@ -307,7 +308,7 @@ msgid "" " replied by then.</p>\n" " <p>If you write about this request (for example in a forum or a blog) please link to this page, and add an\n" " annotation below telling people about your writing.</p>" -msgstr "" +msgstr "Odesláno!\ndalší text viz e-mail od Hany z 29/9" msgid "" "<p>{{site_name}} is currently in maintenance. You can only view existing " @@ -324,9 +325,9 @@ msgstr "<small>Pokud používáte prohlížeč ke čtení a posílání e-mailů msgid "<span id='follow_count'>%d</span> person is following this authority" msgid_plural "" "<span id='follow_count'>%d</span> people are following this authority" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "<span id='follow_count'>%d</span> člověk sleduje tuto instituci" +msgstr[1] "'follow_count'>%d</span> lidí sledují tuto instituci" +msgstr[2] "'follow_count'>%d</span> lidí sleduje tuto instituci" msgid "" "<strong> Can I request information about myself?</strong>\n" @@ -413,7 +414,7 @@ msgstr "<strong>Poznámka:</strong>\n Pošleme vám zprávu na vaši e-mailov msgid "" "<strong>Note:</strong> You're sending a message to yourself, presumably\n" " to try out how it works." -msgstr "" +msgstr "<strong>Upozornění:</strong> Posíláte zprávu sami sobě." msgid "" "<strong>Privacy note:</strong> If you want to request private information about\n" @@ -423,7 +424,7 @@ msgstr "<strong>Ochrana soukromí:</strong> Pokud chcete vznést dotaz týkajíc msgid "" "<strong>Privacy note:</strong> Your photo will be shown in public on the Internet,\n" " wherever you do something on {{site_name}}." -msgstr "" +msgstr "<strong>Důležité upozornění:</strong> Vaše fotografie bude zveřejněna na stránkách Informace pro všechny pokaždé, kdy vznesete dotaz nebo přidáte komentář." msgid "" "<strong>Privacy warning:</strong> Your message, and any response\n" @@ -442,13 +443,13 @@ msgstr "<strong>neměli</strong> požadované informace." msgid "" "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> " "was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." -msgstr "" +msgstr "<a href=\"{{request_url}}\">Odpověď</a> v konverzaci týkající se <em>{{request_title}}</em> byla odeslána instituci {{public_body_name}} uživatelem {{info_request_user}} dne {{date}}." msgid "" "A <a href=\"{{request_url}}\">response</a> to <em>{{request_title}}</em> was" " sent by {{public_body_name}} to {{info_request_user}} on {{date}}. The " "request status is: {{request_status}}" -msgstr "" +msgstr "<a href=\"{{request_url}}\">Odpověď</a> na dotaz <em>{{request_title}}</em> byla odeslána institucí {{public_body_name}} uživateli {{info_request_user}} dne {{date}}. Dotaz je tedy ve stavu: {{request_status}}" msgid "" "A <strong>summary</strong> of the response if you have received it by post. " @@ -460,7 +461,7 @@ msgstr "Vznesený dotaz podle zákona 106/1999 Sb." msgid "" "A new request, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, " "was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." -msgstr "" +msgstr "Nový dotaz byl vznesen na instituci {{public_body_name}} uživatelem {{info_request_user}} dne {{date}}." msgid "A public authority" msgstr "Instituce" @@ -537,7 +538,7 @@ msgid "Also called {{other_name}}." msgstr "Také se nazývá {{other_name}}." msgid "Also send me alerts by email" -msgstr "" +msgstr "Upozornění posílat také e-mailem." msgid "Alter your subscription" msgstr "Změnit své odběry" @@ -550,7 +551,7 @@ msgstr "I když jsou všechny odpovědi automaticky uveřejňovány, hodnocení msgid "" "An <a href=\"{{request_url}}\">annotation</a> to <em>{{request_title}}</em> " "was made by {{event_comment_user}} on {{date}}" -msgstr "" +msgstr "<a href=\"{{request_url}}\">Dotaz</a> <em>{{request_title}}</em> byl okomentován uživatelem {{event_comment_user}} dne {{date}}" msgid "An <strong>error message</strong> has been received" msgstr "Byla nahlášena <strong>chyba</strong>" @@ -559,7 +560,7 @@ msgid "An Environmental Information Regulations request" msgstr "Dotazy ve smyslu zákona č. 123/1998 Sb., o právu na informace o životním prostředí" msgid "An anonymous user" -msgstr "" +msgstr "Nezaregistrovaný uživatel" msgid "Annotation added to request" msgstr "Poznámka u dotazů byla přidána" @@ -578,7 +579,7 @@ msgid "" msgstr "Poznámky zde budou veřejně k dispozici\n <strong>a nebudou</strong> poslány {{public_body_name}}." msgid "Anonymous user" -msgstr "" +msgstr "Nezaregistrovaný uživatel" msgid "Anyone:" msgstr "Kdokoli:" @@ -644,7 +645,7 @@ msgid "Cancel, return to your profile page" msgstr "Zrušit, návrat zpět do stránky s profilem" msgid "Censor rule" -msgstr "" +msgstr "Pravidla cenzury" msgid "CensorRule|Last edit comment" msgstr "Cenzorova pravidla | Poslední komentář" @@ -653,7 +654,7 @@ msgid "CensorRule|Last edit editor" msgstr "Cenzorova pravidla | Poslední editor" msgid "CensorRule|Regexp" -msgstr "" +msgstr "CensorRule|Regexp ??" msgid "CensorRule|Replacement" msgstr "Cenzorova pravidla | Nahrazení" @@ -704,13 +705,13 @@ msgid "Clarification" msgstr "Vysvětlení" msgid "Clarify your FOI request - " -msgstr "" +msgstr "Upřesněte svůj dotaz" msgid "Classify an FOI response from " msgstr "Zařaďte dotaz od " msgid "Clear photo" -msgstr "" +msgstr "Smazat fotografii" msgid "" "Click on the link below to send a message to {{public_body_name}} telling them to reply to your request. You might like to ask for an internal\n" @@ -723,10 +724,10 @@ msgid "" msgstr "Pro poslání upomínky klikněte na níže uvedený odkaz {{public_body}}. " msgid "Close" -msgstr "" +msgstr "Zavřít" msgid "Comment" -msgstr "" +msgstr "Komentář" msgid "Comment|Body" msgstr "Komentář | Text" @@ -741,23 +742,23 @@ msgid "Comment|Visible" msgstr "Komentář | Viditelný" msgid "Confirm you want to follow all successful FOI requests" -msgstr "" +msgstr "Potvrďte, že chcete být informováni o všech úspěšně zodpovězených dotazech. ??" msgid "Confirm you want to follow new requests" -msgstr "" +msgstr "Potvrďte, že chcete být informováni o nově vznesených dotazech." msgid "" "Confirm you want to follow new requests or responses matching your search" -msgstr "" +msgstr "Potvrďte, že chcete být informováni o nově vznesených dotazech a odpovědích, které se týkají zvolených témat." msgid "Confirm you want to follow requests by '{{user_name}}'" -msgstr "" +msgstr "Potvrďte, že chcete být informováni o nově vznesených dotazech vznesených uživatelem '{{user_name}}'" msgid "Confirm you want to follow requests to '{{public_body_name}}'" -msgstr "" +msgstr "Potvrďte, že chcete být informováni o dotazech vznesených na instituci '{{public_body_name}}'" msgid "Confirm you want to follow the request '{{request_title}}'" -msgstr "" +msgstr "Potvrďte, že chcete sledovat vznesený dotaz '{{request_title}}'" msgid "Confirm your FOI request to " msgstr "Potvrďte svůj dotaz vznesený na" @@ -776,13 +777,13 @@ msgstr "Potvrďte novou e-mailovou adresu na {{site_name}}" msgid "" "Considered by administrators as not an FOI request and hidden from site." -msgstr "" +msgstr "Tento dotaz neodopovídá 106/1999 Sb., o svobodném přístupu k informacím a byl tudíž skryt." msgid "Considered by administrators as vexatious and hidden from site." -msgstr "" +msgstr "Tento dotaz odporoval dobrým mravům a byl proto skryt." msgid "Contact {{recipient}}" -msgstr "" +msgstr "Kontaktovat {{recipient}} ??" msgid "Contact {{site_name}}" msgstr "Kontaktujte {{site_name}}" @@ -843,7 +844,7 @@ msgid "Done" msgstr "Hotovo" msgid "Done >>" -msgstr "" +msgstr "Hotovo >>" msgid "Download a zip file of all correspondence" msgstr "Stáhnout zazipovaný soubor celé korespondence" @@ -890,7 +891,7 @@ msgstr "Slova, která chcete najít musí být oddělena mezerou, například <s msgid "" "Enter your response below. You may attach one file (use email, or\n" " <a href=\"%s\">contact us</a> if you need more)." -msgstr "" +msgstr "Níže můžete vložit svou odpověď. Pokud je to nutné, přiložte jeden dokument, (s použitím e-mailu, nebo⏎ <a href=\"%s\">nás kontaktujte</a> pokud potřebujete přiložit více dokumentů). ??" msgid "Environmental Information Regulations" msgstr "Informace o životním prostředí" @@ -920,10 +921,10 @@ msgid "" msgstr "Veškeré informace, které vložíte na tuto stránku, včetně <strong>vašeho jména</strong>, \n budou<strong>uveřejněny</strong> na tomto webu(<a href=\"%s\">proč?</a>)." msgid "Exim log" -msgstr "" +msgstr "Exim log ??" msgid "Exim log done" -msgstr "" +msgstr "Exim log done ??" msgid "EximLogDone|Filename" msgstr "EximLogDone | Jméno souboru" @@ -953,7 +954,7 @@ msgid "FOI requests {{start_count}} to {{end_count}} of {{total_count}}" msgstr "Dotazy {{start_count}} do {{end_count}} z {{total_count}}" msgid "FOI response requires admin ({{reason}}) - {{title}}" -msgstr "" +msgstr "Odpověď vyžaduje zásah administrátora - ({{reason}}) - {{title}}" msgid "Failed to convert image to a PNG" msgstr "Nepodařilo se konvertovat obrázek do PNG. " @@ -973,7 +974,7 @@ msgid "" msgstr "Nejdříve napište <strong>název instituce</strong>, od které chcete získat informace. <strong>Podle zákona vám musí odpovědět</strong>\n (<a href=\"%s#%s\">proč?</a>)." msgid "Foi attachment" -msgstr "" +msgstr "Příloha k dotazu" msgid "FoiAttachment|Charset" msgstr "Příloha dotazu | Znaková sada" @@ -997,22 +998,22 @@ msgid "FoiAttachment|Within rfc822 subject" msgstr "Příloha dotazu | V rámci rfc822 subjektu" msgid "Follow" -msgstr "" +msgstr "Sledovat" msgid "Follow all new requests" -msgstr "" +msgstr "Sledovat všechny nově vznesené dotazy" msgid "Follow new successful responses" -msgstr "" +msgstr "Sledovat všechny zodpovězené dotazy ??" msgid "Follow requests to {{public_body_name}}" -msgstr "" +msgstr "Sledovat dotaz vznesený na {{public_body_name}}" msgid "Follow these requests" msgstr "Sledovat tyto dotazy" msgid "Follow things matching this search" -msgstr "" +msgstr "Sledovat témata vyhovující nastaveným kritériím" msgid "Follow this authority" msgstr "Sledovat tuto instituci" @@ -1021,7 +1022,7 @@ msgid "Follow this link to see the request:" msgstr "Pro prohlížení dotazu přejděte na tento odkaz:" msgid "Follow this person" -msgstr "" +msgstr "Sledovat tohoto uživatele" msgid "Follow this request" msgstr "Sledovat tyto dotazy" @@ -1047,7 +1048,7 @@ msgstr "Sledujte Informace pro všechny na Twitteru" msgid "" "Followups cannot be sent for this request, as it was made externally, and " "published here by {{public_body_name}} on the requester's behalf." -msgstr "" +msgstr "Není možné sledovat tento dotaz, neboť nebyl vznesen pomocí stránek Informace pro všechny a byl byl zveřejněn na žádost instituce {{public_body_name}}." msgid "" "For an unknown reason, it is not possible to make a request to this " @@ -1095,7 +1096,7 @@ msgid "Freedom of information requests to" msgstr "Dotaz vznesený na" msgid "From" -msgstr "" +msgstr "Od" msgid "" "From the request page, try replying to a particular message, rather than sending\n" @@ -1143,7 +1144,7 @@ msgid "" msgstr "Haló! Potřebujeme vaši pomoc. Osoba, která vznesla tento dotaz nám nesdělila, jestli byla zodpovězena úspěšně. Můžete si ji přečíst a pomoci nám udržovat stránky přehledné? Děkujeme." msgid "Holiday" -msgstr "" +msgstr "Státní svátek" msgid "Holiday|Day" msgstr "Svátek | Den" @@ -1178,7 +1179,7 @@ msgid "I don't want to do any more tidying now!" msgstr "Teď už nechci dělat další úpravy!" msgid "I like this request" -msgstr "" +msgstr "Líbí se mi tento dotaz" msgid "I would like to <strong>withdraw this request</strong>" msgstr "Chci <strong>zrušit dotaz</strong>" @@ -1288,7 +1289,7 @@ msgid "" msgstr "Pokud váš prohlížeč akceptuje cookies a vy vidíte tuto zprávu,\npravděpodobně je nějaký problém s naším serverem." msgid "Incoming message" -msgstr "" +msgstr "Příchozí zpráva" msgid "IncomingMessage|Cached attachment text clipped" msgstr "Příchozí zpráva | Soubor z mezipaměti přiložen" @@ -1318,10 +1319,10 @@ msgid "IncomingMessage|Valid to reply to" msgstr "IncomingMessage | Platná zpráva pro" msgid "Info request" -msgstr "" +msgstr "Žádost o informaci" msgid "Info request event" -msgstr "" +msgstr "Žádost o informaci – akce ??" msgid "InfoRequestEvent|Calculated state" msgstr "InfoRequestEvent| V procesu" @@ -1345,7 +1346,7 @@ msgid "InfoRequest|Allow new responses from" msgstr "InfoRequestEvent | Povolit nové odpovědi od" msgid "InfoRequest|Attention requested" -msgstr "" +msgstr "InfoRequestEvent | Podle zákona ??" msgid "InfoRequest|Awaiting description" msgstr "InfoRequestEvent | Očekává se popis" @@ -1354,10 +1355,10 @@ msgid "InfoRequest|Described state" msgstr "InfoRequestEvent | Popsaný status" msgid "InfoRequest|External url" -msgstr "" +msgstr "InfoRequestEvent| Název URL" msgid "InfoRequest|External user name" -msgstr "" +msgstr "InfoRequest|External user name ??" msgid "InfoRequest|Handle rejected responses" msgstr "InfoRequestEvent | Řešit odmítnuté odpovědi" @@ -1402,7 +1403,7 @@ msgstr "Může to být tím, že váš prohlížeč není nastaven pro příjem msgid "" "Items matching the following conditions are currently displayed on your " "wall." -msgstr "" +msgstr "Témata týkající se následujících kritérií jsou zobrazeny na vaší nástěnce." msgid "Joined in" msgstr "Zapojen v" @@ -1439,7 +1440,7 @@ msgid "Log in to download a zip file of {{info_request_title}}" msgstr "Přihlaste se ke stažení komprimovaného souboru {{info_request_title}}" msgid "Log into the admin interface" -msgstr "" +msgstr "Přihlásit jako admin" msgid "Long overdue." msgstr "Velké zpoždění." @@ -1475,7 +1476,7 @@ msgid "Make your own request" msgstr "Vzneste vlastní dotaz" msgid "Message" -msgstr "" +msgstr "Zpráva" msgid "Message sent using {{site_name}} contact form, " msgstr "Zpráva zaslána pomocí kontaktního formuláře stránek {{site_name}}, " @@ -1502,7 +1503,7 @@ msgid "My requests" msgstr "Moje dotazy" msgid "My wall" -msgstr "" +msgstr "Moje nástěnka" msgid "Name can't be blank" msgstr "Jméno nemůže zůstat prázdné" @@ -1526,7 +1527,7 @@ msgid "New password: (again)" msgstr "Nové heslo (znovu):" msgid "New response to '{{title}}'" -msgstr "" +msgstr "Nová odpověď na '{{title}}'" msgid "New response to your FOI request - " msgstr "Nová odpověď na váš dotaz -" @@ -1572,7 +1573,7 @@ msgstr "Nic tu není" msgid "" "Note that the requester will not be notified about your annotation, because " "the request was published by {{public_body_name}} on their behalf." -msgstr "" +msgstr "Rádi bychom vás uzporonili, že tazatel nebude na váš komentář upozorněn, jelikož tento dotaz byl zveřejněn na žádost instituce {{public_body_name}}." msgid "Now check your email!" msgstr "Nyní zkontrolujte svou e-mailovou schránku!" @@ -1590,7 +1591,7 @@ msgid "OR remove the existing photo" msgstr "NEBO odstraňte existující foto" msgid "Offensive? Unsuitable?" -msgstr "" +msgstr "Nevhodný obsah?" msgid "" "Oh no! Sorry to hear that your request was refused. Here is what to do now." @@ -1642,7 +1643,7 @@ msgid "Other:" msgstr "Jiné:" msgid "Outgoing message" -msgstr "" +msgstr "Odchozí zpráva" msgid "OutgoingMessage|Body" msgstr "Odchozí zpráva | Text" @@ -1873,7 +1874,7 @@ msgid "Post annotation" msgstr "Zveřejněte anotaci" msgid "Post redirect" -msgstr "" +msgstr "Přesměrování zpráv" msgid "PostRedirect|Circumstance" msgstr "PostRedirect | Okolnosti" @@ -1918,7 +1919,7 @@ msgid "Preview your public request" msgstr "Náhled vašeho dotazu" msgid "Profile photo" -msgstr "" +msgstr "Profilová fotografie" msgid "ProfilePhoto|Data" msgstr "Profilové foto | Data" @@ -1936,37 +1937,37 @@ msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "Instituce od {{start_count}} do {{end_count}} z {{total_count}}" msgid "Public body" -msgstr "" +msgstr "Instituce" msgid "Public body/translation" -msgstr "" +msgstr "PublicBody | Verze ??" msgid "PublicBody::Translation|First letter" -msgstr "" +msgstr "PublicBody | Začáteční písmeno" msgid "PublicBody::Translation|Locale" -msgstr "" +msgstr "PublicBody | Lokální ??" msgid "PublicBody::Translation|Name" -msgstr "" +msgstr "PublicBody | Název" msgid "PublicBody::Translation|Notes" -msgstr "" +msgstr "PublicBody | Poznámka" msgid "PublicBody::Translation|Publication scheme" -msgstr "" +msgstr "PublicBody | Publikační schéma ??" msgid "PublicBody::Translation|Request email" -msgstr "" +msgstr "PublicBody::Translation|Zadejte e-mail ??" msgid "PublicBody::Translation|Short name" -msgstr "" +msgstr "PublicBody::Translation|Krátké jméno ??" msgid "PublicBody::Translation|Url name" -msgstr "" +msgstr "PublicBody::Translation|Název URL" msgid "PublicBody|Api key" -msgstr "" +msgstr "PublicBody | Název ??" msgid "PublicBody|First letter" msgstr "PublicBody | První dopis" @@ -1974,6 +1975,9 @@ msgstr "PublicBody | První dopis" msgid "PublicBody|Home page" msgstr "PublicBody | Domovská stránka" +msgid "PublicBody|Info requests count" +msgstr "" + msgid "PublicBody|Last edit comment" msgstr "PublicBody | Naposled aktualizovaný komentář" @@ -2005,13 +2009,13 @@ msgid "Publication scheme" msgstr "Systém publikování" msgid "Purge request" -msgstr "" +msgstr "Vyčistit formulář dotazu" msgid "PurgeRequest|Model" -msgstr "" +msgstr "PurgeRequest|Verze ??" msgid "PurgeRequest|Url" -msgstr "" +msgstr "PurgeRequest|URL" msgid "RSS feed" msgstr "RSS" @@ -2051,13 +2055,13 @@ msgid "Report abuse" msgstr "Nahlásit zneužití" msgid "Report an offensive or unsuitable request" -msgstr "" +msgstr "Upozornit na nevhodný obsah dotazu" msgid "Report this request" -msgstr "" +msgstr "Upozornit na tento dotaz" msgid "Reported for administrator attention." -msgstr "" +msgstr "Administrátor byl již upozorněn." msgid "Request an internal review" msgstr "Požádat o přezkoumání dotazu" @@ -2087,7 +2091,7 @@ msgstr "Dotaz byl vznesen dne {{date}}" msgid "" "Requests for personal information and vexatious requests are not considered " "valid for FOI purposes (<a href=\"/help/about\">read more</a>)." -msgstr "" +msgstr "Požadavky na informace osobního charakteru a obsah odporující dobrým mravům odporují zákonu 106/1999 Sb., o svobodném přístupu k informacím (<a href=\"/help/about\">Více si přečtěte v nápovědě</a>)." msgid "Requests or responses matching your saved search" msgstr "Dotazy nebo odpovědi odpovídající vašemu uloženému hledání" @@ -2111,7 +2115,7 @@ msgid "Response from a public authority" msgstr "Odpověď od instituce" msgid "Response to '{{title}}'" -msgstr "" +msgstr "Odpověď na '{{title}}'" msgid "Response to this request is <strong>delayed</strong>." msgstr "Odpověď na tento dotaz má <strong>zpoždění</strong>." @@ -2189,7 +2193,7 @@ msgid "Send a public reply to {{person_or_body}}" msgstr "Pošlete veřejnou odpověď {{person_or_body}}" msgid "Send follow up to '{{title}}'" -msgstr "" +msgstr "Odpovědět na '{{title}}'" msgid "Send message" msgstr "Vznést dotaz" @@ -2260,7 +2264,7 @@ msgstr "Někdo, možná vy, zkusil změnit svou e-mailovou adresu on\n{{site_nam msgid "" "Sorry - you cannot respond to this request via {{site_name}}, because this " "is a copy of the request originally at {{link_to_original_request}}." -msgstr "" +msgstr "Omlouváme se, ale není možné odpovědět na tento dotaz pomocí stránek {{site_name}}, neboť se jedná o kopii originálního dotazu {{link_to_original_request}}." msgid "Sorry, but only {{user_name}} is allowed to do that." msgstr "Omlouváme se, toto může provést pouze {{user_name}}." @@ -2290,7 +2294,7 @@ msgid "Still awaiting an <strong>internal review</strong>" msgstr "Stále čekám na <strong>přezkoumání dotazu</strong>" msgid "Subject" -msgstr "" +msgstr "Předmět" msgid "Subject:" msgstr "Předmět:" @@ -2497,13 +2501,13 @@ msgid "Then you can download a zip file of {{info_request_title}}." msgstr "Poté si můžete stáhnout komprimovaný soubor {{info_request_title}}." msgid "Then you can log into the administrative interface" -msgstr "" +msgstr "Poté se můžete přihlásit do administrátorské sekce. ??" msgid "Then you can play the request categorisation game." msgstr "Poté si můžete zahrát hru na kategorizaci dotazů. " msgid "Then you can report the request '{{title}}'" -msgstr "" +msgstr "Poté můžete nahlásit nevhodný dotaz '{{title}}'. ??" msgid "Then you can send a message to " msgstr "Poté můžete poslat zprávu pro" @@ -2524,30 +2528,30 @@ msgid "Then you can write your reply to " msgstr "Poté můžete odpovědět na zprávu od" msgid "Then you will be following all new FOI requests." -msgstr "" +msgstr "Poté budete sledovat všechny nově vznesené dotazy. ??" msgid "" "Then you will be notified whenever '{{user_name}}' requests something or " "gets a response." -msgstr "" +msgstr "Od nynějška budete upozorněni na aktivity týkající se uživatele '{{user_name}}': reakce na dotaz, zodpovězení dotazu a vznesení nového dotazu." msgid "" "Then you will be notified whenever a new request or response matches your " "search." -msgstr "" +msgstr "Od nynějška budete upozorněni, jakmile bude vznesen nový dotaz, odpovídající vámi zadaným kritériím." msgid "Then you will be notified whenever an FOI request succeeds." -msgstr "" +msgstr "Od nynějška budete upozorněni na všechny úspěšně zodpovězené dotazy." msgid "" "Then you will be notified whenever someone requests something or gets a " "response from '{{public_body_name}}'." -msgstr "" +msgstr "Od nynějška budete upozorněni jakmile bude na '{{public_body_name}}' vznesen nový dotaz nebo daná instituce na již vznesený dotaz zareaguje nebo jej zodpoví." msgid "" "Then you will be updated whenever the request '{{request_title}}' is " "updated." -msgstr "" +msgstr "Budete upozorněni na zmeěu stavu u dotazu '{{request_title}}'." msgid "Then you'll be allowed to send FOI requests." msgstr "Pak můžete vznést dotaz." @@ -2572,7 +2576,7 @@ msgstr[2] "%d lidí sleduje tento dotaz" msgid "" "There is <strong>more than one person</strong> who uses this site and has this name.\n" " One of them is shown below, you may mean a different one:" -msgstr "" +msgstr "Již existuje <strong>více než jedna další osoba</strong> která se zaregistrovala na těchto stránkách pod stejným jménem.⏎ Zvolte tedy prosím jiné uživatelské jméno než je:" msgid "" "There is a limit on the number of requests you can make in a day, because we" @@ -2621,7 +2625,7 @@ msgid "Things to do with this request" msgstr "Co můžete dělat s tímto dotazem," msgid "Things you're following" -msgstr "" +msgstr "Sledujete:" msgid "This authority no longer exists, so you cannot make a request to it." msgstr "Tato instituce již neexistuje, nelze na niproto vznést dotaz. " @@ -2637,7 +2641,7 @@ msgid "" msgstr "Toto zahrnuje široké spektrum informací o stavu \n <strong>přírody a památek</strong>, například:" msgid "This external request has been hidden" -msgstr "" +msgstr "This external request has been hidden ??" msgid "" "This is a plain-text version of the Freedom of Information request " @@ -2691,7 +2695,7 @@ msgid "This request <strong>requires administrator attention</strong>" msgstr "Tento dotaz <strong>vyžaduje pozornost administrátora</strong>" msgid "This request has already been reported for administrator attention" -msgstr "" +msgstr "Tento dotaz byl již nahlášen." msgid "This request has an <strong>unknown status</strong>." msgstr "Stav tohoto dotazu je <strong>neznámý</strong>." @@ -2699,18 +2703,18 @@ msgstr "Stav tohoto dotazu je <strong>neznámý</strong>." msgid "" "This request has been <strong>hidden</strong> from the site, because an " "administrator considers it not to be an FOI request" -msgstr "" +msgstr "Tento dotaz byl <strong>skryt</strong>, jelikož se na něj nevztahuje zákon 106/1999 Sb., o svobodném přístupu k informacím." msgid "" "This request has been <strong>hidden</strong> from the site, because an " "administrator considers it vexatious" -msgstr "" +msgstr "Tento dotaz byl <strong>skryt</strong>, jelikož jeho obsah odporoval dobrým mravům." msgid "" "This request has been <strong>reported</strong> as needing administrator " "attention (perhaps because it is vexatious, or a request for personal " "information)" -msgstr "" +msgstr "Tento dotaz byl <strong>nahlášen</strong> administrátorům stránek, (pravděpodobně z důvodu nevhodného obsahu)." msgid "" "This request has been <strong>withdrawn</strong> by the person who made it.\n" @@ -2721,10 +2725,10 @@ msgid "" "This request has been marked for review by the site administrators, who have" " not hidden it at this time. If you believe it should be hidden, please <a " "href=\"%s\">contact us</a>." -msgstr "" +msgstr "This request has been marked for review by the site administrators, who have not hidden it at this time. If you believe it should be hidden, please <a href=\"%s\">contact us</a>." msgid "This request has been reported for administrator attention" -msgstr "" +msgstr "Odesláno administrátorovi" msgid "" "This request has been set by an administrator to \"allow new responses from " @@ -2750,7 +2754,7 @@ msgid "This request is still in progress:" msgstr "Tento dotaz je stále aktivní:" msgid "This request was not made via {{site_name}}" -msgstr "" +msgstr "Tento dotaz nebyl vznesen pomocí stránek {{site_name}}" msgid "" "This response has been hidden. See annotations to find out why.\n" @@ -2799,24 +2803,24 @@ msgid "To download the zip file" msgstr "Ke stažení komprimovaného souboru" msgid "To follow all successful requests" -msgstr "" +msgstr "Sledovat všechny úspěšně zodpovězené dotazy" msgid "To follow new requests" -msgstr "" +msgstr "Sledovat nově vznesené dotazy." msgid "To follow requests and responses matching your search" msgstr "Pro sledování dotazů a odpovědí podle zadaného vyhledávání" msgid "To follow requests by '{{user_name}}'" -msgstr "" +msgstr "Sledovat dotazy vznesené uživatelem '{{user_name}}'" msgid "" "To follow requests made using {{site_name}} to the public authority " "'{{public_body_name}}'" -msgstr "" +msgstr "Sledovat dotazy vznesené prostřednictvím stránek {{site_name}} na instituci '{{public_body_name}}'" msgid "To follow the request '{{request_title}}'" -msgstr "" +msgstr "Sledovat dotaz '{{request_title}}'" msgid "" "To help us keep the site tidy, someone else has updated the status of the \n" @@ -2825,10 +2829,10 @@ msgstr "Abychom udržovali stránky přehledné, někdo jiný upravil dotaz {{ti msgid "" "To let everyone know, follow this link and then select the appropriate box." -msgstr "" +msgstr "To let everyone know, follow this link and then select the appropriate box. ??" msgid "To log into the administrative interface" -msgstr "" +msgstr "Přihlásit se do administrace" msgid "To play the request categorisation game" msgstr "Zahrát si hru na kategorizaci dotazů" @@ -2840,7 +2844,7 @@ msgid "To reply to " msgstr "Odpovědět " msgid "To report this FOI request" -msgstr "" +msgstr "Nahlásit tento dotaz" msgid "To send a follow up message to " msgstr "Poslat další odpověď" @@ -2881,13 +2885,13 @@ msgid "Today" msgstr "Dnes" msgid "Too many requests" -msgstr "" +msgstr "Příliš mnoho dotazů" msgid "Top search results:" msgstr "Nejrelevantnější výsledky vyhledávání" msgid "Track thing" -msgstr "" +msgstr "Sledovat" msgid "Track this person" msgstr "Sledovat tohoto uživatele" @@ -2905,7 +2909,7 @@ msgid "TrackThing|Track type" msgstr "TrackThing | Sledovat typ ??" msgid "Turn off email alerts" -msgstr "" +msgstr "Nezasílat e-mailová upozornění" msgid "Tweet this request" msgstr "Tweetujte tento dotaz" @@ -2967,10 +2971,10 @@ msgid "" msgstr "Použijte uvozovky pokud chcete vyhledat přesnou frázi, např. <strong><code>\"Statutární město Liberec\"</code></strong>" msgid "User" -msgstr "" +msgstr "Uživatel" msgid "User info request sent alert" -msgstr "" +msgstr "User info request sent alert ??" msgid "UserInfoRequestSentAlert|Alert type" msgstr "UserInfoRequestSentAlert| Typ upozornění" @@ -2979,7 +2983,7 @@ msgid "User|About me" msgstr "User | O mně" msgid "User|Address" -msgstr "" +msgstr "User | Adresa" msgid "User|Admin level" msgstr "User | Úroveň admin" @@ -2988,7 +2992,7 @@ msgid "User|Ban text" msgstr "User | Zakázat text" msgid "User|Dob" -msgstr "" +msgstr "User | Datum narození" msgid "User|Email" msgstr "User | E-mail" @@ -3018,7 +3022,7 @@ msgid "User|No limit" msgstr "User | Žádné omezení" msgid "User|Receive email alerts" -msgstr "" +msgstr "User|Zasílat e-mailová upozornění" msgid "User|Salt" msgstr "User | Salt ??" @@ -3174,38 +3178,38 @@ msgid "You" msgstr "Vy" msgid "You are already following new requests" -msgstr "" +msgstr "Nově vznesené dotazy již sledujete." msgid "You are already following requests to {{public_body_name}}" -msgstr "" +msgstr "Dotazy vznesené na instituci {{public_body_name}} již sledujete." msgid "You are already following things matching this search" -msgstr "" +msgstr "Tyto kategorie a témata již sledujete." msgid "You are already following this person" -msgstr "" +msgstr "Tohoto uživatele již sledujete." msgid "You are already following this request" -msgstr "" +msgstr "Tento dotaz již sledujete." msgid "You are already following updates about {{track_description}}" -msgstr "" +msgstr "Již sledujete {{track_description}}" msgid "" "You are currently receiving notification of new activity on your wall by " "email." -msgstr "" +msgstr "Pokud se cokoliv změní na vaší nástěnce, budete upozorněni e-mailem." msgid "You are following all new successful responses" -msgstr "" +msgstr "Budete upozorněni na všechny úspěšně zodpovězené dotazy." msgid "You are no longer following {{track_description}}" -msgstr "" +msgstr "Již dále nesledujete {{track_description}}" msgid "" "You are now <a href=\"{{wall_url_user}}\">following</a> updates about " "{{track_description}}" -msgstr "" +msgstr "Od nynějška budete upozorněni na změny týkající se <a href=\"{{wall_url_user}}\">sledovaného</a> tématu {{track_description}}" msgid "You can <strong>complain</strong> by" msgstr "Můžete si <strong>stěžovat</strong> " @@ -3213,7 +3217,7 @@ msgstr "Můžete si <strong>stěžovat</strong> " msgid "" "You can change the requests and users you are following on <a " "href=\"{{profile_url}}\">your profile page</a>." -msgstr "" +msgstr "Můžete změnit sledované dotazy a uživatele <a href=\"{{profile_url}}\">ve svém profilu</a>." msgid "" "You can get this page in computer-readable format as part of the main JSON\n" @@ -3263,7 +3267,7 @@ msgstr "Víte, co způsobilo chybu a můžete <strong>navrhnout řešení</stron msgid "" "You may <strong>include attachments</strong>. If you would like to attach a\n" " file too large for email, use the form below." -msgstr "" +msgstr "Můžete <strong>přiložit dokumenty</strong>. POkud je vaše příloha⏎ příliš velká pro poslání e-mailem, použíjte formulář níže." msgid "" "You may be able to find\n" @@ -3287,7 +3291,7 @@ msgid "You need to be logged in to clear your profile photo." msgstr "Vymazání profilového fota je možné provést po přihlášení." msgid "You need to be logged in to edit your profile." -msgstr "" +msgstr "Musíte být zaregistrován/a, abyste mohl/a editovat svůj profil." msgid "" "You previously submitted that exact follow up message for this request." @@ -3296,7 +3300,7 @@ msgstr "V minulosti jste již vložili úplně stejnou zprávu týkající se to msgid "" "You should have received a copy of the request by email, and you can respond\n" " by <strong>simply replying</strong> to that email. For your convenience, here is the address:" -msgstr "" +msgstr "Měli byste obdržet kopii dotazu e-mailem. Odpovědět můžete na tento e-mail <strong>jednoduše</strong>. Zde je adresa:" msgid "" "You want to <strong>give your postal address</strong> to the authority in " @@ -3316,7 +3320,7 @@ msgstr "E-mailová upozornění o těchto aktualizacích vám přestanou chodit msgid "" "You will now be emailed updates about {{track_description}}. <a " "href=\"{{change_email_alerts_url}}\">Prefer not to receive emails?</a>" -msgstr "" +msgstr "Od nynějška budete dostávat e-mailové upozornění týkající se změn v dotazu {{track_description}}. <a href=\"{{change_email_alerts_url}}\">Nechcete dostávat e-maily týkající se tohoto dotazu?</a>" msgid "" "You will only get an answer to your request if you follow up\n" @@ -3327,7 +3331,7 @@ msgid "You're long overdue a response to your FOI request - " msgstr "Dlouho jste nereagovali na odpověď k vašemu dotazu" msgid "You're not following anything." -msgstr "" +msgstr "Nesledujete žádný vznesený dotaz." msgid "You've now cleared your profile photo" msgstr "Vaše profilové foto bylo vymazáno. " @@ -3381,7 +3385,7 @@ msgid "" msgstr "Vaše zpráva byla odeslána. Děkujeme vám, odpovíme co nejdříve. " msgid "Your message to {{recipient_user_name}} has been sent" -msgstr "" +msgstr "Vaše zpráva pro uživatele {{recipient_user_name}} byla odeslána." msgid "Your message to {{recipient_user_name}} has been sent!" msgstr "Vaše zpráva pro {{recipient_user_name}} byla odeslána!" @@ -3413,7 +3417,7 @@ msgstr "Vaše heslo:" msgid "" "Your photo will be shown in public <strong>on the Internet</strong>,\n" " wherever you do something on {{site_name}}." -msgstr "" +msgstr "<strong>Důležité upozornění:</strong> Vaše fotografie bude zveřejněna na stránkách Informace pro všechny pokaždé, kdy vznesete dotaz nebo přidáte komentář." msgid "" "Your request was called {{info_request}}. Letting everyone know whether you " @@ -3443,13 +3447,13 @@ msgid "Yours sincerely," msgstr "S pozdravem," msgid "[FOI #{{request}} email]" -msgstr "" +msgstr "[FOI #{{request}} e-mail] ??" msgid "[{{public_body}} request email]" -msgstr "" +msgstr "[{{public_body}} request e-mail] ??" msgid "[{{site_name}} contact email]" -msgstr "" +msgstr "[{{site_name}} kontaktní e-mail]" msgid "" "a one line summary of the information you are requesting, \n" @@ -3465,6 +3469,9 @@ msgstr "všechny dotazy" msgid "also called {{public_body_short_name}}" msgstr "také se nazývá {{public_body_short_name}}" +msgid "an anonymous user" +msgstr "" + msgid "and" msgstr "a" @@ -3527,7 +3534,7 @@ msgid "" msgstr "obsahující vaši poštovní adresu, a žádající o odpověď na tento dotaz.\n Nebo jim můžete zavolat." msgid "details" -msgstr "" +msgstr "detaily" msgid "display_status only works for incoming and outgoing messages right now" msgstr "display_status právě teď funguje pouze pro příchozí a odchozí zprávy" @@ -3545,7 +3552,7 @@ msgid "everything" msgstr "vše" msgid "external" -msgstr "" +msgstr "externí" msgid "has reported an" msgstr "nahlásil" @@ -3554,7 +3561,7 @@ msgid "have delayed." msgstr "je zpoždění" msgid "hide quoted sections" -msgstr "" +msgstr "skrýt citované pasáže" msgid "in term time" msgstr "v dané lhůtě" @@ -3626,13 +3633,13 @@ msgid "sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "posláno {{public_body_name}} od {{info_request_user}} v {{date}}." msgid "show quoted sections" -msgstr "" +msgstr "ukázat citované pasáže" msgid "sign in" msgstr "přihlásit se" msgid "simple_date_format" -msgstr "" +msgstr "simple_date_format ??" msgid "successful" msgstr "úspěšné" @@ -3650,7 +3657,7 @@ msgid "the main FOI contact at {{public_body}}" msgstr "hlavní kontakt pro vznesení dotazu na {{public_body}}" msgid "the requester" -msgstr "" +msgstr "tazatel" msgid "the {{site_name}} team" msgstr "{{site_name}} tým" @@ -3713,7 +3720,7 @@ msgid "{{law_used_full}} request GQ - {{title}}" msgstr "{{law_used_full}} žádejte GQ - {{title}} ??" msgid "{{law_used}} requests at {{public_body}}" -msgstr "" +msgstr "{{law_used}} dotazy vznesené na instituci{{public_body}}" msgid "{{length_of_time}} ago" msgstr "před {{length_of_time}}" @@ -3729,7 +3736,7 @@ msgstr "Pouze {{public_body_name}}:" msgid "" "{{public_body}} has asked you to explain part of your {{law_used}} request." -msgstr "" +msgstr "{{public_body}} vás žádá o doplnění vzneseného dotazu {{law_used}}." msgid "{{public_body}} sent a response to {{user_name}}" msgstr "{{public_body}} zaslal odpověď pro {{user_name}}" @@ -3755,16 +3762,16 @@ msgid "" msgstr "{{site_name}} tazatelé podali {{number_of_requests}} dotazů, včetně:" msgid "{{title}} - a Freedom of Information request to {{public_body}}" -msgstr "" +msgstr "{{title}} - dotaz vznesený podle zákona 106/1999 Sb., o svobodném přístupu k informacím na instituci {{public_body}}" msgid "{{user_name}} (Account suspended)" msgstr "{{user_name}} (Účet pozastaven)" msgid "{{user_name}} - Freedom of Information requests" -msgstr "" +msgstr "{{user_name}} - dotaz podle zákona 106/1999 Sb., o svobodném přístupu k informacím" msgid "{{user_name}} - user profile" -msgstr "" +msgstr "{{user_name}} - uživatelský profil" msgid "{{user_name}} added an annotation" msgstr "{{user_name}} přidal poznámku" diff --git a/locale/cy/app.po b/locale/cy/app.po index 937453daa..f129d3685 100644 --- a/locale/cy/app.po +++ b/locale/cy/app.po @@ -3,20 +3,20 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# <alex@alexskene.com>, 2011, 2012. +# <alex@alexskene.com>, 2011-2012. msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-08-24 09:20+0100\n" -"PO-Revision-Date: 2012-08-24 08:21+0000\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" +"PO-Revision-Date: 2012-09-19 08:48+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: cy\n" -"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3\n" +"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n" msgid "" "\n" @@ -1976,6 +1976,9 @@ msgstr "" msgid "PublicBody|Home page" msgstr "" +msgid "PublicBody|Info requests count" +msgstr "" + msgid "PublicBody|Last edit comment" msgstr "" @@ -3473,6 +3476,9 @@ msgstr "" msgid "also called {{public_body_short_name}}" msgstr "" +msgid "an anonymous user" +msgstr "" + msgid "and" msgstr "" diff --git a/locale/de/app.po b/locale/de/app.po index e887d9618..a890a48a1 100644 --- a/locale/de/app.po +++ b/locale/de/app.po @@ -11,15 +11,15 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-08-24 09:20+0100\n" -"PO-Revision-Date: 2012-08-24 10:31+0000\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" +"PO-Revision-Date: 2012-09-19 08:48+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: de\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "" "\n" @@ -1971,6 +1971,9 @@ msgstr "PublicBody|First letter" msgid "PublicBody|Home page" msgstr "PublicBody|Home page" +msgid "PublicBody|Info requests count" +msgstr "" + msgid "PublicBody|Last edit comment" msgstr "PublicBody|Last edit comment" @@ -3456,6 +3459,9 @@ msgstr "alle Anfragen" msgid "also called {{public_body_short_name}}" msgstr "auch genannt: {{public_body_short_name}}" +msgid "an anonymous user" +msgstr "" + msgid "and" msgstr "und" diff --git a/locale/en/app.po b/locale/en/app.po index 8fab8256f..2129ccb8c 100644 --- a/locale/en/app.po +++ b/locale/en/app.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: version 0.0.1\n" -"POT-Creation-Date: 2012-08-24 09:20+0100\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" "PO-Revision-Date: 2011-02-24 07:11-0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1778,6 +1778,9 @@ msgstr "" msgid "PublicBody|Home page" msgstr "" +msgid "PublicBody|Info requests count" +msgstr "" + msgid "PublicBody|Last edit comment" msgstr "" @@ -3136,6 +3139,9 @@ msgstr "" msgid "also called {{public_body_short_name}}" msgstr "" +msgid "an anonymous user" +msgstr "" + msgid "and" msgstr "" diff --git a/locale/en_IE/app.po b/locale/en_IE/app.po index 54fda3cdc..dfc576c0b 100644 --- a/locale/en_IE/app.po +++ b/locale/en_IE/app.po @@ -8,15 +8,15 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-08-24 09:20+0100\n" -"PO-Revision-Date: 2012-08-24 08:21+0000\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" +"PO-Revision-Date: 2012-09-19 08:48+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: en_IE\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "" "\n" @@ -1968,6 +1968,9 @@ msgstr "" msgid "PublicBody|Home page" msgstr "" +msgid "PublicBody|Info requests count" +msgstr "" + msgid "PublicBody|Last edit comment" msgstr "" @@ -3453,6 +3456,9 @@ msgstr "" msgid "also called {{public_body_short_name}}" msgstr "" +msgid "an anonymous user" +msgstr "" + msgid "and" msgstr "" diff --git a/locale/es/app.po b/locale/es/app.po index b67c26a81..5e571502c 100644 --- a/locale/es/app.po +++ b/locale/es/app.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# David Cabo <david.cabo@gmail.com>, 2011, 2012. +# David Cabo <david.cabo@gmail.com>, 2011-2012. # <fabrizio.scrollini@gmail.com>, 2012. # <gabelula@gmail.com>, 2012. # skenaja <alex@alexskene.com>, 2011. @@ -12,15 +12,15 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-08-24 09:20+0100\n" -"PO-Revision-Date: 2012-08-24 10:34+0000\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" +"PO-Revision-Date: 2012-09-19 08:48+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: es\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "" "\n" @@ -1871,7 +1871,7 @@ msgid "Post annotation" msgstr "Enviar comentario" msgid "Post redirect" -msgstr "" +msgstr "Redirigir post" msgid "PostRedirect|Circumstance" msgstr "PostRedirect|Circumstance" @@ -1946,19 +1946,19 @@ msgid "PublicBody::Translation|Locale" msgstr "PublicBody::Translation|Locale" msgid "PublicBody::Translation|Name" -msgstr "" +msgstr "Nombre" msgid "PublicBody::Translation|Notes" -msgstr "" +msgstr "Notas" msgid "PublicBody::Translation|Publication scheme" -msgstr "" +msgstr "Transparencia Activa" msgid "PublicBody::Translation|Request email" -msgstr "" +msgstr "Solicitar Correo" msgid "PublicBody::Translation|Short name" -msgstr "" +msgstr "Nombre Corto" msgid "PublicBody::Translation|Url name" msgstr "<p>Thank you! Here are some ideas on what to do next:</p>⏎\n <ul>⏎\n <li>To send your request to another authority, first copy the text of your request below, then <a href=\"{{find_authority_url}}\">find the other authority</a>.</li>⏎\n <li>If you would like to contest the authority's claim that they do not hold the information, here is⏎\n <a href=\"{{complain_url}}\">how to complain</a>.⏎\n </li>⏎\n <li>We have <a href=\"{{other_means_url}}\">suggestions</a>⏎\n on other means to answer your question.⏎\n </li>⏎\n </ul>" @@ -1972,6 +1972,9 @@ msgstr "Primera letra" msgid "PublicBody|Home page" msgstr "Sitio web" +msgid "PublicBody|Info requests count" +msgstr "" + msgid "PublicBody|Last edit comment" msgstr "PublicBody|Last edit comment" @@ -2003,13 +2006,13 @@ msgid "Publication scheme" msgstr "Esquema de publicación" msgid "Purge request" -msgstr "" +msgstr "Eliminar pedido" msgid "PurgeRequest|Model" -msgstr "" +msgstr "Modelo" msgid "PurgeRequest|Url" -msgstr "" +msgstr "URL" msgid "RSS feed" msgstr "RSS" @@ -2617,7 +2620,7 @@ msgid "Things to do with this request" msgstr "Cosas que hacer con esta solicitud" msgid "Things you're following" -msgstr "" +msgstr "Pedidos que estas siguiendo" msgid "This authority no longer exists, so you cannot make a request to it." msgstr "Este organismo ya no existe, no pueden realizarse solicitudes de información." @@ -2685,7 +2688,7 @@ msgid "This request <strong>requires administrator attention</strong>" msgstr "Esta solicitud <strong>requiere la intervención de un administrador</strong>" msgid "This request has already been reported for administrator attention" -msgstr "" +msgstr "Este pedido ha sido reportado al administrador del sitio." msgid "This request has an <strong>unknown status</strong>." msgstr "Esta solicitud tiene un <strong>estado desconocido</strong>." @@ -2693,18 +2696,18 @@ msgstr "Esta solicitud tiene un <strong>estado desconocido</strong>." msgid "" "This request has been <strong>hidden</strong> from the site, because an " "administrator considers it not to be an FOI request" -msgstr "" +msgstr "Este pedido ha sido <strong>removido</strong> del sitio, porque el administrador considera que no es un pedido de acceso a la información publica" msgid "" "This request has been <strong>hidden</strong> from the site, because an " "administrator considers it vexatious" -msgstr "" +msgstr "Este pedido ha sido <strong>removido</strong> del sitio, porque el administrador considera que es un pedido inapropiado" msgid "" "This request has been <strong>reported</strong> as needing administrator " "attention (perhaps because it is vexatious, or a request for personal " "information)" -msgstr "" +msgstr "Este pedido ha sido <strong>removido</strong> del sitio, porque el administrador considera que es un pedido inapropiado o solicita informacion personal" msgid "" "This request has been <strong>withdrawn</strong> by the person who made it.\n" @@ -2718,7 +2721,7 @@ msgid "" msgstr "" msgid "This request has been reported for administrator attention" -msgstr "" +msgstr "Este pedido ha sido reportado al administrador del sitio." msgid "" "This request has been set by an administrator to \"allow new responses from " @@ -2793,7 +2796,7 @@ msgid "To download the zip file" msgstr "Descargar el fichero ZIP" msgid "To follow all successful requests" -msgstr "" +msgstr "Sigue todos los pedidos exitosos" msgid "To follow new requests" msgstr "" @@ -2802,15 +2805,15 @@ msgid "To follow requests and responses matching your search" msgstr "Para seguir solicitudes y respuestas que encajen con tu búsqueda" msgid "To follow requests by '{{user_name}}'" -msgstr "" +msgstr "Sigue todos los pedidos por y '{{user_name}}'" msgid "" "To follow requests made using {{site_name}} to the public authority " "'{{public_body_name}}'" -msgstr "" +msgstr "Sigue todos los pedidos hechos {{site_name}} a la autoridad publica '{{public_body_name}}'" msgid "To follow the request '{{request_title}}'" -msgstr "" +msgstr "Seguir el pedido '{{request_title}}'" msgid "" "To help us keep the site tidy, someone else has updated the status of the \n" @@ -2822,7 +2825,7 @@ msgid "" msgstr "" msgid "To log into the administrative interface" -msgstr "" +msgstr " Ingresar como administrador" msgid "To play the request categorisation game" msgstr "Jugar al juego de recategorización de solicitudes" @@ -2834,7 +2837,7 @@ msgid "To reply to " msgstr "Contestar a " msgid "To report this FOI request" -msgstr "" +msgstr "Reportar este pedido de acceso" msgid "To send a follow up message to " msgstr "Enviar una respuesta a " @@ -2875,13 +2878,13 @@ msgid "Today" msgstr "Hoy" msgid "Too many requests" -msgstr "" +msgstr "Demasiados pedidos" msgid "Top search results:" msgstr "Mejores resultados:" msgid "Track thing" -msgstr "" +msgstr " Monitorear" msgid "Track this person" msgstr "Seguir a esta persona" @@ -2899,7 +2902,7 @@ msgid "TrackThing|Track type" msgstr "TrackThing|Track type" msgid "Turn off email alerts" -msgstr "" +msgstr "Descontinuar alertas por correo electronico" msgid "Tweet this request" msgstr "Tuitear esta solicitud" @@ -2961,10 +2964,10 @@ msgid "" msgstr "Utiliza comillas cuando quieras buscar una frase exacta, por ejemplo <strong><code>\"Consejo de Europa\"</code></strong>" msgid "User" -msgstr "" +msgstr "usuario" msgid "User info request sent alert" -msgstr "" +msgstr "Alerta de informacion de usuario enviada" msgid "UserInfoRequestSentAlert|Alert type" msgstr "UserInfoRequestSentAlert|Alert type" @@ -3012,7 +3015,7 @@ msgid "User|No limit" msgstr "User|No limit" msgid "User|Receive email alerts" -msgstr "" +msgstr "Usuario Recibe alertas por correo" msgid "User|Salt" msgstr "User|Salt" @@ -3168,10 +3171,10 @@ msgid "You" msgstr "Tú" msgid "You are already following new requests" -msgstr "" +msgstr "Tu ya estas siguiendo nuevos pedidos" msgid "You are already following requests to {{public_body_name}}" -msgstr "" +msgstr "Tu ya estas siguiendo pedidos a {{public_body_name}}" msgid "You are already following things matching this search" msgstr "" @@ -3457,6 +3460,9 @@ msgstr "todas las solicitudes" msgid "also called {{public_body_short_name}}" msgstr "también conocido como {{public_body_short_name}}" +msgid "an anonymous user" +msgstr "" + msgid "and" msgstr "y" diff --git a/locale/eu/app.po b/locale/eu/app.po index 8df713a6d..6bceee0df 100644 --- a/locale/eu/app.po +++ b/locale/eu/app.po @@ -9,15 +9,15 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-08-24 09:20+0100\n" -"PO-Revision-Date: 2012-08-24 10:33+0000\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" +"PO-Revision-Date: 2012-09-19 08:48+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: eu\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "" "\n" @@ -1969,6 +1969,9 @@ msgstr "Primera letra" msgid "PublicBody|Home page" msgstr "Sitio web" +msgid "PublicBody|Info requests count" +msgstr "" + msgid "PublicBody|Last edit comment" msgstr "PublicBody|Last edit comment" @@ -3454,6 +3457,9 @@ msgstr "eskabide guztiak" msgid "also called {{public_body_short_name}}" msgstr "{{public_body_short_name}} izenez ere ezaguna." +msgid "an anonymous user" +msgstr "" + msgid "and" msgstr "eta" diff --git a/locale/fr/app.po b/locale/fr/app.po index 3ecb880ff..2234e2f4b 100644 --- a/locale/fr/app.po +++ b/locale/fr/app.po @@ -13,15 +13,15 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-08-24 09:20+0100\n" -"PO-Revision-Date: 2012-08-24 08:21+0000\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" +"PO-Revision-Date: 2012-09-19 08:48+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: fr\n" -"Plural-Forms: nplurals=2; plural=(n > 1)\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" msgid "" "\n" @@ -1973,6 +1973,9 @@ msgstr "" msgid "PublicBody|Home page" msgstr "" +msgid "PublicBody|Info requests count" +msgstr "" + msgid "PublicBody|Last edit comment" msgstr "" @@ -3458,6 +3461,9 @@ msgstr "toutes les demandes" msgid "also called {{public_body_short_name}}" msgstr "aussi appelé {{public_body_short_name}}" +msgid "an anonymous user" +msgstr "" + msgid "and" msgstr "et" diff --git a/locale/gl/app.po b/locale/gl/app.po index b91414bc9..269505180 100644 --- a/locale/gl/app.po +++ b/locale/gl/app.po @@ -8,15 +8,15 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-08-24 09:20+0100\n" -"PO-Revision-Date: 2012-08-24 10:34+0000\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" +"PO-Revision-Date: 2012-09-19 08:48+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: gl\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "" "\n" @@ -1968,6 +1968,9 @@ msgstr "Primera letra" msgid "PublicBody|Home page" msgstr "Sitio web" +msgid "PublicBody|Info requests count" +msgstr "" + msgid "PublicBody|Last edit comment" msgstr "PublicBody|Last edit comment" @@ -3453,6 +3456,9 @@ msgstr "todas las solicitudes" msgid "also called {{public_body_short_name}}" msgstr "también conocido como {{public_body_short_name}}" +msgid "an anonymous user" +msgstr "" + msgid "and" msgstr "y" diff --git a/locale/hu_HU/app.po b/locale/hu_HU/app.po index 396e47903..286237b84 100644 --- a/locale/hu_HU/app.po +++ b/locale/hu_HU/app.po @@ -8,15 +8,15 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-08-24 09:20+0100\n" -"PO-Revision-Date: 2012-08-24 10:32+0000\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" +"PO-Revision-Date: 2012-09-19 08:48+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: hu_HU\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "" "\n" @@ -1968,6 +1968,9 @@ msgstr "PublicBody|First letter" msgid "PublicBody|Home page" msgstr "PublicBody|Home page" +msgid "PublicBody|Info requests count" +msgstr "" + msgid "PublicBody|Last edit comment" msgstr "PublicBody|Last edit comment" @@ -3453,6 +3456,9 @@ msgstr " minden igénylés " msgid "also called {{public_body_short_name}}" msgstr "más néven {{public_body_short_name}} " +msgid "an anonymous user" +msgstr "" + msgid "and" msgstr "és" diff --git a/locale/id/app.po b/locale/id/app.po index 4ecbdce48..dd56d7be6 100644 --- a/locale/id/app.po +++ b/locale/id/app.po @@ -10,15 +10,15 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-08-24 09:20+0100\n" -"PO-Revision-Date: 2012-08-24 10:34+0000\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" +"PO-Revision-Date: 2012-09-19 08:48+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: id\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=1; plural=0;\n" msgid "" "\n" @@ -1966,6 +1966,9 @@ msgstr "PublicBody|First letter" msgid "PublicBody|Home page" msgstr "PublicBody|Home page" +msgid "PublicBody|Info requests count" +msgstr "" + msgid "PublicBody|Last edit comment" msgstr "PublicBody|Last edit comment" @@ -3445,6 +3448,9 @@ msgstr "semua permintaan" msgid "also called {{public_body_short_name}}" msgstr "juga disebut {{public_body_short_name}}" +msgid "an anonymous user" +msgstr "" + msgid "and" msgstr "dan" diff --git a/locale/model_attributes.rb b/locale/model_attributes.rb index bf4cd68da..9944bd11d 100644 --- a/locale/model_attributes.rb +++ b/locale/model_attributes.rb @@ -77,6 +77,7 @@ _('Public body') _('PublicBody|Api key') _('PublicBody|First letter') _('PublicBody|Home page') +_('PublicBody|Info requests count') _('PublicBody|Last edit comment') _('PublicBody|Last edit editor') _('PublicBody|Name') diff --git a/locale/nb_NO/app.po b/locale/nb_NO/app.po index 32c00610b..352e04bfe 100644 --- a/locale/nb_NO/app.po +++ b/locale/nb_NO/app.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: version 0.0.1\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-08-24 09:20+0100\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" "PO-Revision-Date: 2011-03-09 17:48+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1779,6 +1779,9 @@ msgstr "" msgid "PublicBody|Home page" msgstr "" +msgid "PublicBody|Info requests count" +msgstr "" + msgid "PublicBody|Last edit comment" msgstr "" @@ -3137,6 +3140,9 @@ msgstr "" msgid "also called {{public_body_short_name}}" msgstr "" +msgid "an anonymous user" +msgstr "" + msgid "and" msgstr "" diff --git a/locale/pt_BR/app.po b/locale/pt_BR/app.po index db72c9c04..82b3a0447 100644 --- a/locale/pt_BR/app.po +++ b/locale/pt_BR/app.po @@ -15,21 +15,21 @@ # <luis.leao@gmail.com>, 2011. # <Nitaibezerra@gmail.com>, 2012. # <patriciacornils@gmail.com>, 2011. -# <pedro@esfera.mobi>, 2011, 2012. +# <pedro@esfera.mobi>, 2011-2012. # <rafael.moretti@gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-08-24 09:20+0100\n" -"PO-Revision-Date: 2012-08-24 10:30+0000\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" +"PO-Revision-Date: 2012-09-19 08:48+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: pt_BR\n" -"Plural-Forms: nplurals=2; plural=(n > 1)\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" msgid "" "\n" @@ -1981,6 +1981,9 @@ msgstr "PublicBody | Primeira letra" msgid "PublicBody|Home page" msgstr "PublicBody | Home page" +msgid "PublicBody|Info requests count" +msgstr "" + msgid "PublicBody|Last edit comment" msgstr "PublicBody | Última edição" @@ -3466,6 +3469,9 @@ msgstr "todos os pedidos" msgid "also called {{public_body_short_name}}" msgstr "também conhecido como {{public_body_short_name}}" +msgid "an anonymous user" +msgstr "" + msgid "and" msgstr "e" diff --git a/locale/sq/app.po b/locale/sq/app.po index e10e3f993..c9174ccdd 100644 --- a/locale/sq/app.po +++ b/locale/sq/app.po @@ -6,22 +6,22 @@ # <bresta@gmail.com>, 2011. # driton <dritoni.h@gmail.com>, 2011. # Hana Huntova <>, 2012. -# Valon <vbrestovci@gmail.com>, 2011, 2012. +# Valon <vbrestovci@gmail.com>, 2011-2012. # <vbrestovci@gmail.com>, 2011. # vbrestovci <vbrestovci@gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-08-24 09:20+0100\n" -"PO-Revision-Date: 2012-08-24 10:30+0000\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" +"PO-Revision-Date: 2012-09-19 08:48+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: sq\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "" "\n" @@ -1973,6 +1973,9 @@ msgstr "PublicBody |Germa e parë" msgid "PublicBody|Home page" msgstr "PublicBody |Ballina" +msgid "PublicBody|Info requests count" +msgstr "" + msgid "PublicBody|Last edit comment" msgstr "PublicBody | Editimi i fundit i komentit" @@ -3458,6 +3461,9 @@ msgstr "të gjitha kërkesat" msgid "also called {{public_body_short_name}}" msgstr "i quajtur edhe {{public_body_short_name}}" +msgid "an anonymous user" +msgstr "" + msgid "and" msgstr "dhe" diff --git a/locale/sr@latin/app.po b/locale/sr@latin/app.po index 45c436e12..88291fcbf 100644 --- a/locale/sr@latin/app.po +++ b/locale/sr@latin/app.po @@ -9,15 +9,15 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-08-24 09:20+0100\n" -"PO-Revision-Date: 2012-08-24 10:31+0000\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" +"PO-Revision-Date: 2012-09-19 08:48+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: sr@latin\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" msgid "" "\n" @@ -1973,6 +1973,9 @@ msgstr "Javno tijelo|Početno slovo" msgid "PublicBody|Home page" msgstr "Javno tijelo|Home page" +msgid "PublicBody|Info requests count" +msgstr "" + msgid "PublicBody|Last edit comment" msgstr "Javno tijelo|Zadnji uređeni komentar" @@ -3464,6 +3467,9 @@ msgstr "svi zahtevi" msgid "also called {{public_body_short_name}}" msgstr "takođe poznat/a kao {{public_body_short_name}}" +msgid "an anonymous user" +msgstr "" + msgid "and" msgstr "i" diff --git a/locale/uk/app.po b/locale/uk/app.po index 34f9a2d1a..98490f9ef 100644 --- a/locale/uk/app.po +++ b/locale/uk/app.po @@ -9,15 +9,15 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-08-24 09:20+0100\n" -"PO-Revision-Date: 2012-08-28 10:57+0000\n" -"Last-Translator: hiiri <murahoid@gmail.com>\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" +"PO-Revision-Date: 2012-09-19 08:48+0000\n" +"Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: uk\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" msgid "" "\n" @@ -1973,6 +1973,9 @@ msgstr "" msgid "PublicBody|Home page" msgstr "" +msgid "PublicBody|Info requests count" +msgstr "" + msgid "PublicBody|Last edit comment" msgstr "" @@ -3464,6 +3467,9 @@ msgstr "усі запити" msgid "also called {{public_body_short_name}}" msgstr "" +msgid "an anonymous user" +msgstr "" + msgid "and" msgstr "і" diff --git a/spec/controllers/admin_general_controller_spec.rb b/spec/controllers/admin_general_controller_spec.rb index 820d1e7f3..dc1eb0d97 100644 --- a/spec/controllers/admin_general_controller_spec.rb +++ b/spec/controllers/admin_general_controller_spec.rb @@ -1,18 +1,39 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') -describe AdminGeneralController, "when viewing front page of admin interface" do - integrate_views - before { basic_auth_login @request } - - it "should render the front page" do - get :index, :suppress_redirect => 1 - response.should render_template('index') - end +describe AdminGeneralController do + + describe "when viewing front page of admin interface" do + + integrate_views + before { basic_auth_login @request } + + it "should render the front page" do + get :index, :suppress_redirect => 1 + response.should render_template('index') + end + + it "should redirect to include trailing slash" do + get :index + response.should redirect_to(:controller => 'admin_general', + :action => 'index') + end - it "should redirect to include trailing slash" do - get :index - response.should redirect_to(:controller => 'admin_general', - :action => 'index') end + describe 'when viewing the timeline' do + + it 'should assign an array of events in order of descending date to the view' do + get :timeline, :all => 1 + previous_event = nil + previous_event_at = nil + assigns[:events].each do |event, event_at| + if previous_event + (event_at <= previous_event_at).should be_true + end + previous_event = event + previous_event_at = event_at + end + end + + end end diff --git a/spec/fixtures/public_bodies.yml b/spec/fixtures/public_bodies.yml index 367e0fc50..615c4bcb6 100644 --- a/spec/fixtures/public_bodies.yml +++ b/spec/fixtures/public_bodies.yml @@ -1,4 +1,4 @@ -geraldine_public_body: +geraldine_public_body: name: The Geraldine Quango first_letter: T updated_at: 2007-10-24 10:51:01.161639 @@ -11,7 +11,8 @@ geraldine_public_body: url_name: tgq created_at: 2007-10-24 10:51:01.161639 api_key: 1 -humpadink_public_body: + info_requests_count: 4 +humpadink_public_body: name: "Department for Humpadinking" first_letter: D updated_at: 2007-10-25 10:51:01.161639 @@ -25,6 +26,7 @@ humpadink_public_body: created_at: 2007-10-25 10:51:01.161639 notes: An albatross told me!!! api_key: 2 + info_requests_count: 2 forlorn_public_body: name: "Department of Loneliness" first_letter: D @@ -39,7 +41,8 @@ forlorn_public_body: created_at: 2011-01-26 14:11:02.12345 notes: A very lonely public body that no one has corresponded with api_key: 3 -silly_walks_public_body: + info_requests_count: 0 +silly_walks_public_body: id: 5 version: 1 name: "Ministry of Silly Walks" @@ -53,7 +56,8 @@ silly_walks_public_body: created_at: 2007-10-25 10:51:01.161639 notes: You know the one. api_key: 4 -sensible_walks_public_body: + info_requests_count: 2 +sensible_walks_public_body: id: 6 version: 1 name: "Ministry of Sensible Walks" @@ -67,4 +71,4 @@ sensible_walks_public_body: last_edit_editor: robin created_at: 2008-10-25 10:51:01.161639 api_key: 5 - + info_requests_count: 1 diff --git a/spec/fixtures/public_body_translations.yml b/spec/fixtures/public_body_translations.yml index cbb55bb0c..f3453e853 100644 --- a/spec/fixtures/public_body_translations.yml +++ b/spec/fixtures/public_body_translations.yml @@ -1,4 +1,4 @@ -geraldine_es_public_body_translation: +geraldine_es_public_body_translation: name: El A Geraldine Quango first_letter: E request_email: geraldine-requests@localhost @@ -8,8 +8,9 @@ geraldine_es_public_body_translation: url_name: etgq locale: es notes: "" + publication_scheme: "" -geraldine_en_public_body_translation: +geraldine_en_public_body_translation: name: Geraldine Quango first_letter: G request_email: geraldine-requests@localhost @@ -19,8 +20,9 @@ geraldine_en_public_body_translation: url_name: tgq locale: en notes: "" + publication_scheme: "" -humpadink_es_public_body_translation: +humpadink_es_public_body_translation: name: "El Department for Humpadinking" first_letter: E request_email: humpadink-requests@localhost @@ -30,8 +32,9 @@ humpadink_es_public_body_translation: url_name: edfh locale: es notes: Baguette + publication_scheme: "" -humpadink_en_public_body_translation: +humpadink_en_public_body_translation: name: "Department for Humpadinking" first_letter: D request_email: humpadink-requests@localhost @@ -41,8 +44,9 @@ humpadink_en_public_body_translation: url_name: dfh locale: en notes: An albatross told me!!! + publication_scheme: "" -forlorn_en_public_body_translation: +forlorn_en_public_body_translation: name: "Department of Loneliness" first_letter: D request_email: forlorn-requests@localhost @@ -52,6 +56,7 @@ forlorn_en_public_body_translation: url_name: lonely locale: en notes: A very lonely public body that no one has corresponded with + publication_scheme: "" silly_walks_en_public_body_translation: id: 6 @@ -63,6 +68,7 @@ silly_walks_en_public_body_translation: short_name: MSW url_name: msw notes: You know the one. + publication_scheme: "" sensible_walks_en_public_body_translation: id: 7 @@ -74,3 +80,4 @@ sensible_walks_en_public_body_translation: short_name: SenseWalk url_name: sensible_walks notes: I bet you’ve never heard of it. + publication_scheme: "" diff --git a/spec/models/info_request_spec.rb b/spec/models/info_request_spec.rb index e931624c1..f5c92e5f6 100644 --- a/spec/models/info_request_spec.rb +++ b/spec/models/info_request_spec.rb @@ -341,6 +341,14 @@ describe InfoRequest do InfoRequest.find_old_unclassified(:limit => 5) end + it 'should ask for requests using any offset param supplied' do + InfoRequest.should_receive(:find).with(:all, {:select => anything, + :order => anything, + :conditions=> anything, + :offset => 100}) + InfoRequest.find_old_unclassified(:offset => 100) + end + it 'should not limit the number of requests returned by default' do InfoRequest.should_not_receive(:find).with(:all, {:select => anything, :order => anything, diff --git a/spec/models/public_body_spec.rb b/spec/models/public_body_spec.rb index 9e22a9c43..011824190 100644 --- a/spec/models/public_body_spec.rb +++ b/spec/models/public_body_spec.rb @@ -407,6 +407,7 @@ describe PublicBody, " when loading CSV files" do end describe PublicBody do + describe "calculated home page" do it "should return the home page verbatim if it's present" do public_body = PublicBody.new @@ -438,4 +439,17 @@ describe PublicBody do public_body.calculated_home_page.should == "https://example.com" end end + + describe 'when asked for notes without html' do + + before do + @public_body = PublicBody.new(:notes => 'some <a href="/notes">notes</a>') + end + + it 'should remove simple tags from notes' do + @public_body.notes_without_html.should == 'some notes' + end + + end + end |