From c5ff3c917f1ba79ceea58c93092d59cc12f55459 Mon Sep 17 00:00:00 2001 From: Faton Selishta Date: Thu, 30 Jun 2011 16:15:39 +0200 Subject: I18n string for controllers --- app/controllers/request_controller.rb | 107 +++++++++++++++++----------------- 1 file changed, 54 insertions(+), 53 deletions(-) (limited to 'app/controllers/request_controller.rb') diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index 0c02effa7..8987768e6 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -44,9 +44,9 @@ class RequestController < ApplicationController 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 + :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 @@ -260,15 +260,15 @@ class RequestController < ApplicationController message = "" if @outgoing_message.contains_email? if @user.nil? - message += "

You do not need to include your email in the request in order to get a reply, as we will ask for it on the next screen (details).

"; + message += _("

You do not need to include your email in the request in order to get a reply, as we will ask for it on the next screen (details).

") % [help_privacy_path+"#email_address"]; else - message += "

You do not need to include your email in the request in order to get a reply (details).

"; + message += _("

You do not need to include your email in the request in order to get a reply (details).

") % [help_privacy_path+"#email_address"]; end - message += "

We recommend that you edit your request and remove the email address. - If you leave it, the email address will be sent to the authority, but will not be displayed on the site.

" + message += _("

We recommend that you edit your request and remove the email address. + If you leave it, the email address will be sent to the authority, but will not be displayed on the site.

") end if @outgoing_message.contains_postcode? - message += "

Your request contains a postcode. Unless it directly relates to the subject of your request, please remove any address as it will appear publicly on the Internet.

"; + message += _("

Your request contains a postcode. Unless it directly relates to the subject of your request, please remove any address as it will appear publicly on the Internet.

"); end if not message.empty? flash.now[:error] = message @@ -278,9 +278,9 @@ class RequestController < ApplicationController end if !authenticated?( - :web => "To send your FOI request", - :email => "Then your FOI request to " + @info_request.public_body.name + " will be sent.", - :email_subject => "Confirm your FOI request to " + @info_request.public_body.name + :web => _("To send your FOI request"), + :email => _("Then your FOI request to {{public_body_name}} will be sent.",:public_body_name=>@info_request.public_body.name), + :email_subject => _("Confirm your FOI request to ") + @info_request.public_body.name ) # do nothing - as "authenticated?" has done the redirect to signin page for us return @@ -291,11 +291,11 @@ class RequestController < ApplicationController @info_request.save! # XXX send_message needs the database id, so we send after saving, which isn't ideal if the request broke here. @outgoing_message.send_message - flash[:notice] = "

Your " + @info_request.law_used_full + " request has been sent on its way!

