diff options
27 files changed, 325 insertions, 216 deletions
diff --git a/.gitignore b/.gitignore index 994f9a3a1..99c1ba9ff 100644 --- a/.gitignore +++ b/.gitignore @@ -25,7 +25,7 @@ config/httpd.conf config/general*.yml config/deploy.yml.* .sass-cache -alaveteli.sublime* +alaveteli*.sublime* webrat.log /.rbenv-version /db/development_structure.sql @@ -26,8 +26,7 @@ gem 'rack', '~> 1.4.5' gem 'rake', '0.9.2.2' gem 'rails-i18n', '~> 0.7.3' gem 'recaptcha', '~> 0.3.1', :require => 'recaptcha/rails' -# :require avoids "already initialized constant" warnings -gem 'rmagick', '~> 2.13.2', :require => 'RMagick' +gem 'rmagick', '~> 2.14.0' gem 'ruby-msg', '~> 1.5.0', :git => 'git://github.com/mysociety/ruby-msg.git' gem 'secure_headers', '~> 1.3.4' gem 'statistics2', '~> 0.54' @@ -36,7 +35,7 @@ gem 'thin', '~> 1.5.1' gem 'vpim', '~> 13.11.11' gem 'will_paginate', '~> 3.0.5' # when 1.2.9 is released by the maintainer, we can stop using this fork: -gem 'xapian-full-alaveteli', '~> 1.2.9.5' +gem 'xapian-full-alaveteli', '~> 1.2.9.7' gem 'xml-simple', '~> 1.1.2', :require => 'xmlsimple' gem 'zip', '~> 2.0.2' diff --git a/Gemfile.lock b/Gemfile.lock index 2f88a474e..9fb037ec7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -216,7 +216,7 @@ GEM ref (1.0.5) rest-client (1.6.7) mime-types (>= 1.16) - rmagick (2.13.2) + rmagick (2.14.0) routing-filter (0.3.1) actionpack rspec-core (2.13.1) @@ -291,7 +291,7 @@ GEM rack (>= 1.0) rack-test (>= 0.5.3) will_paginate (3.0.5) - xapian-full-alaveteli (1.2.9.5) + xapian-full-alaveteli (1.2.9.7) xml-simple (1.1.2) zip (2.0.2) @@ -342,7 +342,7 @@ DEPENDENCIES rake (= 0.9.2.2) rdoc (~> 3.12.2) recaptcha (~> 0.3.1) - rmagick (~> 2.13.2) + rmagick (~> 2.14.0) routing-filter (~> 0.3.1) rspec-rails (~> 2.13.2) ruby-debug (~> 0.10.4) @@ -360,6 +360,6 @@ DEPENDENCIES vpim (~> 13.11.11) webrat (~> 0.7.3) will_paginate (~> 3.0.5) - xapian-full-alaveteli (~> 1.2.9.5) + xapian-full-alaveteli (~> 1.2.9.7) xml-simple (~> 1.1.2) zip (~> 2.0.2) diff --git a/app/assets/javascripts/general.js b/app/assets/javascripts/general.js index 002eef760..856f4c6d4 100644 --- a/app/assets/javascripts/general.js +++ b/app/assets/javascripts/general.js @@ -34,12 +34,12 @@ $(document).ready(function() { box.width(location.length + " em"); box.find('input').val(location).attr('size', location.length + " em"); box.show(); - box.find('input').select(); box.position({ my: "right center", at: "left bottom", of: this, collision: "fit" }); + box.find('input').select(); return false; }); diff --git a/app/assets/stylesheets/responsive/_header_layout.scss b/app/assets/stylesheets/responsive/_header_layout.scss index b3103e3a9..7c7bdfe97 100644 --- a/app/assets/stylesheets/responsive/_header_layout.scss +++ b/app/assets/stylesheets/responsive/_header_layout.scss @@ -131,25 +131,25 @@ } form{ @include grid-row; - padding-right: 1em; + padding: 1em 1em 0; @include lte-ie7 { display: inline; } + @include respond-min( $main_menu-mobile_menu_cutoff ){ + padding-top: 0; + } } input{ - @include grid-column($columns:9); - margin:0; + @include grid-column($columns:10); + margin-right:0; @include lte-ie7 { width: 10.063em; } } - label{ + button[type="submit"]{ @include prefix-postfix-base; - @include grid-column($columns:3,$float:left); + @include grid-column($columns:2,$float:right); border:none; - img{ - max-width: 100%; - } @include lte-ie7 { width: 2.125em; } diff --git a/app/assets/stylesheets/responsive/_header_style.scss b/app/assets/stylesheets/responsive/_header_style.scss index 9008a73a7..ec1e8ea5c 100644 --- a/app/assets/stylesheets/responsive/_header_style.scss +++ b/app/assets/stylesheets/responsive/_header_style.scss @@ -2,3 +2,9 @@ #navigation { border-bottom: 1px solid #e9e9e9; } + +#navigation_search { + button[type="submit"] { + background:image-url('/assets/search.png') transparent no-repeat center center; + } +} diff --git a/app/assets/stylesheets/responsive/_public_body_layout.scss b/app/assets/stylesheets/responsive/_public_body_layout.scss index 7a9637bc9..2afd67ffb 100644 --- a/app/assets/stylesheets/responsive/_public_body_layout.scss +++ b/app/assets/stylesheets/responsive/_public_body_layout.scss @@ -64,10 +64,4 @@ } -.list-filter-item { - .title { - display: inline; - font-size: 1em; - font-weight: normal; - } -} + diff --git a/app/assets/stylesheets/responsive/_public_body_style.scss b/app/assets/stylesheets/responsive/_public_body_style.scss index 748f6218b..79ee4764a 100644 --- a/app/assets/stylesheets/responsive/_public_body_style.scss +++ b/app/assets/stylesheets/responsive/_public_body_style.scss @@ -35,42 +35,9 @@ } -.list-filter-item { - ul { - list-style: none outside none; - margin: 0; - padding: 0; - } - li { - display: inline-block; - &:after { - content:' | '; - display: inline-block; - color: #ccc; //Unsupported browsers will ignore the rgba declaration below - color: rgba(0,0,0,0.1); - } - &:last-child { - &:after { - content: ''; - } - } - - } -} - .authority__body__sidebar__links { a { display: inline-block; margin-bottom: 0.5em; } } - -#list-filter { - margin-bottom: 3em; -} - -#filter_requests_form label.title { - display: block; - width: auto; - margin-bottom: 0.3em; -} diff --git a/app/assets/stylesheets/responsive/_search_layout.scss b/app/assets/stylesheets/responsive/_search_layout.scss index 48dd0c6a7..93a94f951 100644 --- a/app/assets/stylesheets/responsive/_search_layout.scss +++ b/app/assets/stylesheets/responsive/_search_layout.scss @@ -57,3 +57,11 @@ #advanced-search-tips{ @include grid-column(12); } + +.list-filter-item { + .title { + display: inline; + font-size: 1em; + font-weight: normal; + } +} diff --git a/app/assets/stylesheets/responsive/_search_style.scss b/app/assets/stylesheets/responsive/_search_style.scss index dfd40fc67..94ec1cf88 100644 --- a/app/assets/stylesheets/responsive/_search_style.scss +++ b/app/assets/stylesheets/responsive/_search_style.scss @@ -51,4 +51,87 @@ input.use-datepicker[type=text] { } } +.list-filter-item { + ul { + list-style: none outside none; + margin: 0; + padding: 0; + } + li { + display: inline-block; + } +} + + +#list-filter { + margin-bottom: 3em; +} +#filter_requests_form label.title { + display: block; + width: auto; + margin-bottom: 0.3em; +} + +.filter-request-types { + display: block; + margin-bottom: 1em; + @include respond-min( 20em ){ + display: inline-block; + } + ul { + border: 1px solid #ccc; + border-radius: 3px; + width: 100%; + font-size: 0; + border-bottom: 0; + @include respond-min( 20em ){ + border-right: 0; + } + @include respond-min( 44em ){ + border-bottom: 1px solid #ccc; + } + } + li { + width: 100%; + @include respond-min( 20em ){ + width: 50%; + } + @include respond-min( 44em ){ + width: auto; + } + } + a, span { + width: 100%; + text-align: center; + display: block; + font-size: 14px; + padding: 0.5em 0.75em; + border-bottom: 1px solid #ccc; + text-decoration: none; + @include respond-min( 20em ){ + display: inline-block; + border-right: 1px solid #ccc; + border-bottom: 0; + &:nth-child(1), + &:nth-child(2) { + border-bottom: 1px solid #ccc; + } + } + + @include respond-min( 44em ){ + &:nth-child(n) { + border-bottom: 0; + } + } + } + span { + font-weight: bold; + background-color: #f4f4f4; + //older browsers will just see a flat background, new browsers will see an indent + -webkit-box-shadow: inset 0 2px 5px 1px rgba(0, 0, 0, 0.1); + -moz-box-shadow: inset 0 2px 5px 1px rgba(0, 0, 0, 0.1); + -o-box-shadow: inset 0 2px 5px 1px rgba(0, 0, 0, 0.1); + box-shadow: inset 0 2px 5px 1px rgba(0, 0, 0, 0.1); + } +} diff --git a/app/assets/stylesheets/responsive/_utils.scss b/app/assets/stylesheets/responsive/_utils.scss index 68884fa7a..e19201475 100644 --- a/app/assets/stylesheets/responsive/_utils.scss +++ b/app/assets/stylesheets/responsive/_utils.scss @@ -33,3 +33,18 @@ $lte-ie7: false !default; @content; } } + +// Hide content visually, but keep it available to screen readers +// source: http://a11yproject.com/posts/how-to-hide-content/ +.visually-hidden { + // http://developer.yahoo.com/blogs/ydn/posts/2012/10/clip-your-hidden-content-for-better-accessibility/ + position: absolute !important; + clip: rect(1px 1px 1px 1px); /* IE6, IE7 */ + clip: rect(1px, 1px, 1px, 1px); + padding:0 !important; + border:0 !important; + height: 1px !important; + width: 1px !important; + overflow: hidden; +} +body:hover .visually-hidden a, body:hover .visually-hidden input, body:hover .visually-hidden button { display: none !important; } diff --git a/app/controllers/public_body_controller.rb b/app/controllers/public_body_controller.rb index cc3d0b64a..854e79a19 100644 --- a/app/controllers/public_body_controller.rb +++ b/app/controllers/public_body_controller.rb @@ -9,9 +9,17 @@ require 'confidence_intervals' require 'tempfile' class PublicBodyController < ApplicationController + + MAX_RESULTS = 500 # TODO: tidy this up with better error messages, and a more standard infrastructure for the redirect to canonical URL def show long_cache + @page = get_search_page_from_params + requests_per_page = 25 + # Later pages are very expensive to load + if @page > MAX_RESULTS / requests_per_page + raise ActiveRecord::RecordNotFound.new("Sorry. No pages after #{MAX_RESULTS / requests_per_page}.") + end if MySociety::Format.simplify_url_part(params[:url_name], 'body') != params[:url_name] redirect_to :url_name => MySociety::Format.simplify_url_part(params[:url_name], 'body'), :status => :moved_permanently return @@ -45,7 +53,7 @@ class PublicBodyController < ApplicationController # TODO: really should just use SQL query here rather than Xapian. sortby = "described" begin - @xapian_requests = perform_search([InfoRequestEvent], query, sortby, 'request_collapse') + @xapian_requests = perform_search([InfoRequestEvent], query, sortby, 'request_collapse', requests_per_page) if (@page > 1) @page_desc = " (page " + @page.to_s + ")" else diff --git a/app/helpers/public_body_helper.rb b/app/helpers/public_body_helper.rb index 332e93284..57c90a9ba 100644 --- a/app/helpers/public_body_helper.rb +++ b/app/helpers/public_body_helper.rb @@ -38,12 +38,13 @@ module PublicBodyHelper # # Returns a string def type_of_authority(public_body) - types = public_body.tags.each_with_index.map do |tag, index| + first = true + types = public_body.tags.each.map do |tag| if PublicBodyCategory.get().by_tag().include?(tag.name) desc = PublicBodyCategory.get().singular_by_tag()[tag.name] - - if index.zero? + if first desc = desc.sub(/\S/) { |m| Unicode.upcase(m) } + first = false end link_to(desc, list_public_bodies_path(tag.name)) end diff --git a/app/views/general/_responsive_topnav.html.erb b/app/views/general/_responsive_topnav.html.erb index 0ece0da9a..cb8151467 100644 --- a/app/views/general/_responsive_topnav.html.erb +++ b/app/views/general/_responsive_topnav.html.erb @@ -21,11 +21,16 @@ </li> <li id="navigation_search"> - <form id="navigation_search_form" method="post" action="<%= search_redirect_path %>"> - <label for="navigation_search_button"> - <img src="/assets/search.png" alt="Search:"> + <form id="navigation_search_form" method="post" action="<%= search_redirect_path %>" role="search"> + <label class="visually-hidden" for="navigation_search_button"> + <%= _("Search") %> </label> - <%= text_field_tag 'query', params[:query], { :id => "navigation_search_button", :title => "type your search term here" } %> + <%= text_field_tag 'query', params[:query], { :id => "navigation_search_button", :type => "search", :placeholder => _("Search"), :title => _("type your search term here") } %> + <button type="submit"> + <span class="visually-hidden"> + <%= _("Submit Search") %> + </span> + </button> </form> </li> </ul> diff --git a/app/views/request/_request_filter_form.html.erb b/app/views/request/_request_filter_form.html.erb index 19961ddfc..549ddb32c 100644 --- a/app/views/request/_request_filter_form.html.erb +++ b/app/views/request/_request_filter_form.html.erb @@ -14,7 +14,7 @@ <%= link_to label, url_for(:controller => "request", :action => "list", :view => status) + "?" + request.query_string + '#results' %> <% end %> <% else %> - <%= label %> + <span><%= label %></span> <% end %> </li> <% end %> diff --git a/commonlib b/commonlib -Subproject cd0486209761344a7a10bd81b840a468e232e0b +Subproject 2a0271d3a6aaba9c429261b8c94e0e7acb6bd68 diff --git a/config/application.rb b/config/application.rb index 366077795..3c01e26c4 100644 --- a/config/application.rb +++ b/config/application.rb @@ -115,6 +115,7 @@ module Alaveteli 'admin.css', 'ie6.css', 'ie7.css', + 'bootstrap-dropdown.js', 'responsive/print.css', 'responsive/application-lte-ie7.css', 'responsive/application-ie8.css'] diff --git a/config/initializers/alaveteli.rb b/config/initializers/alaveteli.rb index 840639228..c39e7a117 100644 --- a/config/initializers/alaveteli.rb +++ b/config/initializers/alaveteli.rb @@ -10,7 +10,7 @@ load "debug_helpers.rb" load "util.rb" # Application version -ALAVETELI_VERSION = '0.20.0.14' +ALAVETELI_VERSION = '0.21.0.10' # Add new inflection rules using the following format # (all these examples are active by default): diff --git a/doc/CHANGES.md b/doc/CHANGES.md index 5ae96f293..7b0341b30 100644 --- a/doc/CHANGES.md +++ b/doc/CHANGES.md @@ -1,4 +1,4 @@ -# rails-3-develop +# Version 0.21 ## Highlighted Features * Lots of improvements in the process of making a new @@ -48,17 +48,21 @@ * Admin route names have been standardised so if you have overridden templates that refer to admin routes, check the original templates to - see if these need to be changed. + see if these need to be changed. URLs in rreviously sent admin emails about + requested changes to authorities will need to be tweaked to work - from + `admin/body/new?change_request_id=n` to `admin/bodies/new?change_request_id=n` * If you override the `app/views/user/_signin.html.erb` or `app/view/user/_signup.html.erb` templates, check the tabindex order is still sensible - the order of the elements on the page has changed - signup now appears on the left. * If you override the application stylesheets rather than adding to them using a `custom.css` or `custom.scss` file, check that your - stylesheets still order elements correctly in the + stylesheets still order elements correctly in the templates `app/views/request/select_authority.html.erb`, `app/views/public_body/show.html.erb` and - `app/views/request/new.html.erb`. + `app/views/request/new.html.erb`. Also, if you use the application + stylesheets, but have overridden any of these templates or their partials, check to see + if you need to update the order of elements in the templates. * [Regenerate your crontab](http://alaveteli.org/docs/installing/manual_install/#generate-crontab) so that compacting the Xapian database only restarts the application, rather than the webserver. This requires the [appropriate SysVinit script](http://alaveteli.org/docs/installing/manual_install/#generate-application-daemon) to be installed. @@ -67,6 +71,8 @@ * `config/sysvinit-thin.ugly` has been improved. Regenerate it with `rake config_files:convert_init_script`. See [the documentation](http://alaveteli.org/docs/installing/manual_install/#generate-application-daemon) for more information. +* This release includes an update to the commonlib submodule - you + should be warned about this when running rails-post-deploy. # Version 0.20 diff --git a/lib/attachment_to_html/adapters/pdf.rb b/lib/attachment_to_html/adapters/pdf.rb index 3183d1fd0..3c18e9d4a 100644 --- a/lib/attachment_to_html/adapters/pdf.rb +++ b/lib/attachment_to_html/adapters/pdf.rb @@ -42,7 +42,8 @@ module AttachmentToHTML private def parse_body - match = convert.match(/<body[^>]*>(.*?)<\/body>/mi) + conversion = convert + match = conversion ? conversion.match(/<body[^>]*>(.*?)<\/body>/mi) : nil match ? match[1] : '' end diff --git a/locale/cy/app.po b/locale/cy/app.po index 36db5d16c..b7df8de27 100644 --- a/locale/cy/app.po +++ b/locale/cy/app.po @@ -15,7 +15,7 @@ # hywelm <hywelm.jones@talk21.com>, 2013 # hywelm <hywelm.jones@talk21.com>, 2013 # louisecrow <louise@mysociety.org>, 2013 -# louisecrow <louise@mysociety.org>, 2013-2014 +# louisecrow <louise@mysociety.org>, 2013-2015 # PerryX <wyeboy@gmail.com>, 2013 # PerryX <wyeboy@gmail.com>, 2013 msgid "" @@ -23,7 +23,7 @@ msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-03-24 10:21+0000\n" -"PO-Revision-Date: 2015-03-24 11:07+0000\n" +"PO-Revision-Date: 2015-03-27 14:31+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: Welsh (http://www.transifex.com/projects/p/alaveteli/language/cy/)\n" "Language: cy\n" @@ -2189,7 +2189,7 @@ msgid "Respond to request" msgstr "Ymateb i gais" msgid "Respond to the FOI request '{{request}}' made by {{user}}" -msgstr "Ymateb i'r cais rhyddid gwybodaeth '{{cais}}' a wnaed gan {{defnyddiwr}}" +msgstr "Ymateb i'r cais rhyddid gwybodaeth '{{request}}' a wnaed gan {{user}}" msgid "Respond using the web" msgstr "Ymateb trwy ddefnyddio'r we" diff --git a/locale/es_NI/app.po b/locale/es_NI/app.po index e91678be5..58eb0830b 100644 --- a/locale/es_NI/app.po +++ b/locale/es_NI/app.po @@ -5,6 +5,7 @@ # Translators: # fabrizioscrollini <fabrizio.scrollini@gmail.com>, 2012 # gaba <gabelula@gmail.com>, 2012,2014 +# Gareth Rees <gareth@mysociety.org>, 2015 # jbaezni <jbaezni@gmail.com>, 2015 # jbaezni <jbaezni@gmail.com>, 2015 # louisecrow <louise@mysociety.org>, 2014 @@ -18,8 +19,8 @@ msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-03-24 10:21+0000\n" -"PO-Revision-Date: 2015-03-24 11:09+0000\n" -"Last-Translator: louisecrow <louise@mysociety.org>\n" +"PO-Revision-Date: 2015-04-08 10:16+0000\n" +"Last-Translator: Gareth Rees <gareth@mysociety.org>\n" "Language-Team: Spanish (Nicaragua) (http://www.transifex.com/projects/p/alaveteli/language/es_NI/)\n" "Language: es_NI\n" "MIME-Version: 1.0\n" @@ -264,7 +265,7 @@ msgid "<strong>Anything else</strong>, such as clarifying, prompting, thanking" msgstr "<strong>Otras cosas</strong>, como aclarar, preguntar, dar las gracias" msgid "<strong>By law, they have to respond</strong> (<a href=\"{{url}}\">why?</a>)." -msgstr "" +msgstr "<strong>Por ley, tienen que responder</strong> (<a href=\"{{url}}\">por qué?</a>)." msgid "<strong>Caveat emptor!</strong> To use this data in an honourable way, you will need \\na good internal knowledge of user behaviour on {{site_name}}. How, \\nwhy and by whom requests are categorised is not straightforward, and there will\\nbe user error and ambiguity. You will also need to understand FOI law, and the\\nway authorities use it. Plus you'll need to be an elite statistician. Please\\n<a href=\"{{contact_path}}\">contact us</a> with questions." msgstr "" @@ -311,10 +312,10 @@ msgid "<strong>Thank</strong> the public authority or " msgstr "<strong>Dé las gracias</strong> al organismo público o " msgid "<strong>We will email you</strong> when there is a response, or after {{late_number_of_days}} working days if the authority still hasn't replied by then." -msgstr "" +msgstr "<strong>Nosotros le enviaremos un correo electrónico</strong>en cuanto hay una respuesta, o después de {{late_number_of_days}} los días hábiles, si la autoridad aún no ha respondido pora entonces." msgid "<strong>We will email you</strong> when they have been sent. We will also email you when there is a response to any of them, or after {{late_number_of_days}} working days if the authorities still haven't replied by then." -msgstr "" +msgstr "<strong>Nosotros le enviaremos un correo electrónico</strong>cuando se ha enviado. También le enviaremos un correo electrónico cuando haya una respuesta a cualquiera de ellos, o después {{late_number_of_days}} de los días de trabajo si las autoridades aún no han respondido para entonces." msgid "<strong>did not have</strong> the information requested." msgstr "<strong>no tenía</strong> la información solicitada." @@ -376,7 +377,7 @@ msgid "ActsAsXapian::ActsAsXapianJob|Model" msgstr "ActsAsXapian::ActsAsXapianJob|Model" msgid "Add an annotation to “{{request_title}}”" -msgstr "" +msgstr "Añadir una nota a “{{request_title}}”" msgid "Add an annotation to your request with choice quotes, or\\n a <strong>summary of the response</strong>." msgstr "" @@ -422,7 +423,7 @@ msgid "All the options below can use <strong>variety</strong> or <strong>latest_ msgstr "Todas las opciones a continuación pueden usar <strong>variedad</strong> o <strong>ultima variedad</strong> antes de los dos puntos. Por ejemplo, <strong>variedad:enviado</strong> mostrara solicitudes que alguna vez <em>hayan</em> sido enviadas; <strong> ultima variedad: enviado</strong>mostrara solamente solicitudes que actualmente son <em>son</em> marcadas como enviadas" msgid "Also called {{other_name}}." -msgstr "También conocido como {{other_name}}." +msgstr "También conocida como {{other_name}}." msgid "Also send me alerts by email" msgstr "También envienme alertas por correo electronico" @@ -471,7 +472,7 @@ msgid "Applies to" msgstr "Aplicable a" msgid "Are we missing a public authority?" -msgstr "¿Nos falta algún entidad pública?" +msgstr "¿Nos falta alguna entidad pública?" msgid "Are you the owner of any commercial copyright on this page?" msgstr "¿Posee el copyright de alguna información de esta página?" @@ -509,13 +510,13 @@ msgid "Awaiting classification." msgstr "Esperando clasificación." msgid "Awaiting internal review." -msgstr "Esperando revisión interna." +msgstr "Estoy preguntando por mi solicitud de información." msgid "Awaiting response." msgstr "Esperando respuesta." msgid "Banned users cannot edit their profile" -msgstr "" +msgstr "Prohibido los usuarios no pueden modificar su perfil" msgid "Batch created by {{info_request_user}} on {{date}}." msgstr "Bloque creado por {{info_request_user}} en {{date}}." @@ -718,7 +719,7 @@ msgid "Couldn't understand the image file that you uploaded. PNG, JPEG, GIF and msgstr "No se pudo procesar la imagen subida. Puedes utilizar PNG, JPEG, GIF u otros formatos de imagen populares." msgid "Create a new account" -msgstr "" +msgstr "Crear una nueva cuenta" msgid "Created by {{info_request_user}} on {{date}}." msgstr "Creado por {{info_request_user}} el {{date}}." @@ -765,7 +766,7 @@ msgid "Destroy {{name}}" msgstr "Borrar {{name}}" msgid "Details of request “{{request_title}}”" -msgstr "" +msgstr "Detalles de la solicitud “{{request_title}}”" msgid "Did you mean: {{correction}}" msgstr "¿Quiere decir: {{correction}}?" @@ -875,7 +876,7 @@ msgid "FOI email address for {{public_body}}" msgstr "Dirección de correo para {{public_body}}" msgid "FOI law does not apply to this authority." -msgstr "" +msgstr "La ley de acceso a la información pública no se aplica a esta autoridad." msgid "FOI request – {{title}}" msgstr "Solicitud de información - {{title}}" @@ -911,7 +912,7 @@ msgid "Find an authority" msgstr "Elije el organismo al que escribir" msgid "Find the authorities" -msgstr "" +msgstr "Encuentra las Entidades Públicas" msgid "Find the authorities to write to" msgstr "Seleccione las autoridades a las que desea escribir " @@ -920,7 +921,7 @@ msgid "First, did your other requests succeed?" msgstr "Antes de nada, ¿tus otras solicitudes tuvieron éxito?" msgid "First, type in the <strong>name of the public authority</strong> you'd\\n like information from." -msgstr "" +msgstr "En primer lugar, el tipo <strong>de nombre de la entidad pública</strong> que había o no como la información de" msgid "Foi attachment" msgstr "Respuesta adjunta" @@ -1004,7 +1005,7 @@ msgid "Follow us on twitter" msgstr "Síguenos en Twitter" msgid "Following" -msgstr "" +msgstr "siguiente" 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 "No se pueden mandar mensajes para esta solicitud, porque fue hecha externamente, y publicada aquí por {{public_body_name}} en nombre del solicitante." @@ -1015,7 +1016,7 @@ msgstr "¿Has olvidado tu contraseña?" msgid "Found {{count}} public authority {{description}}" msgid_plural "Found {{count}} public authorities {{description}}" msgstr[0] "Encontrado {{count}} organismo públicos {{description}}" -msgstr[1] "Encontrados {{count}} Entidades públicas {{description}}" +msgstr[1] "Encontradas {{count}} Entidades públicas {{description}}" msgid "Freedom of Information" msgstr "acceso a la información" @@ -1030,7 +1031,7 @@ msgid "Freedom of Information law no longer applies to this authority.Follow up msgstr "La ley de acceso a la información ya no es aplicable a este organismo. Los mensajes de seguimiento de solicitudes existentes se envían a " msgid "Freedom of Information law no longer applies to {{public_body_name}}." -msgstr "" +msgstr "Ley de Libertad de Información Pública no se aplica a {{public_body_name}}." msgid "Freedom of Information requests made" msgstr "Solicitudes de acceso a información realizadas" @@ -1060,7 +1061,7 @@ msgid "GIVE DETAILS ABOUT YOUR COMPLAINT HERE" msgstr "DETALLA TU QUEJA AQUÍ" msgid "Got an account?" -msgstr "" +msgstr "¿Tienes una cuenta?" msgid "Handled by post." msgstr "Resuelta por correo ordinario" @@ -1093,7 +1094,7 @@ msgid "Help" msgstr "Ayuda" msgid "Help us classify requests that haven't been updated" -msgstr "" +msgstr "Ayúdanos a clasificar las solicitudes que no han sido actualizadas" msgid "Here <strong>described</strong> means when a user selected a status for the request, and\\nthe most recent event had its status updated to that value. <strong>calculated</strong> is then inferred by\\n{{site_name}} for intermediate events, which weren't given an explicit\\ndescription by a user. See the <a href=\"{{search_path}}\">search tips</a> for description of the states." msgstr "" @@ -1130,7 +1131,7 @@ msgid "Home page" msgstr "Sitio web" msgid "Home page of authority" -msgstr "Sitio web del organismo" +msgstr "Sitio web de esta entidad" msgid "However, you have the right to request environmental\\n information under a different law" msgstr "" @@ -1144,10 +1145,12 @@ msgid "I am asking for <strong>new information</strong>" msgstr "Estoy pidiendo <strong>nueva información</strong>" msgid "I am requesting an <strong>internal review</strong>" -msgstr "Estoy pidiendo una <strong>revisión interna</strong>" +msgstr "Estoy Preguntando <strong> Por mi Solicitud de Información </strong>" msgid "I am writing to request an internal review of {{public_body_name}}'s handling of my FOI request '{{info_request_title}}'." -msgstr "Escribo para solicitar una revisión sobre cómo {{public_body_name}} ha gestionado mi solicitud de información '{{info_request_title}}'." +msgstr "" +"Escribo solicitando se me informe sobre cómo {{public_body_name}} ha gestionado\n" +"mi solicitud de información '{{info_request_title}}'." msgid "I don't like these ones — give me some more!" msgstr "Estas no me gustan — ¡dame más!" @@ -1163,14 +1166,14 @@ msgstr "Me gustaría <strong>retirar esta solicitud</strong>" msgid "I'm still <strong>waiting</strong> for my information\\n <small>(maybe you got an acknowledgement)</small>" msgstr "" -"Todavía estoy <strong>esperando</strong> por mi información\n" +"Todavía estoy <strong>esperando</strong> por mi solicitud\n" " <small>(puede que haya obtenido un acuse de recibo)</small>" msgid "I'm still <strong>waiting</strong> for the internal review" -msgstr "Todavía estoy <strong>esperando</strong> por la revisión interna" +msgstr "Todavía estoy <strong>esperando</strong> por mi solicitud (puede que haya obtenido un acuse de recibo)" msgid "I'm waiting for an <strong>internal review</strong> response" -msgstr "Estoy esperando por una respuesta de la <strong>revisión interna</strong>" +msgstr "Estoy preguntando por mi solicitud de información" msgid "I've been asked to <strong>clarify</strong> my request" msgstr "Me han pedido que <strong>aclare</strong> mi solicitud" @@ -1204,8 +1207,8 @@ msgstr "" msgid "If you are dissatisfied by the response you got from\\n the public authority, you have the right to\\n complain (<a href=\"{{url}}\">details</a>)." msgstr "" -"Si no estás satisfecho con la respuesta que has recibido del\n" -" organismo público, tienes derecho a\n" +"Si no estás satisfecho con la respuesta que has recibido de la\n" +" entidad Pública, tienes derecho a\n" " apelar (<a href=\"{{url}}\">detalles</a>)." msgid "If you are still having trouble, please <a href=\"{{url}}\">contact us</a>." @@ -1259,10 +1262,10 @@ msgstr "" " explicándonos tus razones.\\n" msgid "If you write about these requests (for example in a forum or a blog) please link to this page." -msgstr "" +msgstr "Si usted escribe sobre estas solicitudes (por ejemplo en un foro o un blog) por favor enlace a esta página." msgid "If you write about this request (for example in a forum or a blog) please link to this page, and <a href=\"{{url}}\">add an annotation</a> below telling people about your writing." -msgstr "" +msgstr "Si escribes sobre esta solicitud (por ejemplo, en un foro o un blog) por favor enlace a esta página, y <a href=\"{{url}}\">añadir una nota</a> a continuación y compartir con mas personas acerca de su escritura." msgid "If you're new to {{site_name}}" msgstr "Si es nuevo en {{site_name}}" @@ -1428,10 +1431,10 @@ msgid "Just one more thing" msgstr "Sólo una cosa más" msgid "Keep your request up to date" -msgstr "" +msgstr "Mantenga su solicitud hasta la fecha" msgid "Keep your requests up to date" -msgstr "" +msgstr "Mantenga sus solicitudes al día" msgid "Keywords" msgstr "Términos" @@ -1452,7 +1455,7 @@ msgid "Link to this" msgstr "Enlace" msgid "List of all authorities (CSV)" -msgstr "Lista de todos los organismos (CSV)" +msgstr "Lista de todas las entidades (CSV)" msgid "Listing FOI requests" msgstr "Mostrando solicitudes de información" @@ -1539,7 +1542,7 @@ msgid "Many requests" msgstr "Solicitudes diversas" msgid "Matching authorities" -msgstr "" +msgstr "las autoridades correspondientes" msgid "Message" msgstr "Mensaje" @@ -1554,7 +1557,7 @@ msgid "Missing contact details for '" msgstr "No contamos con los datos de contacto de '" msgid "More about this authority" -msgstr "Más información sobre este organismo" +msgstr "Más información sobre esta entidad" msgid "More requests..." msgstr "Más solicitudes..." @@ -1794,12 +1797,12 @@ msgid "Please <a href=\"{{url}}\">contact us</a> if you have any questions." msgstr "Por favor, <a href=\"{{url}}\">contáctenos</a> si tiene alguna pregunta." msgid "Please <a href=\"{{url}}\">get in touch</a> with us so we can fix it." -msgstr "Por favor <a href=\"{{url}}\">contacta</a> con nosotros para que podamos arreglarlo." +msgstr "Por favor <a href=\"{{url}}\">contáctenos </a> a nosotros para que podamos arreglarlo." msgid "Please <strong>answer the question above</strong> so we know whether the recent response contains useful information." msgid_plural "Please <strong>answer the question above</strong> so we know whether the recent responses contain useful information." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Favor <strong>responder a la pregunta anterior</strong> si sabemos que las respuestas recientes contienen información útil." +msgstr[1] "Favor <strong>responder a la pregunta anterior</strong> si sabemos que las respuestas recientes contienen información útil." msgid "Please <strong>go to the following requests</strong>, and let us\\n know if there was information in the recent responses to them." msgstr "" @@ -1810,7 +1813,7 @@ msgid "Please <strong>only</strong> write messages directly relating to your req msgstr "Por favor escribe <strong>sólo</strong> mensajes directamente relacionados con tu solicitud {{request_link}}. Si quieres pedir información que no estaba en tu solicitud original, entonces <a href=\"{{new_request_link}}\">envía una nueva</a>." msgid "Please ask for environmental information only" -msgstr "Por favor pidae información medio-ambiental solamente" +msgstr "Por favor pida información al medio-ambiental solamente" msgid "Please check the URL (i.e. the long code of letters and numbers) is copied\\ncorrectly from your email." msgstr "" @@ -1913,10 +1916,10 @@ msgid "Please keep the summary short, like in the subject of an email. You can u msgstr "Por favor, mantén el resumen corto, como en el asunto de un correo electrónico" msgid "Please only request information that comes under those categories, <strong>do not waste your\\n time</strong> or the time of the public authority by requesting unrelated information." -msgstr "Por favor, pide información sólo de estas categorias, <strong>no pierdas tu tiempo </strong> o el del organismo público pidiendo información no relacionada." +msgstr "Por favor, pide información sólo de estas categorias, <strong>no pierdas tu tiempo </strong> o de la Entidad Pública pidiendo información no relacionada." msgid "Please pass this on to the person who conducts Freedom of Information reviews." -msgstr "Por favor envie este mensaje a la persona responsable de revisar las solicitudes de información." +msgstr "Por favor envíe este mensaje a la Oficina responsable de tramitar las solicitudes de información." msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not." msgstr "" @@ -2017,7 +2020,7 @@ msgid "Preview your public request" msgstr "Revisa tu solicitud pública" msgid "Preview your request" -msgstr "" +msgstr "Vista previa de la solicitud" msgid "Profile photo" msgstr "Foto de Perfil" @@ -2053,7 +2056,7 @@ msgid "Public authority – {{name}}" msgstr "Organismo público - {{name}}" msgid "Public bodies that most frequently replied with \"Not Held\"" -msgstr "Organización publica que responde con más frecuencia \"No tenemos la información\"" +msgstr "Entidad publica que responde con más frecuencia \"No tenemos la información\"" msgid "Public bodies with most overdue requests" msgstr "Instituciones Públicas con más solicitudes vencidas" @@ -2071,16 +2074,16 @@ msgid "Public body" msgstr "Autoridad/Organismo Publico" msgid "Public body category" -msgstr "Categoría de organismo público" +msgstr "Categoría de entidades públicas" msgid "Public body category link" -msgstr "Enlace categoría de organismo público" +msgstr "Enlace categoría de entidades públicas" msgid "Public body change request" -msgstr "Solicitud de cambio de organismo público" +msgstr "Solicitud de cambio de entidades públicas" msgid "Public body heading" -msgstr "Nombre de Organismo público" +msgstr "Nombre de entidades públicas" msgid "Public notes" msgstr "Notas públicas" @@ -2218,7 +2221,7 @@ msgid "Refused." msgstr "Rechazada." msgid "Remember me (keeps you signed in longer; do not use on a public computer)" -msgstr "" +msgstr "Recuérdeme (mantenga esta sesión abierta, no utilizar en una computadora pública)" msgid "Report abuse" msgstr "Denuncie abuso" @@ -2242,7 +2245,7 @@ msgid "Request an internal review" msgstr "Pregunta por tu Solicitud" msgid "Request an internal review from {{person_or_body}}" -msgstr "Pregunta por tu solicitud al contacto en {{person_or_body}}" +msgstr "Pregunta por tu solicitud {{person_or_body}}" msgid "Request email" msgstr "Email para solicitudes" @@ -2350,7 +2353,7 @@ msgid "Search in" msgstr "Buscar en" msgid "Search in their website for this information →" -msgstr "" +msgstr "Buscar en el sitio web esta información →" msgid "Search over<br/>\\n <strong>{{number_of_requests}} requests</strong> <span>and</span><br/>\\n <strong>{{number_of_authorities}} authorities</strong>" msgstr "" @@ -2406,13 +2409,13 @@ msgid "Set your profile photo" msgstr "Cambiar foto de perfil" msgid "Share on Facebook" -msgstr "" +msgstr "Compartir en Facebook" msgid "Share your batch request" -msgstr "" +msgstr "Comparte tu solicitud en el blog" msgid "Share your request" -msgstr "" +msgstr "Comparte tu solicitud" msgid "Short name" msgstr "Nombre corto" @@ -2508,7 +2511,7 @@ msgid "Stay up to date" msgstr "Manténgase al día" msgid "Still awaiting an <strong>internal review</strong>" -msgstr "Todavía esperando por una <strong>revisión interna</strong>" +msgstr "Todavía esperando por una <strong>información</strong>" msgid "Subject" msgstr "Asunto" @@ -2922,7 +2925,7 @@ msgid "This page of public body statistics is currently experimental, so there a msgstr "Esta página de estadísticas de Entidades públicas es actualmente una prueba, por lo que hay algunas advertencias que deben tenerse en cuenta:" msgid "This particular request is finished:" -msgstr "Esta solicitud está cerrada:" +msgstr "Esta solicitud está resuelta según la entidad:" msgid "This person has made no Freedom of Information requests using this site." msgstr "Esta persona no ha realizado solicitudes de información usando esta web." @@ -3010,7 +3013,7 @@ msgstr "" "de correo {{email}}." msgid "To" -msgstr "" +msgstr "A" msgid "To cancel these alerts" msgstr "Cancelar estas alertas" @@ -3140,7 +3143,7 @@ msgid "Turn off email alerts" msgstr "Descontinuar alertas por correo electronico" msgid "Tweet it" -msgstr "" +msgstr "Twittear" msgid "Tweet this request" msgstr "Tuitear esta solicitud" @@ -3170,7 +3173,7 @@ msgid "Unexpected search result type " msgstr "Se encontró un tipo de resultado inesperado " msgid "Unfortunately we don't know the FOI\\nemail address for that authority, so we can't validate this.\\nPlease <a href=\"{{url}}\">contact us</a> to sort it out." -msgstr "Desgraciadamente no tenemos la dirección de correo para este organismo, así que no podemos validarlo. Por favor <a href=\"{{url}}\">contáctenos</a> para arreglarlo." +msgstr "Lamentablemente no tenemos la dirección de correo para este organismo, así que no podemos validarlo. Por favor <a href=\"{{url}}\">contáctenos</a> para arreglarlo." msgid "Unfortunately, we do not have a working address for {{public_body_names}}." msgstr "Lamentablemente, no tenemos una dirección que funcione para {{public_body_names}}." @@ -3218,7 +3221,7 @@ msgid "UserInfoRequestSentAlert|Alert type" msgstr "UserInfoRequestSentAlert|Alert type" msgid "Users cannot usually make batch requests to multiple authorities at once because we don’t want public authorities to be bombarded with large numbers of inappropriate requests. Please <a href=\"{{url}}\">contact us</a> if you think you have good reason to send the same request to multiple authorities at once." -msgstr "Los usuarios no pueden por lo general hacer solicitudes por bloques a varias autoridades a la vez porque no queremos que las autoridades públicas sean saturadas con un gran número de solicitudes inapropiadas. <a Href=\"{{url}}\"> sino contáctenos </a> si usted piensa que tiene una buena razón para enviar la misma petición a múltiples autoridades a la vez." +msgstr "Los usuarios no pueden por lo general hacer solicitudes por bloques a varias autoridades a la vez porque no queremos que las entidades públicas sean saturadas con un gran número de solicitudes inapropiadas. <a Href=\"{{url}}\"> sino contáctenos </a> si usted piensa que tiene una buena razón para enviar la misma petición a múltiples autoridades a la vez." msgid "User|About me" msgstr "User|About me" @@ -3293,7 +3296,7 @@ msgid "View email" msgstr "Ver correo" msgid "View other requests to {{public_body}}" -msgstr "" +msgstr "Ver otras solicitudes a {{public_body}}" msgid "Waiting clarification." msgstr "Esperando aclaración." @@ -3346,13 +3349,13 @@ msgstr "" msgid "We're waiting for someone to read a recent response and update the status accordingly. Perhaps <strong>you</strong> might like to help out by doing that?" msgid_plural "We're waiting for someone to read recent responses and update the status accordingly. Perhaps <strong>you</strong> might like to help out by doing that?" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Estamos esperando a alguien que lea una respuesta reciente y actualizar el estado en consecuencia. quizás <strong>usted</strong> si quiere puede ayudar hacer eso?" +msgstr[1] "Estamos esperando a alguien que lea una respuesta reciente y actualizar el estado en consecuencia. quizás <strong>usted</strong> si quiere puede ayudar hacer eso?" msgid "We're waiting for {{user}} to read a recent response and update the status." msgid_plural "We're waiting for {{user}} to read recent responses and update the status." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Estamos esperando a{{user}} para leer las respuestas recientes y actualizar su estado." +msgstr[1] "Estamos esperando a{{user}} para leer las respuestas recientes y actualizar su estado." msgid "We've sent an email to your new email address. You'll need to click the link in\\nit before your email address will be changed." msgstr "" @@ -3380,7 +3383,7 @@ msgid "What information has been requested?" msgstr "¿Qué información ha sido solicitada?" msgid "What next?" -msgstr "" +msgstr "Qué sigue?" msgid "When you get there, please update the status to say if the response \\ncontains any useful information." msgstr "" @@ -3729,7 +3732,7 @@ msgid "Your request:" msgstr "Tu solicitud:" msgid "Your requests will be <strong>sent</strong> shortly!" -msgstr "" +msgstr "Sus solicitudes serán <strong>enviadas</strong> shortly!" msgid "Your response to an FOI request was not delivered" msgstr "Tú respuesta a la solicitud de información no ha sido entregada" @@ -3759,7 +3762,7 @@ msgstr[0] "Sus {{count}} solicitudes por bloques" msgstr[1] "Sus {{count}} solicitudes por bloques" msgid "Your {{law_used_full}} request has been sent" -msgstr "" +msgstr "Su {{law_used_full}} solicitud ha sido enviado" msgid "Your {{site_name}} email alert" msgstr "Tu alerta en {{site_name}}" @@ -3804,7 +3807,7 @@ msgid "all requests or comments matching text '{{query}}'" msgstr "Todo el texto de peticiones o comentarios coinciden '{{query}}'" msgid "also called {{public_body_short_name}}" -msgstr "también conocido como {{public_body_short_name}}" +msgstr "también conocida como {{public_body_short_name}}" msgid "an anonymous user" msgstr "un usuario anónimo" @@ -3866,7 +3869,7 @@ msgid "edit text about you" msgstr "edita el texto sobre ti" msgid "email address" -msgstr "" +msgstr "dirección de correo electrónico" msgid "even during holidays" msgstr "incluso durante las vacaciones" @@ -3920,7 +3923,7 @@ msgid "messages from users" msgstr "mensajes de usuarios" msgid "mobile number" -msgstr "" +msgstr "número de teléfono móvil" msgid "move..." msgstr "mover..." @@ -3987,7 +3990,7 @@ msgstr "la dirección de contacto de {{public_body}}" #. Send a public reply to... #. Don't want to address your message to... ? msgid "the main FOI contact at {{public_body}}" -msgstr "el contacto en {{public_body}}" +msgstr "al contacto en {{public_body}}" msgid "the requester" msgstr "el solicitante" @@ -4033,8 +4036,8 @@ msgstr "{{count}} solicitudes de información encontradas" msgid "{{count}} follower" msgid_plural "{{count}} followers" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "{{count}} seguidores" +msgstr[1] "{{count}} seguidores" msgid "{{count}} request" msgid_plural "{{count}} requests" @@ -4077,7 +4080,7 @@ msgid "{{public_body_link}} was sent a request about" msgstr "{{public_body_link}} recibió una solicitud sobre" msgid "{{public_body_name}} no longer exists. From the request page, try replying to a particular message, rather than sending\\n a general followup. If you need to make a general followup, and know\\n an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>." -msgstr "" +msgstr "{{public_body_name}}ya no existe. Desde la página de solicitud, trate de responder a un mensaje en particular, en lugar de enviar o un seguimiento general. Si usted necesita para hacer un seguimiento general y saber o no un correo electrónico que irá al lugar correcto, por favor <a href=\"{{url}}\">send it to us</a>." msgid "{{public_body_name}} only:" msgstr "Sólo {{public_body_name}}:" @@ -4157,4 +4160,4 @@ msgid "{{user}} made this {{law_used_full}} request" msgstr "{{user}} hizo esta solicitud de {{law_used_full}}" msgid "« Back to search results" -msgstr "" +msgstr "«Volver a los resultados de búsqueda" diff --git a/locale/hr/app.po b/locale/hr/app.po index 06bfaab34..e25f68d29 100644 --- a/locale/hr/app.po +++ b/locale/hr/app.po @@ -19,8 +19,8 @@ msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-03-24 10:21+0000\n" -"PO-Revision-Date: 2015-03-24 11:17+0000\n" -"Last-Translator: louisecrow <louise@mysociety.org>\n" +"PO-Revision-Date: 2015-03-25 15:04+0000\n" +"Last-Translator: Žana Počuča <zana.fakin@gmail.com>\n" "Language-Team: Croatian (http://www.transifex.com/projects/p/alaveteli/language/hr/)\n" "Language: hr\n" "MIME-Version: 1.0\n" @@ -152,9 +152,7 @@ msgid "<a href=\"{{url}}\">Add an annotation</a> (to help the requester or other msgstr "<a href=\"{{url}}\">Dodajte pribilješku</a> (da bi se pomoglo podnositelju zahtjeva ili drugima)" msgid "<a href=\"{{url}}\">Do you want to request private information about yourself?</a>" -msgstr "" -"<strong>Napomena o privatnosti:</strong> Ako želite privatne informacije o\n" -" sebi onda <a href=\"{{url}}\">kliknite ovdje</a>." +msgstr "<a href=\"{{url}}\">Želite zatražiti privatne informacije o sebi?</a>" msgid "<a href=\"{{url}}\">Keep it <strong>focused</strong></a>, you'll be more likely to get what you want." msgstr "Držite se <strong>suštine</strong>, lakše ćete dobiti ono što tražite (<a href=\"{{url}}\">zašto?</a>)." @@ -266,7 +264,7 @@ msgid "<strong>Anything else</strong>, such as clarifying, prompting, thanking" msgstr "<strong>Nešto drugo</strong>, poput objašnjenja, napomena, zahvalnica" msgid "<strong>By law, they have to respond</strong> (<a href=\"{{url}}\">why?</a>)." -msgstr "" +msgstr "<strong>Prema zakonu, dužni su odgovoriti</strong> (<a href=\"{{url}}\">zašto?</a>)." msgid "<strong>Caveat emptor!</strong> To use this data in an honourable way, you will need \\na good internal knowledge of user behaviour on {{site_name}}. How, \\nwhy and by whom requests are categorised is not straightforward, and there will\\nbe user error and ambiguity. You will also need to understand FOI law, and the\\nway authorities use it. Plus you'll need to be an elite statistician. Please\\n<a href=\"{{contact_path}}\">contact us</a> with questions." msgstr "<strong>Caveat emptor!</strong> Da biste koristili ove podatke na častan način, trebat ćete dobro interno znanje korisničkog ponašanja na {{site_name}}. Kako, zašto i tko kategorizira zahtjeve nije jednostavno pa će biti korisničkih pogrešaka i nejasnoća. Također, morate razumjeti Zakon o pravu na pristup informacijama i način na koji ga nadležna tijela koriste. Osim toga, morate biti vrhunski statističar. Molimo <a href=\"{{contact_path}}\">kontaktirajte nas</a> za sva pitanja." @@ -304,10 +302,10 @@ msgid "<strong>Thank</strong> the public authority or " msgstr "<strong>Zahvali</strong> javnoj vlasti ili " msgid "<strong>We will email you</strong> when there is a response, or after {{late_number_of_days}} working days if the authority still hasn't replied by then." -msgstr "" +msgstr "<strong>Poslat ćemo Vam e-mail</strong> ako stigne odgovor ili nakon {{late_number_of_days}} radnih dana ukoliko tijelo javne vlasti nije odgovorilo do tada." msgid "<strong>We will email you</strong> when they have been sent. We will also email you when there is a response to any of them, or after {{late_number_of_days}} working days if the authorities still haven't replied by then." -msgstr "" +msgstr "<strong>Poslat ćemo Vam e-mail</strong> kada budu poslani. Također, poslat ćemo e-mail ako bude odgovora na bilo koji od njih ili nakon {{late_number_of_days}} radnih dana ukoliko tijelo javne vlasti još nije odgovorilo." msgid "<strong>did not have</strong> the information requested." msgstr "<strong>ne posjeduje</strong> traženu informaciju." @@ -367,7 +365,7 @@ msgid "ActsAsXapian::ActsAsXapianJob|Model" msgstr "ActsAsXapian::ActsAsXapianJob|Model" msgid "Add an annotation to “{{request_title}}”" -msgstr "" +msgstr "Dodajte bilješku za “{{request_title}}”" msgid "Add an annotation to your request with choice quotes, or\\n a <strong>summary of the response</strong>." msgstr "Dodajte pribilješku Vašem zahtjevu sa izabranim navodima, ili\\n <strong>sažetak odgovora</strong>." @@ -502,7 +500,7 @@ msgid "Awaiting response." msgstr "Čeka odgovor." msgid "Banned users cannot edit their profile" -msgstr "" +msgstr "Korisnici sa zabranom pristupa ne mogu uređivati svoj profil" msgid "Batch created by {{info_request_user}} on {{date}}." msgstr "Seriju je napravio/la {{info_request_user}} dana {{date}}." @@ -619,7 +617,7 @@ msgid "Click on the link below to send a message to {{public_body_name}} telling msgstr "Kliknite na poveznicu ispod da biste poslali poruku {{public_body_name}} u kojoj im napomenite da odgovore na Vaš zahtjev. Možda želite tražiti požurnicu\\n, tražeći da saznaju zašto odgovor na zahtjev kasni." msgid "Click on the link below to send a message to {{public_body}} reminding them to reply to your request." -msgstr "Kliknite na poveznicu ispod da biste poslali poruku {{public_body}} koja će ih podsjetiti da odgovore na Vaš zahtjev." +msgstr "Kliknite na poveznicu ispod da biste poslali poruku {{public_body}} koja će ih podsjetiti da odgovore na Vaš zahtjev, ili pošaljite žalbu Povjerniku za informiranje navodeći link na Vaš zahtjev." msgid "Close" msgstr "Zatvorite" @@ -703,7 +701,7 @@ msgid "Couldn't understand the image file that you uploaded. PNG, JPEG, GIF and msgstr "Pogrešan format datoteke. Molimo Vas unesite: PNG, JPEG, GIF, ili neke druge podržive formate." msgid "Create a new account" -msgstr "" +msgstr "Izradi novi račun" msgid "Created by {{info_request_user}} on {{date}}." msgstr "Izradio/la {{info_request_user}} dana {{date}}." @@ -739,7 +737,7 @@ msgid "Defunct." msgstr "Defunkc." msgid "Delayed response to your FOI request - " -msgstr "Odgođen odgovor na Vaš zahtjev za pristup informacijama - " +msgstr "Odgovor na Vaš PPI zahtjev kasni - " msgid "Delayed." msgstr "Odgođen" @@ -751,7 +749,7 @@ msgid "Destroy {{name}}" msgstr "Poništiti {{name}}" msgid "Details of request “{{request_title}}”" -msgstr "" +msgstr "Detalji zahtjeva “{{request_title}}”" msgid "Did you mean: {{correction}}" msgstr "Jeste li mislili: {{correction}}" @@ -863,7 +861,7 @@ msgid "FOI email address for {{public_body}}" msgstr "PPI adresa e-pošte za {{public_body}}" msgid "FOI law does not apply to this authority." -msgstr "" +msgstr "ZPPI se ne primjenjuje na ovo tijelo javne vlasti. " msgid "FOI request – {{title}}" msgstr "PPI zahtjev – {{title}}" @@ -896,10 +894,10 @@ msgid "Filter by Request Status (optional)" msgstr "Filtrirati prema statusu zahtjeva (neobavezno)" msgid "Find an authority" -msgstr "Odaberite ustanovu kojoj ćete pisati" +msgstr "Pronađi tijelo javne vlasti" msgid "Find the authorities" -msgstr "" +msgstr "Pronađi tijela javne vlasti" msgid "Find the authorities to write to" msgstr "Odaberite tijela javne vlasti kojima ćete pisati" @@ -909,6 +907,8 @@ msgstr "Prvo, jesu li Vaši ostali zahtjevi bili uspješni?" msgid "First, type in the <strong>name of the public authority</strong> you'd\\n like information from." msgstr "" +"Prvo, upišite <strong>ime tijela javne vlasti</strong> od kojeg \n" +"biste željeli dobiti informaciju." msgid "Foi attachment" msgstr "Privitak zahtjeva za pristup informacijama" @@ -992,7 +992,7 @@ msgid "Follow us on twitter" msgstr "Pratite nas na Twitteru" msgid "Following" -msgstr "" +msgstr "Pratite" 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 "Dodatne poruke ne mogu se poslati za ovaj zahtjev, jer ga je napravio netko izvana, te ga ovdje objavio pod {{public_body_name}} u ime onoga koji je poslao zahtjev." @@ -1013,13 +1013,13 @@ msgid "Freedom of Information Act" msgstr "Zakon o pravu na pristup informacijama" msgid "Freedom of Information law does not apply to this authority, so you cannot make a request to it." -msgstr "Zakon o pravu na pristup informacijama ne primjenjuje se na ovu ustanovu, stoga joj ne možete uputiti zahtjev." +msgstr "Zakon o pravu na pristup informacijama ne primjenjuje se na ovo tijelo, stoga mu ne možete uputiti zahtjev." msgid "Freedom of Information law no longer applies to this authority.Follow up messages to existing requests are sent to " msgstr "Zakon o pristupu informacijama više se ne primjenjuje na ovu ustanovu. Daljnje poruke na postojeće zahtjeve šalju se" msgid "Freedom of Information law no longer applies to {{public_body_name}}." -msgstr "" +msgstr "Zakon o pravu na pristup informacijama više se ne primjenjuje na {{public_body_name}}." msgid "Freedom of Information requests made" msgstr "Zahtjevi za pristup informacijama podneseni" @@ -1046,7 +1046,7 @@ msgid "GIVE DETAILS ABOUT YOUR COMPLAINT HERE" msgstr "OVDJE IZNESITE DETALJE VAŠE ŽALBE" msgid "Got an account?" -msgstr "" +msgstr "Imate li račun?" msgid "Handled by post." msgstr "Riješen poštom." @@ -1079,7 +1079,7 @@ msgid "Help" msgstr "Pomoć" msgid "Help us classify requests that haven't been updated" -msgstr "" +msgstr "Pomozite nam klasificirati zahtjeve koji još nisu ažurirani" msgid "Here <strong>described</strong> means when a user selected a status for the request, and\\nthe most recent event had its status updated to that value. <strong>calculated</strong> is then inferred by\\n{{site_name}} for intermediate events, which weren't given an explicit\\ndescription by a user. See the <a href=\"{{search_path}}\">search tips</a> for description of the states." msgstr "Ovdje <strong>opisano</strong> znači da kada korisnik odabere status zahtjeva, i status\\n posljednjeg događaja se promijeni u tu vrijednost. <strong>Izračunata vrijednost</strong> tada se dodijeli sa\\n{{site_name}} za međudogađaje, koje korisnici nisu eksplicitno\\n opisali. Pogledajte <a href=\"{{search_path}}\">savjete za pretraživanje</a> za opise statusa." @@ -1237,10 +1237,10 @@ msgstr "" "<a href=\"/help/contact\">kontaktirati</a> uz obrazloženje.\\n" msgid "If you write about these requests (for example in a forum or a blog) please link to this page." -msgstr "" +msgstr "Ukoliko pišete o ovim zahtjevima (primjerice, na forumu ili blogu), molimo stavite poveznicu do ove stranice." msgid "If you write about this request (for example in a forum or a blog) please link to this page, and <a href=\"{{url}}\">add an annotation</a> below telling people about your writing." -msgstr "" +msgstr "Ukoliko pišete o ovom zahtjevu (primjerice, na forumu ili blogu), molimo stavite poveznicu do ove stranice i <a href=\"{{url}}\">dodajte bilješku</a> ispod da biste druge obavijestili o Vašem pisanju." msgid "If you're new to {{site_name}}" msgstr "Ako ste novi na {{site_name}}" @@ -1406,10 +1406,10 @@ msgid "Just one more thing" msgstr "Još nešto" msgid "Keep your request up to date" -msgstr "" +msgstr "Održavajte svoj zahtjev ažurnim" msgid "Keep your requests up to date" -msgstr "" +msgstr "Održavajte svoje zahtjeve ažurnim" msgid "Keywords" msgstr "Ključne riječi" @@ -1511,7 +1511,7 @@ msgid "Many requests" msgstr "Puno zahtjeva" msgid "Matching authorities" -msgstr "" +msgstr "Odgovarajuća tijela javne vlasti" msgid "Message" msgstr "Poruka" @@ -1770,9 +1770,9 @@ msgstr "Molimo <a href=\"{{url}}\">kontaktirajte nas</a> kako bismo to mogli pop msgid "Please <strong>answer the question above</strong> so we know whether the recent response contains useful information." msgid_plural "Please <strong>answer the question above</strong> so we know whether the recent responses contain useful information." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "Molimo <strong>odgovorite na pitanje iznad</strong> kako bismo znali sadrži li posljednji odgovor korisne informacije." +msgstr[1] "Molimo <strong>odgovorite na pitanje iznad</strong> kako bismo znali sadrže li posljednji odgovori korisne informacije." +msgstr[2] "Molimo <strong>odgovorite na pitanje iznad</strong> kako bismo znali sadrže li nedavni odgovori korisne informacije." msgid "Please <strong>go to the following requests</strong>, and let us\\n know if there was information in the recent responses to them." msgstr "Molimo <strong>idite na sljedeće zahtjeve</strong>, i obavijestite nas\\n ako je bilo informacija u skorašnjim odgovorima." @@ -1801,7 +1801,7 @@ msgid "Please choose whether or not you got some of the information that you wan msgstr "Molimo izaberite jednu od ponuđenih opcija, i recite nam jeste li ili niste dobili informaciju koje ste tražili." msgid "Please click on the link below to cancel or alter these emails." -msgstr "Molimo kliknite na poveznicu ispod da biste poništili ili promijenili ovu e-poštu" +msgstr "Molimo kliknite na poveznicu ispod da biste poništili ili promijenili ovu e-poštu." msgid "Please click on the link below to confirm that you want to \\nchange the email address that you use for {{site_name}}\\nfrom {{old_email}} to {{new_email}}" msgstr "" @@ -1990,7 +1990,7 @@ msgid "Preview your public request" msgstr "Pregledajte Vaš javni zahtjev" msgid "Preview your request" -msgstr "" +msgstr "Napravite pretpregled Vašeg zahtjeva" msgid "Profile photo" msgstr "Slika na profilu" @@ -2191,7 +2191,7 @@ msgid "Refused." msgstr "Odbijen." msgid "Remember me (keeps you signed in longer; do not use on a public computer)" -msgstr "" +msgstr "Zapamti me (ostajete dulje upisani; ne koristiti na javnim računalima)" msgid "Report abuse" msgstr "Prijavite zloupotrebu" @@ -2284,7 +2284,7 @@ msgid "Response to '{{title}}'" msgstr "Odgovor za '{{title}}'" msgid "Response to this request is <strong>delayed</strong>." -msgstr "Odgovor na ovaj zahtjev je <strong>odgođen</strong>." +msgstr "Odgovor na ovaj zahtjev <strong>kasni</strong>." msgid "Response to this request is <strong>long overdue</strong>." msgstr "Odgovor na ovaj zahtjev <strong>kasni</strong>." @@ -2323,7 +2323,7 @@ msgid "Search in" msgstr "Pretražite u" msgid "Search in their website for this information →" -msgstr "" +msgstr "Potražite ovu informaciju na njihovim stranicama →" msgid "Search over<br/>\\n <strong>{{number_of_requests}} requests</strong> <span>and</span><br/>\\n <strong>{{number_of_authorities}} authorities</strong>" msgstr "" @@ -2380,13 +2380,13 @@ msgid "Set your profile photo" msgstr "Podesiti sliku na Vašem profilu" msgid "Share on Facebook" -msgstr "" +msgstr "Podijeli na Facebooku" msgid "Share your batch request" -msgstr "" +msgstr "Podijelite svoj skupni zahtjev" msgid "Share your request" -msgstr "" +msgstr "Podijelite svoj zahtjev" msgid "Short name" msgstr "Nadimak" @@ -2678,7 +2678,7 @@ msgid "The requester has abandoned this request for some reason" msgstr "Podnositelj je iz nekog razloga odustao od ovog zahtjeva" msgid "The response to your request has been <strong>delayed</strong>. You can say that,\\n by law, the authority should normally have responded\\n <strong>promptly</strong> and" -msgstr "Odgovor na Vaš zahtjev je <strong>odgođen</strong>. Možete reći da je, po zakonu,\\n tijelo javne vlasti trebalo odgovoriti <strong>brzo</strong> i" +msgstr "Odgovor na Vaš zahtjev <strong>kasni</strong>. Možete reći da je, po zakonu,\\n tijelo javne vlasti trebalo odgovoriti <strong>brzo</strong> i" msgid "The response to your request is <strong>long overdue</strong>. You can say that, by\\n law, under all circumstances, the authority should have responded\\n by now" msgstr "Odgovor na Vaš zahtjev <strong>kasni</strong>. Možete reći da po zakonu,\\n u svakom slučaju, tijelo javen vlasti trebalo odgovoriti do sada" @@ -2815,10 +2815,10 @@ msgid "They have been given the following explanation:" msgstr "Dano im je sljedeće objašnjenje:" msgid "They have not replied to your {{law_used_short}} request {{title}} promptly, as normally required by law" -msgstr "Nisu odgovorili na Vaš zahtjev za {{law_used_short}} s naslovom {{title}} u kratkom vremenskom roku, kao što je predviđeno zakonom" +msgstr "Nisu odgovorili na Vaš {{law_used_short}} zahtjev s naslovom '{{title}}' u roku kao što je predviđeno zakonom" msgid "They have not replied to your {{law_used_short}} request {{title}}, \\nas required by law" -msgstr "Nisu odgovorili na Vaš zahtjev za {{law_used_short}} '{{title}}', \\nkao što je predviđeno zakonom" +msgstr "Nisu odgovorili na Vaš {{law_used_short}} zahtjev '{{title}}', \\nkao što je predviđeno zakonom" msgid "Things to do with this request" msgstr "Stvari za uraditi s ovim zahtjevom" @@ -2965,7 +2965,7 @@ msgid "This was not possible because there is already an account using \\nthe em msgstr "To nije bilo moguće jer već postoji račun koji koristi ovu adresu e-pošte {{email}}." msgid "To" -msgstr "" +msgstr "Za" msgid "To cancel these alerts" msgstr "Da biste poništili ova automatska upozorenja" @@ -3093,7 +3093,7 @@ msgid "Turn off email alerts" msgstr "Isključite e-mail automatske alarme" msgid "Tweet it" -msgstr "" +msgstr "Podijelite na Twitteru" msgid "Tweet this request" msgstr "Tweetaj ovaj zahtjev" @@ -3251,7 +3251,7 @@ msgid "View email" msgstr "Pogledati e-poštu" msgid "View other requests to {{public_body}}" -msgstr "" +msgstr "Pogledajte druge zahtjeve za {{public_body}}" msgid "Waiting clarification." msgstr "Čekamo objašnjenje." @@ -3300,15 +3300,15 @@ msgstr "" msgid "We're waiting for someone to read a recent response and update the status accordingly. Perhaps <strong>you</strong> might like to help out by doing that?" msgid_plural "We're waiting for someone to read recent responses and update the status accordingly. Perhaps <strong>you</strong> might like to help out by doing that?" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "Čekamo da netko pročita nedavni odgovor i ažurira status na odgovarajući način. Možda biste <strong>Vi</strong> željeli pomoći u tome?" +msgstr[1] "Čekamo da netko pročita nedavne odgovore i ažurira status na odgovarajući način. Možda biste <strong>Vi</strong> željeli pomoći u tome?" +msgstr[2] "Čekamo da netko pročita nedavne odgovore i ažurira status na odgovarajući način. Možda biste <strong>Vi</strong> željeli pomoći u tome?" msgid "We're waiting for {{user}} to read a recent response and update the status." msgid_plural "We're waiting for {{user}} to read recent responses and update the status." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "Čekamo da {{user}} pročita nedavni odgovor i ažurira status." +msgstr[1] "Čekamo da {{user}} pročita nedavne odgovore i ažurira status." +msgstr[2] "Čekamo da {{user}} pročita nedavne odgovore i ažurira status." msgid "We've sent an email to your new email address. You'll need to click the link in\\nit before your email address will be changed." msgstr "" @@ -3336,7 +3336,7 @@ msgid "What information has been requested?" msgstr "Koje su informacije zatražene?" msgid "What next?" -msgstr "" +msgstr "Što sljedeće?" msgid "When you get there, please update the status to say if the response \\ncontains any useful information." msgstr "Kada ga pregledate, molimo ažurirajte status da nam kažete je li \\nodgovor sadržavao korisne informacije." @@ -3677,7 +3677,7 @@ msgid "Your request:" msgstr "Vaš zahtjev:" msgid "Your requests will be <strong>sent</strong> shortly!" -msgstr "" +msgstr "Vaši će zahtjevi biti <strong>poslani</strong> uskoro!" msgid "Your response to an FOI request was not delivered" msgstr "Vaš odgovor na zahtjev za pristup informacijama nije dostavljen" @@ -3710,7 +3710,7 @@ msgstr[1] "Vaša {{count}} skupna zahtjeva" msgstr[2] "Vaših {{count}} skupnih zahtjeva" msgid "Your {{law_used_full}} request has been sent" -msgstr "" +msgstr "Vaš zahtjev prema {{law_used_full}} je poslan" msgid "Your {{site_name}} email alert" msgstr "Obavijest o aktivnosti na {{site_name}}" @@ -3817,7 +3817,7 @@ msgid "edit text about you" msgstr "uredite tekst o Vama" msgid "email address" -msgstr "" +msgstr "e-mail adresa" msgid "even during holidays" msgstr "i za vrijeme praznika" @@ -3832,7 +3832,7 @@ msgid "has reported an" msgstr "je prijavio/la" msgid "have delayed." -msgstr "je odgodio/la" +msgstr "kasni s odgovorom." msgid "hide quoted sections" msgstr "sakrij citirane dijelove" @@ -3871,7 +3871,7 @@ msgid "messages from users" msgstr "poruke od korisnika" msgid "mobile number" -msgstr "" +msgstr "broj mobitela" msgid "move..." msgstr "premjestiti" @@ -3982,9 +3982,9 @@ msgstr "Pronađeno {{count}} zahtjeva za pristup informacijama" msgid "{{count}} follower" msgid_plural "{{count}} followers" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "{{count}} pratitelj" +msgstr[1] "{{count}} pratitelja" +msgstr[2] "{{count}} pratitelja" msgid "{{count}} request" msgid_plural "{{count}} requests" @@ -4030,6 +4030,9 @@ msgstr "Za {{public_body_link}} poslan je zahtjev o" msgid "{{public_body_name}} no longer exists. From the request page, try replying to a particular message, rather than sending\\n a general followup. If you need to make a general followup, and know\\n an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>." msgstr "" +"{{public_body_name}} više ne postoji. Pokušajte odgovoriti na određenu poruku na stranici sa zahtjevima, radije nego da šaljete\n" +"općenitu povratnu informaciju. Ako morate poslati općenitu povratnu informaciju i znate\n" +"e-mail odgovarajućeg primatelja, molimo <a href=\"{{url}}\">pošaljite nam ga</a>." msgid "{{public_body_name}} only:" msgstr "{{public_body_name}} može:" @@ -4107,4 +4110,4 @@ msgid "{{user}} made this {{law_used_full}} request" msgstr "{{user}} je podnio/la ovaj zahtjev za {{law_used_full}}" msgid "« Back to search results" -msgstr "" +msgstr "« Povratak na rezultate pretrage" diff --git a/script/compact-xapian-database b/script/compact-xapian-database index 7d32d7a15..cb2d578e6 100755 --- a/script/compact-xapian-database +++ b/script/compact-xapian-database @@ -15,15 +15,12 @@ if [ -x /usr/bin/xapian-compact ]; echo >&2 "Didn't compact Xapian database because there was an existing database at $XAPIAN_DB_DIR/$RAILS_ENV.new" exit 1 else - OWNER=$(stat -c %U "$XAPIAN_DB_DIR/$RAILS_ENV") export XAPIAN_DB_DIR RAILS_ENV - su "$OWNER" <<SU -commonlib/bin/output-on-error xapian-compact "\$XAPIAN_DB_DIR/\$RAILS_ENV" "\$XAPIAN_DB_DIR/\$RAILS_ENV.new" -SU + commonlib/bin/output-on-error xapian-compact "$XAPIAN_DB_DIR/$RAILS_ENV" "$XAPIAN_DB_DIR/$RAILS_ENV.new" mv "$XAPIAN_DB_DIR/$RAILS_ENV" "$XAPIAN_DB_DIR/$RAILS_ENV.tmp" mv "$XAPIAN_DB_DIR/$RAILS_ENV.new" "$XAPIAN_DB_DIR/$RAILS_ENV" rm -rf "$XAPIAN_DB_DIR/$RAILS_ENV.tmp" - commonlib/bin/output-on-error service "$DAEMON_NAME" restart + commonlib/bin/output-on-error /usr/sbin/service "$DAEMON_NAME" restart fi else echo >&2 "Could not find xapian-compact script; have you installed xapian-tools?" diff --git a/spec/controllers/public_body_controller_spec.rb b/spec/controllers/public_body_controller_spec.rb index 130631ef6..ff0a70a6f 100644 --- a/spec/controllers/public_body_controller_spec.rb +++ b/spec/controllers/public_body_controller_spec.rb @@ -82,6 +82,13 @@ describe PublicBodyController, "when showing a body" do expect(flash[:search_params]).to eq(search_params) end + + it 'should not show high page offsets as these are extremely slow to generate' do + lambda { + get :show, { :url_name => 'dfh', :view => 'all', :page => 25 } + }.should raise_error(ActiveRecord::RecordNotFound) + end + end describe PublicBodyController, "when listing bodies" do diff --git a/spec/helpers/public_body_helper_spec.rb b/spec/helpers/public_body_helper_spec.rb index 0bf55abb4..d4f3acf78 100644 --- a/spec/helpers/public_body_helper_spec.rb +++ b/spec/helpers/public_body_helper_spec.rb @@ -74,7 +74,7 @@ describe PublicBodyHelper do :description => "spec category #{i}") heading.add_category(category) end - public_body = FactoryGirl.create(:public_body, :tag_string => 'spec_0 spec_2 unknown') + public_body = FactoryGirl.create(:public_body, :tag_string => 'unknown spec_0 spec_2') expected = '<a href="/body/list/spec_0">Spec category 0</a> and <a href="/body/list/spec_2">spec category 2</a>' expect(type_of_authority(public_body)).to eq(expected) end diff --git a/spec/lib/attachment_to_html/adapters/pdf_spec.rb b/spec/lib/attachment_to_html/adapters/pdf_spec.rb index f1ae4695c..ceb438be8 100644 --- a/spec/lib/attachment_to_html/adapters/pdf_spec.rb +++ b/spec/lib/attachment_to_html/adapters/pdf_spec.rb @@ -71,6 +71,11 @@ describe AttachmentToHTML::Adapters::PDF do adapter.success?.should be_false end + it 'is not successful if convert returns nil' do + adapter.stub(:convert).and_return(nil) + adapter.success?.should be_false + end + it 'is not successful if the body contains more than 50 images' do # Sometimes pdftohtml extracts images incorrectly, resulting # in thousands of PNGs being created for one image. This creates |