diff options
| -rw-r--r-- | app/controllers/request_controller.rb | 2 | ||||
| -rw-r--r-- | app/models/info_request.rb | 6 | ||||
| -rw-r--r-- | app/views/public_body/list.rhtml | 2 | ||||
| -rw-r--r-- | app/views/public_body/show.rhtml | 6 | ||||
| -rw-r--r-- | app/views/request/_request_filter_form.rhtml | 4 | ||||
| -rw-r--r-- | app/views/request/_search_ahead.rhtml | 2 | ||||
| -rw-r--r-- | app/views/request/list.rhtml | 2 | ||||
| -rw-r--r-- | app/views/track/_tracking_links.rhtml | 4 |
8 files changed, 14 insertions, 14 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index e3f431cc7..12b5247b5 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -146,7 +146,7 @@ class RequestController < ApplicationController @view = params[:view] params[:latest_status] = @view query = make_query_from_params - @title = "View and search requests" + @title = _("View and search requests") sortby = "newest" @page = get_search_page_from_params if !@page # used in cache case, as perform_search sets @page as side effect behavior_cache :tag => [@view, @page] do diff --git a/app/models/info_request.rb b/app/models/info_request.rb index 978e2cd08..88a02cc2c 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -117,13 +117,13 @@ class InfoRequest < ActiveRecord::Base # only check on create, so existing models with mixed case are allowed def validate_on_create if !self.title.nil? && !MySociety::Validate.uses_mixed_capitals(self.title, 10) - errors.add(:title, N_('Please write the summary using a mixture of capital and lower case letters. This makes it easier for others to read.')) + errors.add(:title, _('Please write the summary using a mixture of capital and lower case letters. This makes it easier for others to read.')) end if !self.title.nil? && title.size > 200 - errors.add(:title, N_('Please keep the summary short, like in the subject of an email. You can use a phrase, rather than a full sentence.')) + errors.add(:title, _('Please keep the summary short, like in the subject of an email. You can use a phrase, rather than a full sentence.')) end if !self.title.nil? && self.title =~ /^(FOI|Freedom of Information)\s*requests?$/i - errors.add(:title, N_('Please describe more what the request is about in the subject. There is no need to say it is an FOI request, we add that on anyway.')) + errors.add(:title, _('Please describe more what the request is about in the subject. There is no need to say it is an FOI request, we add that on anyway.')) end end diff --git a/app/views/public_body/list.rhtml b/app/views/public_body/list.rhtml index 06c7d3be9..bb17b544f 100644 --- a/app/views/public_body/list.rhtml +++ b/app/views/public_body/list.rhtml @@ -34,7 +34,7 @@ <% @title = _("Public authorities - {{description}}", :description => @description) %> <div id="left_column"> -<h1>Public authorities</h1> +<h1><%= _('Public authorities') %></h1> <% form_tag(list_public_bodies_default_url, :method => "get", :id=>"search_form") do %> <div> diff --git a/app/views/public_body/show.rhtml b/app/views/public_body/show.rhtml index 32e96294a..f7583614c 100644 --- a/app/views/public_body/show.rhtml +++ b/app/views/public_body/show.rhtml @@ -46,9 +46,9 @@ <div id="stepwise_make_request"> <% if @public_body.is_requestable? || @public_body.not_requestable_reason == 'bad_contact' %> <% if @public_body.eir_only? %> - Make a new <strong>Environmental Information</strong> request + <%= _('Make a new <strong>Environmental Information</strong> request')%> <% else %> - Make a new <strong>Freedom of Information</strong> request + <%= _('Make a new <strong>Freedom of Information</strong> request')%> <% end %> <%= _('<a class="link_button_green" href="{{url}}">{{text}}</a>', :url=>new_request_to_body_url(:url_name => @public_body.url_name), :text=>_("Start"))%> <% elsif @public_body.has_notes? %> @@ -108,4 +108,4 @@ <p> <%= _('The search index is currently offline, so we can\'t show the Freedom of Information requests that have been made to this authority.')%></p> <% end %> </div> -</div>
\ No newline at end of file +</div> diff --git a/app/views/request/_request_filter_form.rhtml b/app/views/request/_request_filter_form.rhtml index b13637c25..c1848c59a 100644 --- a/app/views/request/_request_filter_form.rhtml +++ b/app/views/request/_request_filter_form.rhtml @@ -2,7 +2,7 @@ <div id="list-filter"> <div class="list-filter-item"> - <h3 class="title">Showing</h3> + <h3 class="title"><%= _("Showing") %></h3> <% statuses = [["all", _("all requests")], ["successful", _("successful requests")], ["unsuccessful", _("unsuccessful requests")], @@ -46,7 +46,7 @@ </div> <div class="list-filter-item"> - <%= submit_tag("Search") %> + <%= submit_tag(_("Search")) %> </div> <% end %> </div> diff --git a/app/views/request/_search_ahead.rhtml b/app/views/request/_search_ahead.rhtml index 053b10146..b8ef7437e 100644 --- a/app/views/request/_search_ahead.rhtml +++ b/app/views/request/_search_ahead.rhtml @@ -1,7 +1,7 @@ <p> <div id="request_search_ahead_results"> <% if @xapian_requests.results.size > 0 %> - <h3>Possibly related requests:</h3> + <h3><%= _("Possibly related requests:") %></h3> <% end %> <% for result in @xapian_requests.results %> <%= render :partial => 'request/request_listing_short_via_event', :locals => { :event => result[:model], :info_request => result[:model].info_request } %> diff --git a/app/views/request/list.rhtml b/app/views/request/list.rhtml index 28dc55cdf..88d4279e1 100644 --- a/app/views/request/list.rhtml +++ b/app/views/request/list.rhtml @@ -5,7 +5,7 @@ </div> <div id="header_right"> - <h2>Track these requests</h2> + <h2><%= _("Track these requests") %></h2> <% if @track_thing %> <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'main' } %> <% end %> diff --git a/app/views/track/_tracking_links.rhtml b/app/views/track/_tracking_links.rhtml index 5a8316db4..53688867c 100644 --- a/app/views/track/_tracking_links.rhtml +++ b/app/views/track/_tracking_links.rhtml @@ -19,12 +19,12 @@ <% elsif track_thing %> <div class="feed_link feed_link_<%=location%>"> <%= link_to '<img src="/images/email-16.png" alt="">', do_track_url(track_thing) %> - <%= link_to "Track by email", do_track_url(track_thing) %> + <%= link_to _("Track by email"), do_track_url(track_thing) %> </div> <div class="feed_link feed_link_<%=location%>"> <%= link_to '<img src="/images/feed-16.png" alt="">', do_track_url(track_thing, 'feed') %> - <%= link_to (location == 'sidebar' ? 'RSS feed of updates' : 'RSS feed'), do_track_url(track_thing, 'feed') %> + <%= link_to (location == 'sidebar' ? _('RSS feed of updates') : _('RSS feed')), do_track_url(track_thing, 'feed') %> </div> <% end %> |