+ flash[:notice] = _("

Your {{law_used_full}} request has been sent on its way!

We will email you when there is a response, or after 20 working days if the authority still hasn't replied by then.

If you write about this request (for example in a forum or a blog) please link to this page, and add an - annotation below telling people about your writing.

" + annotation below telling people about your writing.

",:law_used_full=>@info_request.law_used_full) redirect_to request_url(@info_request) end @@ -317,22 +317,22 @@ class RequestController < ApplicationController # Check authenticated, and parameters set. We check is_owning_user # to get admin overrides (see is_owning_user? above) if !@old_unclassified && !@is_owning_user && !authenticated_as_user?(@info_request.user, - :web => "To classify the response to this FOI request", - :email => "Then you can classify the FOI response you have got from " + @info_request.public_body.name + ".", - :email_subject => "Classify an FOI response from " + @info_request.public_body.name + :web => _("To classify the response to this FOI request"), + :email => _("Then you can classify the FOI response you have got from ") + @info_request.public_body.name + ".", + :email_subject => _("Classify an FOI response from ") + @info_request.public_body.name ) # do nothing - as "authenticated?" has done the redirect to signin page for us return end if !params[:incoming_message] - flash[:error] = "Please choose whether or not you got some of the information that you wanted." + flash[:error] = _("Please choose whether or not you got some of the information that you wanted.") redirect_to request_url(@info_request) return end if params[:last_info_request_event_id].to_i != @last_info_request_event_id - flash[:error] = "The request has been updated since you originally loaded this page. Please check for any new incoming messages below, and try again." + flash[:error] = _("The request has been updated since you originally loaded this page. Please check for any new incoming messages below, and try again.") redirect_to request_url(@info_request) return end @@ -358,10 +358,10 @@ class RequestController < ApplicationController # Don't give advice on what to do next, as it isn't their request RequestMailer.deliver_old_unclassified_updated(@info_request) if session[:request_game] - flash[:notice] = 'Thank you for updating the status of the request \'' + CGI.escapeHTML(@info_request.title) + '\'. There are some more requests below for you to classify.' + flash[:notice] = _('Thank you for updating the status of the request \'{{info_request_title}}\'. There are some more requests below for you to classify.',:info_request_title=>CGI.escapeHTML(@info_request.title)) % [CGI.escapeHTML(request_url(@info_request))] redirect_to play_url else - flash[:notice] = 'Thank you for updating this request!' + flash[:notice] = _('Thank you for updating this request!') redirect_to request_url(@info_request) end return @@ -369,58 +369,59 @@ class RequestController < ApplicationController # Display advice for requester on what to do next, as appropriate if @info_request.calculate_status == 'waiting_response' - flash[:notice] = "

Thank you! Hopefully your wait isn't too long.

By law, you should get a response promptly, and " + (@info_request.public_body.is_school? ? "in term time" : "") + " normally before the end of " + simple_date(@info_request.date_response_required_by) + ".

" + flash[:notice] = _("

Thank you! Hopefully your wait isn't too long.

By law, you should get a response promptly, and normally before the end of +{{date_response_required_by}}.

",:date_response_required_by=>simple_date(@info_request.date_response_required_by)) redirect_to request_url(@info_request) elsif @info_request.calculate_status == 'waiting_response_overdue' - flash[:notice] = "

Thank you! Hope you don't have to wait much longer.

By law, you should have got a response promptly, and " + (@info_request.public_body.is_school? ? "in term time" : "") + " normally before the end of " + simple_date(@info_request.date_response_required_by) + ".

" + flash[:notice] = _("

Thank you! Hope you don't have to wait much longer.

By law, you should have got a response promptly, and normally before the end of {{date_response_required_by}}.

",:date_response_required_by=>simple_date(@info_request.date_response_required_by)) redirect_to request_url(@info_request) elsif @info_request.calculate_status == 'waiting_response_very_overdue' - flash[:notice] = "

Thank you! Your request is long overdue, by more than 40 working days. Most requests should be answered within 20 working days. You might like to complain about this, see below.

" + flash[:notice] = _("

Thank you! Your request is long overdue, by more than 40 working days. Most requests should be answered within 20 working days. You might like to complain about this, see below.

") redirect_to unhappy_url(@info_request) elsif @info_request.calculate_status == 'not_held' - flash[:notice] = "

Thank you! Here are some ideas on what to do next:

+ flash[:notice] = _("

Thank you! Here are some ideas on what to do next:

- " + ") % ["/new",CGI.escapeHTML(unhappy_url(@info_request)),CGI.escapeHTML(unhappy_url(@info_request)) + "#other_means"] redirect_to request_url(@info_request) elsif @info_request.calculate_status == 'rejected' - flash[:notice] = "Oh no! Sorry to hear that your request was refused. Here is what to do now." + flash[:notice] = _("Oh no! Sorry to hear that your request was refused. Here is what to do now.") redirect_to unhappy_url(@info_request) elsif @info_request.calculate_status == 'successful' - flash[:notice] = "

We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.

If you found WhatDoTheyKnow useful, make a donation to the charity which runs it.

" + flash[:notice] = _("

We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.

If you found WhatDoTheyKnow useful, make a donation to the charity which runs it.

") % ["http://www.mysociety.org/donate/"] redirect_to request_url(@info_request) elsif @info_request.calculate_status == 'partially_successful' - flash[:notice] = "

We're glad you got some of the information that you wanted. If you found WhatDoTheyKnow useful, make a donation to the charity which runs it.

If you want to try and get the rest of the information, here's what to do now.

" + flash[:notice] = _("

We're glad you got some of the information that you wanted. If you found WhatDoTheyKnow useful, make a donation to the charity which runs it.

If you want to try and get the rest of the information, here's what to do now.

") % ["http://www.mysociety.org/donate/"] redirect_to unhappy_url(@info_request) elsif @info_request.calculate_status == 'waiting_clarification' - flash[:notice] = "Please write your follow up message containing the necessary clarifications below." + flash[:notice] = _("Please write your follow up message containing the necessary clarifications below.") redirect_to respond_to_last_url(@info_request) elsif @info_request.calculate_status == 'gone_postal' redirect_to respond_to_last_url(@info_request) + "?gone_postal=1" elsif @info_request.calculate_status == 'deadline_extended' - flash[:notice] = "Authority has requested extension of the deadline." + flash[:notice] = _("Authority has requested extension of the deadline.") redirect_to unhappy_url(@info_request) elsif @info_request.calculate_status == 'wrong_response' - flash[:notice] = "Oh no! Sorry to hear that your request was wrong. Here is what to do now." + flash[:notice] = _("Oh no! Sorry to hear that your request was wrong. Here is what to do now.") redirect_to unhappy_url(@info_request) elsif @info_request.calculate_status == 'internal_review' - flash[:notice] = "

Thank you! Hopefully your wait isn't too long.

You should get a response within 20 days, or be told if it will take longer (details).

" + flash[:notice] = _("

Thank you! Hopefully your wait isn't too long.

You should get a response within 20 days, or be told if it will take longer (details).

") % [unhappy_url(@info_request) + "#internal_review"] redirect_to request_url(@info_request) elsif @info_request.calculate_status == 'error_message' - flash[:notice] = "

Thank you! We'll look into what happened and try and fix it up.

If the error was a delivery failure, and you can find an up to date FOI email address for the authority, please tell us using the form below.

" + flash[:notice] = _("

Thank you! We'll look into what happened and try and fix it up.

If the error was a delivery failure, and you can find an up to date FOI email address for the authority, please tell us using the form below.

") redirect_to help_general_url(:action => 'contact') elsif @info_request.calculate_status == 'requires_admin' - flash[:notice] = "Please use the form below to tell us more." + flash[:notice] = _("Please use the form below to tell us more.") redirect_to help_general_url(:action => 'contact') elsif @info_request.calculate_status == 'user_withdrawn' - flash[:notice] = "If you have not done so already, please write a message below telling the authority that you have withdrawn your request. Otherwise they will not know it has been withdrawn." + flash[:notice] = _("If you have not done so already, please write a message below telling the authority that you have withdrawn your request. Otherwise they will not know it has been withdrawn.") redirect_to respond_to_last_url(@info_request) else raise "unknown calculate_status " + @info_request.calculate_status @@ -521,24 +522,24 @@ class RequestController < ApplicationController # message and wasting their time if they are not the requester. if !authenticated_as_user?(@info_request.user, :web => @incoming_message.nil? ? - "To send a follow up message to " + @info_request.public_body.name : - "To reply to " + @info_request.public_body.name, + _("To send a follow up message to ") + @info_request.public_body.name : + _("To reply to ") + @info_request.public_body.name, :email => @incoming_message.nil? ? - "Then you can write follow up message to " + @info_request.public_body.name + "." : - "Then you can write your reply to " + @info_request.public_body.name + ".", + _("Then you can write follow up message to ") + @info_request.public_body.name + "." : + _("Then you can write your reply to ") + @info_request.public_body.name + ".", :email_subject => @incoming_message.nil? ? - "Write your FOI follow up message to " + @info_request.public_body.name : - "Write a reply to " + @info_request.public_body.name + _("Write your FOI follow up message to ") + @info_request.public_body.name : + _("Write a reply to ") + @info_request.public_body.name ) return end if !params[:submitted_followup].nil? && !params[:reedit] if @info_request.allow_new_responses_from == 'nobody' - flash[:error] = 'Your follow up has not been sent because this request has been stopped to prevent spam. Please contact us if you really want to send a follow up message.' + flash[:error] = _('Your follow up has not been sent because this request has been stopped to prevent spam. Please contact us if you really want to send a follow up message.') % [help_contact_path] else if @info_request.find_existing_outgoing_message(params[:outgoing_message][:body]) - flash[:error] = 'You previously submitted that exact follow up message for this request.' + flash[:error] = _('You previously submitted that exact follow up message for this request.') render :action => 'show_response' return end @@ -561,9 +562,9 @@ class RequestController < ApplicationController @outgoing_message.send_message @outgoing_message.save! if @outgoing_message.what_doing == 'internal_review' - flash[:notice] = "Your internal review request has been sent on its way." + flash[:notice] = _("Your internal review request has been sent on its way.") else - flash[:notice] = "Your follow up message has been sent on its way." + flash[:notice] = _("Your follow up message has been sent on its way.") end redirect_to request_url(@info_request) end @@ -681,9 +682,9 @@ class RequestController < ApplicationController @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" + :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 {{site_name}}",:site_name=>site_name) } if !authenticated?(@reason_params) return @@ -710,13 +711,13 @@ class RequestController < ApplicationController body = params[:body] || "" if file_name.nil? && body.empty? - flash[:error] = "Please type a message and/or choose a file containing your response." + flash[:error] = _("Please type a message and/or choose a file containing your response.") return end mail = RequestMailer.create_fake_response(@info_request, @user, body, file_name, file_content) @info_request.receive(mail, mail.encoded, true) - flash[:notice] = "Thank you for responding to this FOI request! Your response has been published below, and a link to your response has been emailed to " + CGI.escapeHTML(@info_request.user.name) + "." + flash[:notice] = _("Thank you for responding to this FOI request! Your response has been published below, and a link to your response has been emailed to ") + CGI.escapeHTML(@info_request.user.name) + "." redirect_to request_url(@info_request) return end -- cgit v1.2.3