diff options
| -rw-r--r-- | app/controllers/admin_public_body_controller.rb | 97 | ||||
| -rw-r--r-- | app/controllers/request_controller.rb | 158 | ||||
| -rw-r--r-- | config/general-example | 2 | ||||
| -rw-r--r-- | db/development_structure.sql | 94 | ||||
| -rw-r--r-- | locale/app.pot | 353 | ||||
| -rw-r--r-- | locale/en/app.po | 350 | ||||
| -rw-r--r-- | locale/es/app.po | 546 | ||||
| -rw-r--r-- | script/generate_pot.sh | 3 | ||||
| -rw-r--r-- | spec/controllers/admin_public_body_controller_spec.rb | 2 | ||||
| -rw-r--r-- | spec/controllers/request_controller_spec.rb | 6 | ||||
| -rw-r--r-- | spec/controllers/track_controller_spec.rb | 4 | ||||
| -rw-r--r-- | vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb | 8 | ||||
| m--------- | vendor/plugins/alavetelitheme | 0 | ||||
| -rw-r--r-- | vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/tasks.rb | 2 |
14 files changed, 1315 insertions, 310 deletions
diff --git a/app/controllers/admin_public_body_controller.rb b/app/controllers/admin_public_body_controller.rb index 1b79642d2..3e0613a1f 100644 --- a/app/controllers/admin_public_body_controller.rb +++ b/app/controllers/admin_public_body_controller.rb @@ -13,19 +13,22 @@ class AdminPublicBodyController < AdminController end def _lookup_query_internal - @query = params[:query] - if @query == "" - @query = nil - end - @page = params[:page] - if @page == "" - @page = nil + @locale = self.locale_from_params() + PublicBody.with_locale(@locale) do + @query = params[:query] + if @query == "" + @query = nil + end + @page = params[:page] + if @page == "" + @page = nil + end + @public_bodies = PublicBody.paginate :order => "name", :page => @page, :per_page => 100, + :conditions => @query.nil? ? nil : ["lower(name) like lower('%'||?||'%') or + lower(short_name) like lower('%'||?||'%') or + lower(request_email) like lower('%'||?||'%')", @query, @query, @query] + @public_bodies_by_tag = PublicBody.find_by_tag(@query) end - @public_bodies = PublicBody.paginate :order => "name", :page => @page, :per_page => 100, - :conditions => @query.nil? ? nil : ["lower(name) like lower('%'||?||'%') or - lower(short_name) like lower('%'||?||'%') or - lower(request_email) like lower('%'||?||'%')", @query, @query, @query] - @public_bodies_by_tag = PublicBody.find_by_tag(@query) end def list @@ -69,51 +72,69 @@ class AdminPublicBodyController < AdminController end def show - @public_body = PublicBody.find(params[:id]) + @locale = self.locale_from_params() + PublicBody.with_locale(@locale) do + @public_body = PublicBody.find(params[:id]) + end end def new - @public_body = PublicBody.new + @locale = self.locale_from_params() + PublicBody.with_locale(@locale) do + @public_body = PublicBody.new + end end def create - params[:public_body][:last_edit_editor] = admin_http_auth_user() - @public_body = PublicBody.new(params[:public_body]) - if @public_body.save - flash[:notice] = 'PublicBody was successfully created.' - redirect_to admin_url('body/show/' + @public_body.id.to_s) - else - render :action => 'new' + @locale = self.locale_from_params() + PublicBody.with_locale(@locale) do + params[:public_body][:last_edit_editor] = admin_http_auth_user() + @public_body = PublicBody.new(params[:public_body]) + if @public_body.save + flash[:notice] = 'PublicBody was successfully created.' + redirect_to admin_url('body/show/' + @public_body.id.to_s) + else + render :action => 'new' + end end end def edit - @public_body = PublicBody.find(params[:id]) - @public_body.last_edit_comment = "" + @locale = self.locale_from_params() + PublicBody.with_locale(@locale) do + @public_body = PublicBody.find(params[:id]) + @public_body.last_edit_comment = "" + end end def update - params[:public_body][:last_edit_editor] = admin_http_auth_user() - @public_body = PublicBody.find(params[:id]) - if @public_body.update_attributes(params[:public_body]) - flash[:notice] = 'PublicBody was successfully updated.' - redirect_to admin_url('body/show/' + @public_body.id.to_s) - else - render :action => 'edit' + @locale = self.locale_from_params() + PublicBody.with_locale(@locale) do + params[:public_body][:last_edit_editor] = admin_http_auth_user() + @public_body = PublicBody.find(params[:id]) + if @public_body.update_attributes(params[:public_body]) + flash[:notice] = 'PublicBody was successfully updated.' + redirect_to admin_url('body/show/' + @public_body.id.to_s) + else + render :action => 'edit' + end end end def destroy - public_body = PublicBody.find(params[:id]) + @locale = self.locale_from_params() + PublicBody.with_locale(@locale) do + public_body = PublicBody.find(params[:id]) + + if public_body.info_requests.size > 0 + flash[:notice] = "There are requests associated with the authority, so can't destroy it" + redirect_to admin_url('body/show/' + public_body.id.to_s) + return + end - if public_body.info_requests.size > 0 - flash[:notice] = "There are requests associated with the authority, so can't destroy it" - redirect_to admin_url('body/show/' + public_body.id.to_s) - return + public_body.tag_string = "" + public_body.destroy end - - public_body.tag_string = "" - public_body.destroy flash[:notice] = "PublicBody was successfully destroyed." redirect_to admin_url('body/list') end diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index 36fbc2b11..02abc12a8 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -11,69 +11,73 @@ class RequestController < ApplicationController protect_from_forgery :only => [ :new, :show_response, :describe_state, :upload_response ] # See ActionController::RequestForgeryProtection for details def show - # Look up by old style numeric identifiers - if params[:url_title].match(/^[0-9]+$/) - @info_request = InfoRequest.find(params[:url_title].to_i) - redirect_to request_url(@info_request) - return - end + @locale = self.locale_from_params() + PublicBody.with_locale(@locale) do - # Look up by new style text names - @info_request = InfoRequest.find_by_url_title(params[:url_title]) - if @info_request.nil? - raise "Request not found" - end - set_last_request(@info_request) + # Look up by old style numeric identifiers + if params[:url_title].match(/^[0-9]+$/) + @info_request = InfoRequest.find(params[:url_title].to_i) + redirect_to request_url(@info_request) + return + end - # Test for whole request being hidden - if !@info_request.user_can_view?(authenticated_user) - render :template => 'request/hidden', :status => 410 # gone - return - end - - # Other parameters - @info_request_events = @info_request.info_request_events - @status = @info_request.calculate_status - @collapse_quotes = params[:unfold] ? false : true - @update_status = params[:update_status] ? true : false - @is_owning_user = @info_request.is_owning_user?(authenticated_user) - @old_unclassified = @info_request.is_old_unclassified? && !authenticated_user.nil? - - if @update_status - return if !@is_owning_user && !authenticated_as_user?(@info_request.user, - :web => "To update the status of this FOI request", - :email => "Then you can update the status of your request to " + @info_request.public_body.name + ".", - :email_subject => "Update the status of your request to " + @info_request.public_body.name - ) - end - - @last_info_request_event_id = @info_request.last_event_id_needing_description - @new_responses_count = @info_request.events_needing_description.select {|i| i.event_type == 'response'}.size - - # Sidebar stuff - # ... requests that have similar imporant terms - behavior_cache :tag => ['similar', @info_request.id] do - begin - limit = 10 - @xapian_similar = ::ActsAsXapian::Similar.new([InfoRequestEvent], @info_request.info_request_events, - :limit => limit, :collapse_by_prefix => 'request_collapse') - @xapian_similar_more = (@xapian_similar.matches_estimated > limit) - rescue - @xapian_similar = nil + # Look up by new style text names + @info_request = InfoRequest.find_by_url_title(params[:url_title]) + if @info_request.nil? + raise "Request not found" end - end - - # Track corresponding to this page - @track_thing = TrackThing.create_track_for_request(@info_request) - @feed_autodetect = [ { :url => do_track_url(@track_thing, 'feed'), :title => @track_thing.params[:title_in_rss], :has_json => true } ] + set_last_request(@info_request) - # For send followup link at bottom - @last_response = @info_request.get_last_response + # Test for whole request being hidden + if !@info_request.user_can_view?(authenticated_user) + render :template => 'request/hidden', :status => 410 # gone + return + end + + # Other parameters + @info_request_events = @info_request.info_request_events + @status = @info_request.calculate_status + @collapse_quotes = params[:unfold] ? false : true + @update_status = params[:update_status] ? true : false + @is_owning_user = @info_request.is_owning_user?(authenticated_user) + @old_unclassified = @info_request.is_old_unclassified? && !authenticated_user.nil? + + if @update_status + return if !@is_owning_user && !authenticated_as_user?(@info_request.user, + :web => "To update the status of this FOI request", + :email => "Then you can update the status of your request to " + @info_request.public_body.name + ".", + :email_subject => "Update the status of your request to " + @info_request.public_body.name + ) + end + + @last_info_request_event_id = @info_request.last_event_id_needing_description + @new_responses_count = @info_request.events_needing_description.select {|i| i.event_type == 'response'}.size + + # Sidebar stuff + # ... requests that have similar imporant terms + behavior_cache :tag => ['similar', @info_request.id] do + begin + limit = 10 + @xapian_similar = ::ActsAsXapian::Similar.new([InfoRequestEvent], @info_request.info_request_events, + :limit => limit, :collapse_by_prefix => 'request_collapse') + @xapian_similar_more = (@xapian_similar.matches_estimated > limit) + rescue + @xapian_similar = nil + end + end + + # Track corresponding to this page + @track_thing = TrackThing.create_track_for_request(@info_request) + @feed_autodetect = [ { :url => do_track_url(@track_thing, 'feed'), :title => @track_thing.params[:title_in_rss], :has_json => true } ] - respond_to do |format| - format.html { @has_json = true } - format.json { render :json => @info_request.json_for_api(true) } - end + # For send followup link at bottom + @last_response = @info_request.get_last_response + + respond_to do |format| + format.html { @has_json = true } + format.json { render :json => @info_request.json_for_api(true) } + end + end end # Extra info about a request, such as event history @@ -666,28 +670,30 @@ class RequestController < ApplicationController # FOI officers can upload a response def upload_response - @info_request = InfoRequest.find_by_url_title(params[:url_title]) - - @reason_params = { - :web => "To upload a response, you must be logged in using an email address from " + CGI.escapeHTML(@info_request.public_body.name), - :email => "Then you can upload an FOI response. ", - :email_subject => "Confirm your account on WhatDoTheyKnow.com" - } - if !authenticated?(@reason_params) - return - end + @locale = self.locale_from_params() + PublicBody.with_locale(@locale) do + @info_request = InfoRequest.find_by_url_title(params[:url_title]) + + @reason_params = { + :web => "To upload a response, you must be logged in using an email address from " + CGI.escapeHTML(@info_request.public_body.name), + :email => "Then you can upload an FOI response. ", + :email_subject => "Confirm your account on WhatDoTheyKnow.com" + } + if !authenticated?(@reason_params) + return + end - if !@info_request.public_body.is_foi_officer?(@user) - domain_required = @info_request.public_body.foi_officer_domain_required - if domain_required.nil? - render :template => 'user/wrong_user_unknown_email' + if !@info_request.public_body.is_foi_officer?(@user) + domain_required = @info_request.public_body.foi_officer_domain_required + if domain_required.nil? + render :template => 'user/wrong_user_unknown_email' + return + end + @reason_params[:user_name] = "an email @" + domain_required + render :template => 'user/wrong_user' return end - @reason_params[:user_name] = "an email @" + domain_required - render :template => 'user/wrong_user' - return end - if params[:submitted_upload_response] file_name = nil file_content = nil diff --git a/config/general-example b/config/general-example index 4a1f88ccc..29f29ca8d 100644 --- a/config/general-example +++ b/config/general-example @@ -54,4 +54,6 @@ define('OPTION_READ_ONLY', ''); define('OPTION_RECAPTCHA_PUBLIC_KEY', 'x'); define('OPTION_RECAPTCHA_PRIVATE_KEY', 'x'); +// Locales we wish to support in this app +define('OPTION_AVAILABLE_LOCALES', 'en es') ?> diff --git a/db/development_structure.sql b/db/development_structure.sql index 1dd93901b..d9ce53380 100644 --- a/db/development_structure.sql +++ b/db/development_structure.sql @@ -95,7 +95,8 @@ CREATE TABLE comments ( body text NOT NULL, visible boolean DEFAULT true NOT NULL, created_at timestamp without time zone NOT NULL, - updated_at timestamp without time zone NOT NULL + updated_at timestamp without time zone NOT NULL, + locale text DEFAULT ''::text NOT NULL ); @@ -508,6 +509,45 @@ ALTER SEQUENCE public_body_tags_id_seq OWNED BY has_tag_string_tags.id; -- +-- Name: public_body_translations; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- + +CREATE TABLE public_body_translations ( + id integer NOT NULL, + public_body_id integer, + locale character varying(255), + short_name text, + request_email text, + notes text, + publication_scheme text, + url_name text, + first_letter character varying(255), + name text, + created_at timestamp without time zone, + updated_at timestamp without time zone +); + + +-- +-- Name: public_body_translations_id_seq; Type: SEQUENCE; Schema: public; Owner: - +-- + +CREATE SEQUENCE public_body_translations_id_seq + START WITH 1 + INCREMENT BY 1 + NO MAXVALUE + NO MINVALUE + CACHE 1; + + +-- +-- Name: public_body_translations_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: - +-- + +ALTER SEQUENCE public_body_translations_id_seq OWNED BY public_body_translations.id; + + +-- -- Name: public_body_versions; Type: TABLE; Schema: public; Owner: -; Tablespace: -- @@ -832,6 +872,13 @@ ALTER TABLE public_bodies ALTER COLUMN id SET DEFAULT nextval('public_bodies_id_ -- Name: id; Type: DEFAULT; Schema: public; Owner: - -- +ALTER TABLE public_body_translations ALTER COLUMN id SET DEFAULT nextval('public_body_translations_id_seq'::regclass); + + +-- +-- Name: id; Type: DEFAULT; Schema: public; Owner: - +-- + ALTER TABLE public_body_versions ALTER COLUMN id SET DEFAULT nextval('public_body_versions_id_seq'::regclass); @@ -983,6 +1030,14 @@ ALTER TABLE ONLY has_tag_string_tags -- +-- Name: public_body_translations_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- + +ALTER TABLE ONLY public_body_translations + ADD CONSTRAINT public_body_translations_pkey PRIMARY KEY (id); + + +-- -- Name: public_body_versions_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: -- @@ -1192,6 +1247,13 @@ CREATE UNIQUE INDEX index_public_body_tags_on_public_body_id_and_name_and_value -- +-- Name: index_public_body_translations_on_public_body_id; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- + +CREATE INDEX index_public_body_translations_on_public_body_id ON public_body_translations USING btree (public_body_id); + + +-- -- Name: index_track_things_on_tracking_user_id_and_track_query; Type: INDEX; Schema: public; Owner: -; Tablespace: -- @@ -1248,30 +1310,6 @@ CREATE INDEX users_lower_email_index ON users USING btree (lower((email)::text)) -- --- Name: fk_censor_rules_info_request; Type: FK CONSTRAINT; Schema: public; Owner: - --- - -ALTER TABLE ONLY censor_rules - ADD CONSTRAINT fk_censor_rules_info_request FOREIGN KEY (info_request_id) REFERENCES info_requests(id); - - --- --- Name: fk_censor_rules_public_body; Type: FK CONSTRAINT; Schema: public; Owner: - --- - -ALTER TABLE ONLY censor_rules - ADD CONSTRAINT fk_censor_rules_public_body FOREIGN KEY (public_body_id) REFERENCES public_bodies(id); - - --- --- Name: fk_censor_rules_user; Type: FK CONSTRAINT; Schema: public; Owner: - --- - -ALTER TABLE ONLY censor_rules - ADD CONSTRAINT fk_censor_rules_user FOREIGN KEY (user_id) REFERENCES users(id); - - --- -- Name: fk_comments_info_request; Type: FK CONSTRAINT; Schema: public; Owner: - -- @@ -1673,4 +1711,8 @@ INSERT INTO schema_migrations (version) VALUES ('93'); INSERT INTO schema_migrations (version) VALUES ('94'); -INSERT INTO schema_migrations (version) VALUES ('95');
\ No newline at end of file +INSERT INTO schema_migrations (version) VALUES ('95'); + +INSERT INTO schema_migrations (version) VALUES ('96'); + +INSERT INTO schema_migrations (version) VALUES ('97');
\ No newline at end of file diff --git a/locale/app.pot b/locale/app.pot index 59c3f4300..d27fbe815 100644 --- a/locale/app.pot +++ b/locale/app.pot @@ -7,13 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: version 0.0.1\n" -"POT-Creation-Date: 2011-03-11 13:38-0000\n" -"PO-Revision-Date: 2011-01-13 16:23-0000\n" +"POT-Creation-Date: 2011-03-31 08:59+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" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" #: app/views/public_body/show.rhtml:81 @@ -105,10 +106,42 @@ msgid "" "it</a>." msgstr "" +#: locale/model_attributes.rb:46 +msgid "CensorRule|Last edit comment" +msgstr "" + +#: locale/model_attributes.rb:45 +msgid "CensorRule|Last edit editor" +msgstr "" + +#: locale/model_attributes.rb:44 +msgid "CensorRule|Replacement" +msgstr "" + +#: locale/model_attributes.rb:43 +msgid "CensorRule|Text" +msgstr "" + #: app/views/public_body/show.rhtml:17 app/views/public_body/show.rhtml:19 msgid "Charity registration" msgstr "" +#: locale/model_attributes.rb:22 +msgid "Comment|Body" +msgstr "" + +#: locale/model_attributes.rb:21 +msgid "Comment|Comment type" +msgstr "" + +#: locale/model_attributes.rb:24 +msgid "Comment|Locale" +msgstr "" + +#: locale/model_attributes.rb:23 +msgid "Comment|Visible" +msgstr "" + #: app/views/layouts/default.rhtml:147 msgid "Contact {{site_name}}" msgstr "" @@ -137,6 +170,22 @@ msgid "" "lane</strong>" msgstr "" +#: locale/model_attributes.rb:61 +msgid "EximLogDone|Filename" +msgstr "" + +#: locale/model_attributes.rb:62 +msgid "EximLogDone|Last stat" +msgstr "" + +#: locale/model_attributes.rb:19 +msgid "EximLog|Line" +msgstr "" + +#: locale/model_attributes.rb:18 +msgid "EximLog|Order" +msgstr "" + #: app/views/general/search.rhtml:90 msgid "" "FOI requests {{start_count}} to {{end_count}} of {{total_count}} for " @@ -194,10 +243,86 @@ msgstr "" msgid "Help" msgstr "" +#: locale/model_attributes.rb:58 +msgid "Holiday|Day" +msgstr "" + +#: locale/model_attributes.rb:59 +msgid "Holiday|Description" +msgstr "" + #: app/views/public_body/show.rhtml:8 msgid "Home page of authority" msgstr "" +#: locale/model_attributes.rb:64 +msgid "IncomingMessage|Cached attachment text clipped" +msgstr "" + +#: locale/model_attributes.rb:65 +msgid "IncomingMessage|Cached main body text folded" +msgstr "" + +#: locale/model_attributes.rb:66 +msgid "IncomingMessage|Cached main body text unfolded" +msgstr "" + +#: locale/model_attributes.rb:39 +msgid "InfoRequestEvent|Calculated state" +msgstr "" + +#: locale/model_attributes.rb:38 +msgid "InfoRequestEvent|Described state" +msgstr "" + +#: locale/model_attributes.rb:36 +msgid "InfoRequestEvent|Event type" +msgstr "" + +#: locale/model_attributes.rb:40 +msgid "InfoRequestEvent|Last described at" +msgstr "" + +#: locale/model_attributes.rb:37 +msgid "InfoRequestEvent|Params yaml" +msgstr "" + +#: locale/model_attributes.rb:41 +msgid "InfoRequestEvent|Prominence" +msgstr "" + +#: locale/model_attributes.rb:87 +msgid "InfoRequest|Allow new responses from" +msgstr "" + +#: locale/model_attributes.rb:83 +msgid "InfoRequest|Awaiting description" +msgstr "" + +#: locale/model_attributes.rb:82 +msgid "InfoRequest|Described state" +msgstr "" + +#: locale/model_attributes.rb:88 +msgid "InfoRequest|Handle rejected responses" +msgstr "" + +#: locale/model_attributes.rb:86 +msgid "InfoRequest|Law used" +msgstr "" + +#: locale/model_attributes.rb:84 +msgid "InfoRequest|Prominence" +msgstr "" + +#: locale/model_attributes.rb:81 +msgid "InfoRequest|Title" +msgstr "" + +#: locale/model_attributes.rb:85 +msgid "InfoRequest|Url title" +msgstr "" + #: app/views/layouts/default.rhtml:17 msgid "Make and browse Freedom of Information (FOI) requests" msgstr "" @@ -270,6 +395,26 @@ msgstr "" msgid "Only requests made using {{site_name}} are shown." msgstr "" +#: locale/model_attributes.rb:26 +msgid "OutgoingMessage|Body" +msgstr "" + +#: locale/model_attributes.rb:29 +msgid "OutgoingMessage|Last sent at" +msgstr "" + +#: locale/model_attributes.rb:28 +msgid "OutgoingMessage|Message type" +msgstr "" + +#: locale/model_attributes.rb:27 +msgid "OutgoingMessage|Status" +msgstr "" + +#: locale/model_attributes.rb:30 +msgid "OutgoingMessage|What doing" +msgstr "" + #: app/views/general/search.rhtml:80 msgid "" "People {{start_count}} to {{end_count}} of {{total_count}} for " @@ -392,16 +537,100 @@ msgid "" "This makes it easier for others to read." msgstr "" +#: locale/model_attributes.rb:56 +msgid "PostRedirect|Circumstance" +msgstr "" + +#: locale/model_attributes.rb:54 +msgid "PostRedirect|Email token" +msgstr "" + +#: locale/model_attributes.rb:53 +msgid "PostRedirect|Post params yaml" +msgstr "" + +#: locale/model_attributes.rb:55 +msgid "PostRedirect|Reason params yaml" +msgstr "" + +#: locale/model_attributes.rb:51 +msgid "PostRedirect|Token" +msgstr "" + +#: locale/model_attributes.rb:52 +msgid "PostRedirect|Uri" +msgstr "" + +#: locale/model_attributes.rb:15 +msgid "ProfilePhoto|Data" +msgstr "" + +#: locale/model_attributes.rb:16 +msgid "ProfilePhoto|Draft" +msgstr "" + #: app/views/general/search.rhtml:70 msgid "" "Public authorities {{start_count}} to {{end_count}} of {{total_count}} for " "{{user_search_query}}" msgstr "" +#: locale/model_attributes.rb:12 +msgid "PublicBody|First letter" +msgstr "" + +#: locale/model_attributes.rb:10 +msgid "PublicBody|Home page" +msgstr "" + +#: locale/model_attributes.rb:8 +msgid "PublicBody|Last edit comment" +msgstr "" + +#: locale/model_attributes.rb:7 +msgid "PublicBody|Last edit editor" +msgstr "" + +#: locale/model_attributes.rb:3 +msgid "PublicBody|Name" +msgstr "" + +#: locale/model_attributes.rb:11 +msgid "PublicBody|Notes" +msgstr "" + +#: locale/model_attributes.rb:13 +msgid "PublicBody|Publication scheme" +msgstr "" + +#: locale/model_attributes.rb:5 +msgid "PublicBody|Request email" +msgstr "" + +#: locale/model_attributes.rb:4 +msgid "PublicBody|Short name" +msgstr "" + +#: locale/model_attributes.rb:9 +msgid "PublicBody|Url name" +msgstr "" + +#: locale/model_attributes.rb:6 +msgid "PublicBody|Version" +msgstr "" + #: app/views/public_body/show.rhtml:11 msgid "Publication scheme" msgstr "" +#: locale/model_attributes.rb:49 +msgid "RawEmail|Data binary" +msgstr "" + +#: locale/model_attributes.rb:48 +msgid "RawEmail|Data text" +msgstr "" + #: app/views/general/search.rhtml:125 msgid "" "Read about <a href=\"%s\">advanced search operators</a>, such as proximity " @@ -463,6 +692,18 @@ msgstr "" msgid "Track this authority" msgstr "" +#: locale/model_attributes.rb:33 +msgid "TrackThing|Track medium" +msgstr "" + +#: locale/model_attributes.rb:32 +msgid "TrackThing|Track query" +msgstr "" + +#: locale/model_attributes.rb:34 +msgid "TrackThing|Track type" +msgstr "" + #: app/views/general/search.rhtml:121 msgid "" "Type <strong><code>01/01/2008..14/01/2008</code></strong> to only show " @@ -485,6 +726,50 @@ msgid "" "\"Liverpool City Council\"</code></strong>" msgstr "" +#: locale/model_attributes.rb:68 +msgid "UserInfoRequestSentAlert|Alert type" +msgstr "" + +#: locale/model_attributes.rb:79 +msgid "User|About me" +msgstr "" + +#: locale/model_attributes.rb:77 +msgid "User|Admin level" +msgstr "" + +#: locale/model_attributes.rb:78 +msgid "User|Ban text" +msgstr "" + +#: locale/model_attributes.rb:70 +msgid "User|Email" +msgstr "" + +#: locale/model_attributes.rb:74 +msgid "User|Email confirmed" +msgstr "" + +#: locale/model_attributes.rb:72 +msgid "User|Hashed password" +msgstr "" + +#: locale/model_attributes.rb:76 +msgid "User|Last daily track email" +msgstr "" + +#: locale/model_attributes.rb:71 +msgid "User|Name" +msgstr "" + +#: locale/model_attributes.rb:73 +msgid "User|Salt" +msgstr "" + +#: locale/model_attributes.rb:75 +msgid "User|Url name" +msgstr "" + #: app/views/public_body/show.rhtml:23 msgid "View FOI email address" msgstr "" @@ -510,10 +795,74 @@ msgstr "" msgid "also called {{public_body_short_name}}" msgstr "" +#: locale/model_attributes.rb:42 +msgid "censor rule" +msgstr "" + +#: locale/model_attributes.rb:20 +msgid "comment" +msgstr "" + #: app/views/general/frontpage.rhtml:18 msgid "e.g." msgstr "" +#: locale/model_attributes.rb:17 +msgid "exim log" +msgstr "" + +#: locale/model_attributes.rb:60 +msgid "exim log done" +msgstr "" + +#: locale/model_attributes.rb:57 +msgid "holiday" +msgstr "" + +#: locale/model_attributes.rb:63 +msgid "incoming message" +msgstr "" + +#: locale/model_attributes.rb:80 +msgid "info request" +msgstr "" + +#: locale/model_attributes.rb:35 +msgid "info request event" +msgstr "" + +#: locale/model_attributes.rb:25 +msgid "outgoing message" +msgstr "" + +#: locale/model_attributes.rb:50 +msgid "post redirect" +msgstr "" + +#: locale/model_attributes.rb:14 +msgid "profile photo" +msgstr "" + +#: locale/model_attributes.rb:2 +msgid "public body" +msgstr "" + +#: locale/model_attributes.rb:47 +msgid "raw email" +msgstr "" + +#: locale/model_attributes.rb:31 +msgid "track thing" +msgstr "" + +#: locale/model_attributes.rb:69 +msgid "user" +msgstr "" + +#: locale/model_attributes.rb:67 +msgid "user info request sent alert" +msgstr "" + #: app/views/general/frontpage.rhtml:51 msgid "{{length_of_time}} ago" msgstr "" diff --git a/locale/en/app.po b/locale/en/app.po index d15341b1d..d27fbe815 100644 --- a/locale/en/app.po +++ b/locale/en/app.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: version 0.0.1\n" -"POT-Creation-Date: 2011-03-11 13:38-0000\n" +"POT-Creation-Date: 2011-03-31 08:59+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" @@ -106,10 +106,42 @@ msgid "" "it</a>." msgstr "" +#: locale/model_attributes.rb:46 +msgid "CensorRule|Last edit comment" +msgstr "" + +#: locale/model_attributes.rb:45 +msgid "CensorRule|Last edit editor" +msgstr "" + +#: locale/model_attributes.rb:44 +msgid "CensorRule|Replacement" +msgstr "" + +#: locale/model_attributes.rb:43 +msgid "CensorRule|Text" +msgstr "" + #: app/views/public_body/show.rhtml:17 app/views/public_body/show.rhtml:19 msgid "Charity registration" msgstr "" +#: locale/model_attributes.rb:22 +msgid "Comment|Body" +msgstr "" + +#: locale/model_attributes.rb:21 +msgid "Comment|Comment type" +msgstr "" + +#: locale/model_attributes.rb:24 +msgid "Comment|Locale" +msgstr "" + +#: locale/model_attributes.rb:23 +msgid "Comment|Visible" +msgstr "" + #: app/views/layouts/default.rhtml:147 msgid "Contact {{site_name}}" msgstr "" @@ -138,6 +170,22 @@ msgid "" "lane</strong>" msgstr "" +#: locale/model_attributes.rb:61 +msgid "EximLogDone|Filename" +msgstr "" + +#: locale/model_attributes.rb:62 +msgid "EximLogDone|Last stat" +msgstr "" + +#: locale/model_attributes.rb:19 +msgid "EximLog|Line" +msgstr "" + +#: locale/model_attributes.rb:18 +msgid "EximLog|Order" +msgstr "" + #: app/views/general/search.rhtml:90 msgid "" "FOI requests {{start_count}} to {{end_count}} of {{total_count}} for " @@ -195,10 +243,86 @@ msgstr "" msgid "Help" msgstr "" +#: locale/model_attributes.rb:58 +msgid "Holiday|Day" +msgstr "" + +#: locale/model_attributes.rb:59 +msgid "Holiday|Description" +msgstr "" + #: app/views/public_body/show.rhtml:8 msgid "Home page of authority" msgstr "" +#: locale/model_attributes.rb:64 +msgid "IncomingMessage|Cached attachment text clipped" +msgstr "" + +#: locale/model_attributes.rb:65 +msgid "IncomingMessage|Cached main body text folded" +msgstr "" + +#: locale/model_attributes.rb:66 +msgid "IncomingMessage|Cached main body text unfolded" +msgstr "" + +#: locale/model_attributes.rb:39 +msgid "InfoRequestEvent|Calculated state" +msgstr "" + +#: locale/model_attributes.rb:38 +msgid "InfoRequestEvent|Described state" +msgstr "" + +#: locale/model_attributes.rb:36 +msgid "InfoRequestEvent|Event type" +msgstr "" + +#: locale/model_attributes.rb:40 +msgid "InfoRequestEvent|Last described at" +msgstr "" + +#: locale/model_attributes.rb:37 +msgid "InfoRequestEvent|Params yaml" +msgstr "" + +#: locale/model_attributes.rb:41 +msgid "InfoRequestEvent|Prominence" +msgstr "" + +#: locale/model_attributes.rb:87 +msgid "InfoRequest|Allow new responses from" +msgstr "" + +#: locale/model_attributes.rb:83 +msgid "InfoRequest|Awaiting description" +msgstr "" + +#: locale/model_attributes.rb:82 +msgid "InfoRequest|Described state" +msgstr "" + +#: locale/model_attributes.rb:88 +msgid "InfoRequest|Handle rejected responses" +msgstr "" + +#: locale/model_attributes.rb:86 +msgid "InfoRequest|Law used" +msgstr "" + +#: locale/model_attributes.rb:84 +msgid "InfoRequest|Prominence" +msgstr "" + +#: locale/model_attributes.rb:81 +msgid "InfoRequest|Title" +msgstr "" + +#: locale/model_attributes.rb:85 +msgid "InfoRequest|Url title" +msgstr "" + #: app/views/layouts/default.rhtml:17 msgid "Make and browse Freedom of Information (FOI) requests" msgstr "" @@ -271,6 +395,26 @@ msgstr "" msgid "Only requests made using {{site_name}} are shown." msgstr "" +#: locale/model_attributes.rb:26 +msgid "OutgoingMessage|Body" +msgstr "" + +#: locale/model_attributes.rb:29 +msgid "OutgoingMessage|Last sent at" +msgstr "" + +#: locale/model_attributes.rb:28 +msgid "OutgoingMessage|Message type" +msgstr "" + +#: locale/model_attributes.rb:27 +msgid "OutgoingMessage|Status" +msgstr "" + +#: locale/model_attributes.rb:30 +msgid "OutgoingMessage|What doing" +msgstr "" + #: app/views/general/search.rhtml:80 msgid "" "People {{start_count}} to {{end_count}} of {{total_count}} for " @@ -393,16 +537,100 @@ msgid "" "This makes it easier for others to read." msgstr "" +#: locale/model_attributes.rb:56 +msgid "PostRedirect|Circumstance" +msgstr "" + +#: locale/model_attributes.rb:54 +msgid "PostRedirect|Email token" +msgstr "" + +#: locale/model_attributes.rb:53 +msgid "PostRedirect|Post params yaml" +msgstr "" + +#: locale/model_attributes.rb:55 +msgid "PostRedirect|Reason params yaml" +msgstr "" + +#: locale/model_attributes.rb:51 +msgid "PostRedirect|Token" +msgstr "" + +#: locale/model_attributes.rb:52 +msgid "PostRedirect|Uri" +msgstr "" + +#: locale/model_attributes.rb:15 +msgid "ProfilePhoto|Data" +msgstr "" + +#: locale/model_attributes.rb:16 +msgid "ProfilePhoto|Draft" +msgstr "" + #: app/views/general/search.rhtml:70 msgid "" "Public authorities {{start_count}} to {{end_count}} of {{total_count}} for " "{{user_search_query}}" msgstr "" +#: locale/model_attributes.rb:12 +msgid "PublicBody|First letter" +msgstr "" + +#: locale/model_attributes.rb:10 +msgid "PublicBody|Home page" +msgstr "" + +#: locale/model_attributes.rb:8 +msgid "PublicBody|Last edit comment" +msgstr "" + +#: locale/model_attributes.rb:7 +msgid "PublicBody|Last edit editor" +msgstr "" + +#: locale/model_attributes.rb:3 +msgid "PublicBody|Name" +msgstr "" + +#: locale/model_attributes.rb:11 +msgid "PublicBody|Notes" +msgstr "" + +#: locale/model_attributes.rb:13 +msgid "PublicBody|Publication scheme" +msgstr "" + +#: locale/model_attributes.rb:5 +msgid "PublicBody|Request email" +msgstr "" + +#: locale/model_attributes.rb:4 +msgid "PublicBody|Short name" +msgstr "" + +#: locale/model_attributes.rb:9 +msgid "PublicBody|Url name" +msgstr "" + +#: locale/model_attributes.rb:6 +msgid "PublicBody|Version" +msgstr "" + #: app/views/public_body/show.rhtml:11 msgid "Publication scheme" msgstr "" +#: locale/model_attributes.rb:49 +msgid "RawEmail|Data binary" +msgstr "" + +#: locale/model_attributes.rb:48 +msgid "RawEmail|Data text" +msgstr "" + #: app/views/general/search.rhtml:125 msgid "" "Read about <a href=\"%s\">advanced search operators</a>, such as proximity " @@ -464,6 +692,18 @@ msgstr "" msgid "Track this authority" msgstr "" +#: locale/model_attributes.rb:33 +msgid "TrackThing|Track medium" +msgstr "" + +#: locale/model_attributes.rb:32 +msgid "TrackThing|Track query" +msgstr "" + +#: locale/model_attributes.rb:34 +msgid "TrackThing|Track type" +msgstr "" + #: app/views/general/search.rhtml:121 msgid "" "Type <strong><code>01/01/2008..14/01/2008</code></strong> to only show " @@ -486,6 +726,50 @@ msgid "" "\"Liverpool City Council\"</code></strong>" msgstr "" +#: locale/model_attributes.rb:68 +msgid "UserInfoRequestSentAlert|Alert type" +msgstr "" + +#: locale/model_attributes.rb:79 +msgid "User|About me" +msgstr "" + +#: locale/model_attributes.rb:77 +msgid "User|Admin level" +msgstr "" + +#: locale/model_attributes.rb:78 +msgid "User|Ban text" +msgstr "" + +#: locale/model_attributes.rb:70 +msgid "User|Email" +msgstr "" + +#: locale/model_attributes.rb:74 +msgid "User|Email confirmed" +msgstr "" + +#: locale/model_attributes.rb:72 +msgid "User|Hashed password" +msgstr "" + +#: locale/model_attributes.rb:76 +msgid "User|Last daily track email" +msgstr "" + +#: locale/model_attributes.rb:71 +msgid "User|Name" +msgstr "" + +#: locale/model_attributes.rb:73 +msgid "User|Salt" +msgstr "" + +#: locale/model_attributes.rb:75 +msgid "User|Url name" +msgstr "" + #: app/views/public_body/show.rhtml:23 msgid "View FOI email address" msgstr "" @@ -511,10 +795,74 @@ msgstr "" msgid "also called {{public_body_short_name}}" msgstr "" +#: locale/model_attributes.rb:42 +msgid "censor rule" +msgstr "" + +#: locale/model_attributes.rb:20 +msgid "comment" +msgstr "" + #: app/views/general/frontpage.rhtml:18 msgid "e.g." msgstr "" +#: locale/model_attributes.rb:17 +msgid "exim log" +msgstr "" + +#: locale/model_attributes.rb:60 +msgid "exim log done" +msgstr "" + +#: locale/model_attributes.rb:57 +msgid "holiday" +msgstr "" + +#: locale/model_attributes.rb:63 +msgid "incoming message" +msgstr "" + +#: locale/model_attributes.rb:80 +msgid "info request" +msgstr "" + +#: locale/model_attributes.rb:35 +msgid "info request event" +msgstr "" + +#: locale/model_attributes.rb:25 +msgid "outgoing message" +msgstr "" + +#: locale/model_attributes.rb:50 +msgid "post redirect" +msgstr "" + +#: locale/model_attributes.rb:14 +msgid "profile photo" +msgstr "" + +#: locale/model_attributes.rb:2 +msgid "public body" +msgstr "" + +#: locale/model_attributes.rb:47 +msgid "raw email" +msgstr "" + +#: locale/model_attributes.rb:31 +msgid "track thing" +msgstr "" + +#: locale/model_attributes.rb:69 +msgid "user" +msgstr "" + +#: locale/model_attributes.rb:67 +msgid "user info request sent alert" +msgstr "" + #: app/views/general/frontpage.rhtml:51 msgid "{{length_of_time}} ago" msgstr "" diff --git a/locale/es/app.po b/locale/es/app.po index 6166543a0..1615b5f7e 100644 --- a/locale/es/app.po +++ b/locale/es/app.po @@ -7,46 +7,45 @@ msgid "" msgstr "" "Project-Id-Version: version 0.0.1\n" -"POT-Creation-Date: 2011-03-11 13:38-0000\n" -"PO-Revision-Date: 2011-03-10 12:27+0000\n" +"POT-Creation-Date: 2011-03-31 08:59+0100\n" +"PO-Revision-Date: 2011-03-31 09:27+0100\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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" -"Plural-Forms: nplurals=3; plural=n==0 ? 0 : n==1 ? 1 : 2;\n" +"Language: \n" +"Plural-Forms: nplurals=2; plural=n>1;" #: app/views/public_body/show.rhtml:81 -#, fuzzy msgid "%d Freedom of Information request" msgid_plural "%d Freedom of Information requests" -msgstr[0] "Makando ou exploratre los Libera de Information requesti" -msgstr[1] "Makando ou exploratre los Libera de Information requesti" -msgstr[2] "Makando ou exploratre los Libera de Information requesti" +msgstr[0] "%d Libera de Information requesto" +msgstr[1] "Libera de Information requesti numbera %d" #: app/views/general/frontpage.rhtml:36 msgid "%d request" msgid_plural "%d requests" -msgstr[0] "nonna requesti" -msgstr[1] "%d una requestos" -msgstr[2] "%d multissimo requestos" +msgstr[0] "%d nonna requesti" +msgstr[1] "%d multissimo requestos" #: app/views/general/search.rhtml:53 msgid "<a href=\"%s\">Browse all</a> or <a href=\"%s\">ask us to add one</a>." -msgstr "" +msgstr "<a href=\"%s\">Browso tutto</a> ou <a href=\"%s\">demandus adder une</a>." #: app/views/public_body/show.rhtml:50 -#, fuzzy msgid "" "<a href=\"%s\">Make a new Freedom of Information request</a> to " "{{public_body_name}}" -msgstr "Makando ou exploratre los Libera de Information requesti" +msgstr "<a href=\"%s\">Makando une Libera de Information requesti</a> a {{public_body_name}}" #: app/views/general/search.rhtml:118 msgid "" "<strong><code>commented_by:tony_bowden</code></strong> to search annotations " "made by Tony Bowden, typing the name as in the URL." msgstr "" +"<strong><code>commented_by:tony_bowden</code></strong> a busquar annotationi \n" +"makando para Tony Bowden, typar la nom con en el URL." #: app/views/general/search.rhtml:120 msgid "" @@ -108,14 +107,48 @@ msgid "" "Can't find it? <a href=\"%s\">Browse all</a> or <a href=\"%s\">ask us to add " "it</a>." msgstr "" +"No busquara? <a href=\"%s\">Browse tutti</a> ou <a href=\"%s\">demanda a nous a addare \"\n" +"\"la</a> " + +#: locale/model_attributes.rb:46 +msgid "CensorRule|Last edit comment" +msgstr "" + +#: locale/model_attributes.rb:45 +msgid "CensorRule|Last edit editor" +msgstr "" + +#: locale/model_attributes.rb:44 +msgid "CensorRule|Replacement" +msgstr "" + +#: locale/model_attributes.rb:43 +msgid "CensorRule|Text" +msgstr "" #: app/views/public_body/show.rhtml:17 app/views/public_body/show.rhtml:19 msgid "Charity registration" msgstr "" +#: locale/model_attributes.rb:22 +msgid "Comment|Body" +msgstr "" + +#: locale/model_attributes.rb:21 +msgid "Comment|Comment type" +msgstr "" + +#: locale/model_attributes.rb:24 +msgid "Comment|Locale" +msgstr "" + +#: locale/model_attributes.rb:23 +msgid "Comment|Visible" +msgstr "" + #: app/views/layouts/default.rhtml:147 msgid "Contact {{site_name}}" -msgstr "Engager con la {{site_name}}" +msgstr "" #: app/models/profile_photo.rb:96 msgid "" @@ -141,6 +174,22 @@ msgid "" "lane</strong>" msgstr "" +#: locale/model_attributes.rb:61 +msgid "EximLogDone|Filename" +msgstr "" + +#: locale/model_attributes.rb:62 +msgid "EximLogDone|Last stat" +msgstr "" + +#: locale/model_attributes.rb:19 +msgid "EximLog|Line" +msgstr "" + +#: locale/model_attributes.rb:18 +msgid "EximLog|Order" +msgstr "" + #: app/views/general/search.rhtml:90 msgid "" "FOI requests {{start_count}} to {{end_count}} of {{total_count}} for " @@ -164,11 +213,8 @@ msgid "" "strong>\n" " (<a href=\"%s\">why?</a>)." msgstr "" -"Premiero, si poco <strong>nomo de Seblando publicus authoritita</strong> " -"tu \n" -" <br>amo informatia. <strong>Con legalando, se obligandus " -"respondre</strong>\n" -" (<a href=\"%s\">pour acqui?</a>)." +"Premiero, si poco <strong>nomo de Seblando publicus authoritita</strong> \n" +"tu <br>amo informatia. <strong>Con legalando, se obligandus respondre</strong> (<a href=\"%s\">pour acqui?</a>)." #: app/views/public_body/show.rhtml:61 msgid "" @@ -184,113 +230,202 @@ msgid "" msgstr "" #: app/views/public_body/show.rhtml:99 -#, fuzzy msgid "Freedom of Information requests made" -msgstr "Makando ou exploratre los Libera de Information requesti" +msgstr "Makando Libera de Information requesti" #: app/views/public_body/show.rhtml:73 -#, fuzzy msgid "Freedom of Information requests made using this site" -msgstr "Makando ou exploratre los Libera de Information requesti" +msgstr "Makando Libera de Information requesti con la site isto" #: app/views/layouts/default.rhtml:123 msgid "Hello!" -msgstr "Salutat!" +msgstr "Nomjour!" #: app/views/layouts/default.rhtml:120 msgid "Hello, {{username}}!" -msgstr "{{username}} salutato!" +msgstr "¡{{username}} hola!" #: app/views/layouts/default.rhtml:115 msgid "Help" -msgstr "Ayuder moi" +msgstr "Aider" + +#: locale/model_attributes.rb:58 +msgid "Holiday|Day" +msgstr "" + +#: locale/model_attributes.rb:59 +msgid "Holiday|Description" +msgstr "" #: app/views/public_body/show.rhtml:8 -#, fuzzy msgid "Home page of authority" -msgstr "Mas autorita" +msgstr "La pago home del authoritias" + +#: locale/model_attributes.rb:64 +msgid "IncomingMessage|Cached attachment text clipped" +msgstr "" + +#: locale/model_attributes.rb:65 +msgid "IncomingMessage|Cached main body text folded" +msgstr "" + +#: locale/model_attributes.rb:66 +msgid "IncomingMessage|Cached main body text unfolded" +msgstr "" + +#: locale/model_attributes.rb:39 +msgid "InfoRequestEvent|Calculated state" +msgstr "" + +#: locale/model_attributes.rb:38 +msgid "InfoRequestEvent|Described state" +msgstr "" + +#: locale/model_attributes.rb:36 +msgid "InfoRequestEvent|Event type" +msgstr "" + +#: locale/model_attributes.rb:40 +msgid "InfoRequestEvent|Last described at" +msgstr "" + +#: locale/model_attributes.rb:37 +msgid "InfoRequestEvent|Params yaml" +msgstr "" + +#: locale/model_attributes.rb:41 +msgid "InfoRequestEvent|Prominence" +msgstr "" + +#: locale/model_attributes.rb:87 +msgid "InfoRequest|Allow new responses from" +msgstr "" + +#: locale/model_attributes.rb:83 +msgid "InfoRequest|Awaiting description" +msgstr "" + +#: locale/model_attributes.rb:82 +msgid "InfoRequest|Described state" +msgstr "" + +#: locale/model_attributes.rb:88 +msgid "InfoRequest|Handle rejected responses" +msgstr "" + +#: locale/model_attributes.rb:86 +msgid "InfoRequest|Law used" +msgstr "" + +#: locale/model_attributes.rb:84 +msgid "InfoRequest|Prominence" +msgstr "" + +#: locale/model_attributes.rb:81 +msgid "InfoRequest|Title" +msgstr "" + +#: locale/model_attributes.rb:85 +msgid "InfoRequest|Url title" +msgstr "" #: app/views/layouts/default.rhtml:17 msgid "Make and browse Freedom of Information (FOI) requests" -msgstr "Makando ou exploratre los Libera de Information requesti" +msgstr "Makando et browser los Libera de Information requesti" #: app/views/layouts/default.rhtml:89 msgid "Make and explore Freedom of Information requests" -msgstr "Makando ou exploratre los Libera de Information requesti" +msgstr "Makando et explorator los Libera de Information requesti" #: app/views/general/frontpage.rhtml:4 msgid "Make or explore Freedom of Information requests" -msgstr "Makando ou exploratre los Libera de Information requesti" +msgstr "\"Makando ou explorator los Libera de Information requesti" #: app/views/layouts/default.rhtml:108 msgid "Make request" msgstr "Creer requesto" #: app/views/public_body/show.rhtml:6 -#, fuzzy msgid "More about this authority" -msgstr "Mas autorita" +msgstr "Mas ou subjet du autoritas" #: app/views/general/frontpage.rhtml:41 msgid "More authorities..." -msgstr "Mas autorita" +msgstr "Mas autorititatas..." #: app/views/general/frontpage.rhtml:55 msgid "More successful requests..." -msgstr "Mas requesti excellendi" +msgstr "Mas requestos de suces" #: app/views/layouts/default.rhtml:112 msgid "My requests" -msgstr "Mes requesti" +msgstr "Mes requestos" #: app/models/public_body.rb:36 msgid "Name can't be blank" -msgstr "" +msgstr "Nom ne possiblo emptar" #: app/models/public_body.rb:40 msgid "Name is already taken" -msgstr "" +msgstr "Nom deja prendar" #: app/views/general/search.rhtml:40 msgid "Newest results first" -msgstr "" +msgstr "Los resultas la mas nouvela premer" #: app/views/general/search.rhtml:16 msgid "Next, select the public authority you'd like to make the request from." -msgstr "" +msgstr "Maintena, shala el authoritas publicas que tu aimer requestar por" #: app/views/general/search.rhtml:48 -#, fuzzy msgid "No public authorities found" -msgstr "Mas autorita" +msgstr "Nulla authoritas publiqua trouves" #: app/views/public_body/show.rhtml:74 msgid "" "Nobody has made any Freedom of Information requests to {{public_body_name}} " "using this site yet." -msgstr "" +msgstr "Nonna persona crear los requestos Libras Informatias a {{public_body_name}} con esto sita" #: app/views/general/search.rhtml:7 msgid "Nothing found for '{{search_terms}}'" -msgstr "" +msgstr "Rien por {{search_terms}}" #: app/views/general/frontpage.rhtml:25 msgid "" "OR, <strong>search</strong> for information others have requested using " "{{site_name}}" -msgstr "" -"OU, <strong>busqar</strong> de informationas requestando par los autros avec " -"{{site_name}}" +msgstr "Ou <strong>busqar</strong> per infos los autros requesta com {{site_name}}" #: app/views/public_body/show.rhtml:92 msgid "Only requests made using {{site_name}} are shown." +msgstr "Seul los requestos crear con {{site_name}} heerro" + +#: locale/model_attributes.rb:26 +msgid "OutgoingMessage|Body" +msgstr "" + +#: locale/model_attributes.rb:29 +msgid "OutgoingMessage|Last sent at" +msgstr "" + +#: locale/model_attributes.rb:28 +msgid "OutgoingMessage|Message type" +msgstr "" + +#: locale/model_attributes.rb:27 +msgid "OutgoingMessage|Status" +msgstr "" + +#: locale/model_attributes.rb:30 +msgid "OutgoingMessage|What doing" msgstr "" #: app/views/general/search.rhtml:80 msgid "" "People {{start_count}} to {{end_count}} of {{total_count}} for " "{{user_search_query}}" -msgstr "" +msgstr "Peuples {{start_count}} a {{end_count}} de {{total_count}} pour {{user_search_query}}" #: app/models/profile_photo.rb:91 msgid "Please choose a file containing your photo." @@ -298,7 +433,7 @@ msgstr "" #: app/models/outgoing_message.rb:162 msgid "Please choose what sort of reply you are making." -msgstr "" +msgstr "Por favor, show el typo de respondra tu creeara" #: app/models/info_request.rb:104 msgid "" @@ -312,7 +447,7 @@ msgstr "" #: app/models/contact_validator.rb:30 msgid "Please enter a subject" -msgstr "" +msgstr "Por favor, creear una suject" #: app/models/info_request.rb:35 msgid "Please enter a summary of your request" @@ -408,16 +543,99 @@ msgid "" "This makes it easier for others to read." msgstr "" +#: locale/model_attributes.rb:56 +msgid "PostRedirect|Circumstance" +msgstr "" + +#: locale/model_attributes.rb:54 +msgid "PostRedirect|Email token" +msgstr "" + +#: locale/model_attributes.rb:53 +msgid "PostRedirect|Post params yaml" +msgstr "" + +#: locale/model_attributes.rb:55 +msgid "PostRedirect|Reason params yaml" +msgstr "" + +#: locale/model_attributes.rb:51 +msgid "PostRedirect|Token" +msgstr "" + +#: locale/model_attributes.rb:52 +msgid "PostRedirect|Uri" +msgstr "" + +#: locale/model_attributes.rb:15 +msgid "ProfilePhoto|Data" +msgstr "" + +#: locale/model_attributes.rb:16 +msgid "ProfilePhoto|Draft" +msgstr "" + #: app/views/general/search.rhtml:70 msgid "" "Public authorities {{start_count}} to {{end_count}} of {{total_count}} for " "{{user_search_query}}" msgstr "" +#: locale/model_attributes.rb:12 +msgid "PublicBody|First letter" +msgstr "El premier lettre" + +#: locale/model_attributes.rb:10 +msgid "PublicBody|Home page" +msgstr "La page de home" + +#: locale/model_attributes.rb:8 +msgid "PublicBody|Last edit comment" +msgstr "" + +#: locale/model_attributes.rb:7 +msgid "PublicBody|Last edit editor" +msgstr "" + +#: locale/model_attributes.rb:3 +msgid "PublicBody|Name" +msgstr "La Nom" + +#: locale/model_attributes.rb:11 +msgid "PublicBody|Notes" +msgstr "" + +#: locale/model_attributes.rb:13 +msgid "PublicBody|Publication scheme" +msgstr "" + +#: locale/model_attributes.rb:5 +msgid "PublicBody|Request email" +msgstr "" + +#: locale/model_attributes.rb:4 +msgid "PublicBody|Short name" +msgstr "La nom breva" + +#: locale/model_attributes.rb:9 +msgid "PublicBody|Url name" +msgstr "" + +#: locale/model_attributes.rb:6 +msgid "PublicBody|Version" +msgstr "" + #: app/views/public_body/show.rhtml:11 -#, fuzzy msgid "Publication scheme" -msgstr "Pubiquation escheme" +msgstr "" + +#: locale/model_attributes.rb:49 +msgid "RawEmail|Data binary" +msgstr "" + +#: locale/model_attributes.rb:48 +msgid "RawEmail|Data text" +msgstr "" #: app/views/general/search.rhtml:125 msgid "" @@ -427,15 +645,15 @@ msgstr "" #: app/views/layouts/default.rhtml:114 msgid "Read blog" -msgstr "Lire bloggus" +msgstr "Lire bloggo" #: app/views/general/search.rhtml:42 msgid "Recently described results first" -msgstr "" +msgstr "Los resultas recentas decriba au premier" #: app/views/general/search.rhtml:9 msgid "Results page {{page_number}}" -msgstr "" +msgstr "Page de resultas numero {{page_number}}" #: app/views/layouts/default.rhtml:102 app/views/general/frontpage.rhtml:16 #: app/views/general/search.rhtml:29 @@ -443,9 +661,8 @@ msgid "Search" msgstr "Busquar" #: app/views/general/search.rhtml:4 -#, fuzzy msgid "Search Freedom of Information requests, public authorities and users" -msgstr "Makando ou exploratre los Libera de Information requesti" +msgstr "Busquare Libra Info Requesta, authoritas et personna" #: app/models/public_body.rb:39 msgid "Short name is already taken" @@ -457,11 +674,11 @@ msgstr "" #: app/views/layouts/default.rhtml:124 msgid "Sign in or sign up" -msgstr "Entranter ou ensigner" +msgstr "Enregister au signin" #: app/views/layouts/default.rhtml:121 msgid "Sign out" -msgstr "Designater" +msgstr "Exito" #: app/views/general/search.rhtml:128 msgid "Table of statuses" @@ -478,9 +695,20 @@ msgid "This authority no longer exists, so you cannot make a request to it." msgstr "" #: app/views/public_body/show.rhtml:4 -#, fuzzy msgid "Track this authority" -msgstr "Mas autorita" +msgstr "Traqo esto authotito" + +#: locale/model_attributes.rb:33 +msgid "TrackThing|Track medium" +msgstr "" + +#: locale/model_attributes.rb:32 +msgid "TrackThing|Track query" +msgstr "" + +#: locale/model_attributes.rb:34 +msgid "TrackThing|Track type" +msgstr "" #: app/views/general/search.rhtml:121 msgid "" @@ -504,17 +732,61 @@ msgid "" "\"Liverpool City Council\"</code></strong>" msgstr "" +#: locale/model_attributes.rb:68 +msgid "UserInfoRequestSentAlert|Alert type" +msgstr "" + +#: locale/model_attributes.rb:79 +msgid "User|About me" +msgstr "" + +#: locale/model_attributes.rb:77 +msgid "User|Admin level" +msgstr "" + +#: locale/model_attributes.rb:78 +msgid "User|Ban text" +msgstr "" + +#: locale/model_attributes.rb:70 +msgid "User|Email" +msgstr "" + +#: locale/model_attributes.rb:74 +msgid "User|Email confirmed" +msgstr "" + +#: locale/model_attributes.rb:72 +msgid "User|Hashed password" +msgstr "" + +#: locale/model_attributes.rb:76 +msgid "User|Last daily track email" +msgstr "" + +#: locale/model_attributes.rb:71 +msgid "User|Name" +msgstr "" + +#: locale/model_attributes.rb:73 +msgid "User|Salt" +msgstr "" + +#: locale/model_attributes.rb:75 +msgid "User|Url name" +msgstr "" + #: app/views/public_body/show.rhtml:23 msgid "View FOI email address" msgstr "" #: app/views/layouts/default.rhtml:110 msgid "View authorities" -msgstr "Mas autorita" +msgstr "" #: app/views/layouts/default.rhtml:109 msgid "View requests" -msgstr "Vider requesti" +msgstr "" #: app/views/public_body/show.rhtml:40 msgid "" @@ -527,117 +799,79 @@ msgstr "" #: app/views/public_body/show.rhtml:29 msgid "also called {{public_body_short_name}}" +msgstr "en additionado, nomme {{public_body_short_name}}" + +#: locale/model_attributes.rb:42 +msgid "censor rule" +msgstr "" + +#: locale/model_attributes.rb:20 +msgid "comment" msgstr "" #: app/views/general/frontpage.rhtml:18 msgid "e.g." msgstr "par exemplo" -#: app/views/general/frontpage.rhtml:51 -msgid "{{length_of_time}} ago" -msgstr "depuis {{length_of_time}}" - -#~ msgid "%d result with exact tag matches" -#~ msgid_plural "%d results with exact tag matches" -#~ msgstr[0] "%d resulto con exacto tag matche" -#~ msgstr[1] "compte de %d resulti con exacto tag matche" -#~ msgstr[2] "compte de %d resultori con exacto tag matche" - -#, fuzzy -#~ msgid "%d result with substring matches" -#~ msgid_plural "%d results with substring matches" -#~ msgstr[0] "%d resulto con exacto tag matche" -#~ msgstr[1] "compte de %d resulti con exacto tag matche" -#~ msgstr[2] "compte de %d resultori con exacto tag matche" - -#, fuzzy -#~ msgid "List of all authorities" -#~ msgstr "Mas autorita" - -#, fuzzy -#~ msgid "Listing public authorities" -#~ msgstr "Mas autorita" - -#, fuzzy -#~ msgid "Name" -#~ msgstr "Nom de user" - -#~ msgid "OutgoingMessage|Body" -#~ msgstr "corpus de messago" - -#~ msgid "OutgoingMessage|Last sent at" -#~ msgstr "ultimato envoya" - -#~ msgid "OutgoingMessage|Message type" -#~ msgstr "etypa de messago" - -#~ msgid "OutgoingMessage|Status" -#~ msgstr "estatus" - -#~ msgid "OutgoingMessage|What doing" -#~ msgstr "Faire que" - -#~ msgid "PostRedirect|Circumstance" -#~ msgstr "Circumstancio" - -#~ msgid "PostRedirect|Email token" -#~ msgstr "Token de email" - -#~ msgid "ProfilePhoto|Data" -#~ msgstr "la data" - -#~ msgid "ProfilePhoto|Draft" -#~ msgstr "premerio attemptu" - -#, fuzzy -#~ msgid "PublicBody|" -#~ msgstr "PublicBody|Nom" - -#~ msgid "PublicBody|First letter" -#~ msgstr "premier sentu" +#: locale/model_attributes.rb:17 +msgid "exim log" +msgstr "" -#~ msgid "PublicBody|Home page" -#~ msgstr "El maison pago" +#: locale/model_attributes.rb:60 +msgid "exim log done" +msgstr "" -#~ msgid "PublicBody|Last edit comment" -#~ msgstr "ultimate commento de edite" +#: locale/model_attributes.rb:57 +msgid "holiday" +msgstr "" -#~ msgid "PublicBody|Name" -#~ msgstr "PublicBody|Nom" +#: locale/model_attributes.rb:63 +msgid "incoming message" +msgstr "" -#~ msgid "PublicBody|Notes" -#~ msgstr "Les notios" +#: locale/model_attributes.rb:80 +msgid "info request" +msgstr "" -#~ msgid "PublicBody|Request email" -#~ msgstr "requesto emaili" +#: locale/model_attributes.rb:35 +msgid "info request event" +msgstr "" -#~ msgid "PublicBody|Short name" -#~ msgstr "Nom brevis" +#: locale/model_attributes.rb:25 +msgid "outgoing message" +msgstr "" -#~ msgid "PublicBody|Url name" -#~ msgstr "Nom de URL" +#: locale/model_attributes.rb:50 +msgid "post redirect" +msgstr "" -#~ msgid "TrackThing|Track medium" -#~ msgstr "Traq media" +#: locale/model_attributes.rb:14 +msgid "profile photo" +msgstr "" -#~ msgid "TrackThing|Track query" -#~ msgstr "Traq quera" +#: locale/model_attributes.rb:2 +msgid "public body" +msgstr "" -#~ msgid "TrackThing|Track type" -#~ msgstr "Etypa de traq" +#: locale/model_attributes.rb:47 +msgid "raw email" +msgstr "" -#~ msgid "User|About me" -#~ msgstr "Sobre moi" +#: locale/model_attributes.rb:31 +msgid "track thing" +msgstr "" -#~ msgid "User|Email confirmed" -#~ msgstr "Email econfirmata" +#: locale/model_attributes.rb:69 +msgid "user" +msgstr "" -#~ msgid "User|Last daily track email" -#~ msgstr "La ultimate email de traq quotidiano" +#: locale/model_attributes.rb:67 +msgid "user info request sent alert" +msgstr "" -#~ msgid "User|Name" -#~ msgstr "Nom de user" +#: app/views/general/frontpage.rhtml:51 +msgid "{{length_of_time}} ago" +msgstr "depuis {{length_of_time}}" -#, fuzzy -#~ msgid "info request" -#~ msgstr "nonna requesti" +#~ msgid "activerecord.errors.full_messages.format" +#~ msgstr "%{message}" diff --git a/script/generate_pot.sh b/script/generate_pot.sh index 69b603748..fc693f6c8 100644 --- a/script/generate_pot.sh +++ b/script/generate_pot.sh @@ -5,5 +5,4 @@ cd `dirname $0` rake gettext:store_model_attributes rake gettext:find - -rake translate_routes:update_yaml["en es"]
\ No newline at end of file +#rake translate_routes:update_yaml["en es"] diff --git a/spec/controllers/admin_public_body_controller_spec.rb b/spec/controllers/admin_public_body_controller_spec.rb index a48367ae1..a32c27dd9 100644 --- a/spec/controllers/admin_public_body_controller_spec.rb +++ b/spec/controllers/admin_public_body_controller_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe AdminPublicBodyController, "when administering public bodies" do integrate_views - fixtures :public_bodies + fixtures :public_bodies, :public_body_translations it "shows the index page" do get :index diff --git a/spec/controllers/request_controller_spec.rb b/spec/controllers/request_controller_spec.rb index 648a66e28..b4b989c9f 100644 --- a/spec/controllers/request_controller_spec.rb +++ b/spec/controllers/request_controller_spec.rb @@ -1,3 +1,7 @@ +# £2k p/a +# talk about margins +# + require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') require 'json' @@ -34,7 +38,7 @@ end describe RequestController, "when showing one request" do - fixtures :info_requests, :info_request_events, :public_bodies, :users, :incoming_messages, :raw_emails, :outgoing_messages, :comments # all needed as integrating views + fixtures :info_requests, :info_request_events, :public_bodies, :public_body_translations, :users, :incoming_messages, :raw_emails, :outgoing_messages, :comments # all needed as integrating views it "should be successful" do get :show, :url_title => 'why_do_you_have_such_a_fancy_dog' diff --git a/spec/controllers/track_controller_spec.rb b/spec/controllers/track_controller_spec.rb index a37b1ea01..9fe3ebd42 100644 --- a/spec/controllers/track_controller_spec.rb +++ b/spec/controllers/track_controller_spec.rb @@ -35,7 +35,7 @@ end describe TrackController, "when sending alerts for a track" do integrate_views - fixtures :info_requests, :outgoing_messages, :incoming_messages, :raw_emails, :info_request_events, :users, :track_things, :track_things_sent_emails + fixtures :info_requests, :outgoing_messages, :incoming_messages, :raw_emails, :info_request_events, :users, :track_things, :track_things_sent_emails, :public_bodies, :public_body_translations include LinkToHelper # for main_url before do @@ -94,7 +94,7 @@ end describe TrackController, "when viewing RSS feed for a track" do integrate_views - fixtures :info_requests, :outgoing_messages, :incoming_messages, :raw_emails, :info_request_events, :users, :track_things, :comments, :public_bodies + fixtures :info_requests, :outgoing_messages, :incoming_messages, :raw_emails, :info_request_events, :users, :track_things, :comments, :public_bodies, :public_body_translations before do rebuild_xapian_index diff --git a/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb b/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb index dad3289d0..d8f0adaa3 100644 --- a/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb +++ b/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb @@ -679,12 +679,12 @@ module ActsAsXapian values << single_xapian_value(field, type=type) end end - if values[0].kind_of?(String) - values = values.reject{|x| x.nil?} - value = values.join(" ") - else + if values[0].kind_of?(Array) values = values.flatten value = values.reject{|x| x.nil?} + else + values = values.reject{|x| x.nil?} + value = values.join(" ") end end else diff --git a/vendor/plugins/alavetelitheme b/vendor/plugins/alavetelitheme deleted file mode 160000 -Subproject c52742cb7c587ed7486686e8ddbe2c4fe51e436 diff --git a/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/tasks.rb b/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/tasks.rb index b52157a2f..39fa4d959 100644 --- a/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/tasks.rb +++ b/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/tasks.rb @@ -61,7 +61,7 @@ namespace :gettext do # require 'gettext_activerecord/parser' desc "write the model attributes to <locale_path>/model_attributes.rb" task :store_model_attributes => :environment do - FastGettext.silence_errors + #FastGettext.silence_errors require 'gettext_i18n_rails/model_attributes_finder' require 'gettext_i18n_rails/active_record' |