diff options
| -rw-r--r-- | app/views/general/blog.rhtml | 12 | ||||
| -rw-r--r-- | app/views/public_body/show.rhtml | 2 | ||||
| -rw-r--r-- | app/views/request/_request_filter_form.rhtml | 2 | ||||
| -rw-r--r-- | app/views/request/_sidebar.rhtml | 2 | ||||
| -rw-r--r-- | app/views/user/set_draft_profile_photo.rhtml | 4 |
5 files changed, 11 insertions, 11 deletions
diff --git a/app/views/general/blog.rhtml b/app/views/general/blog.rhtml index 4ff408e52..5d38874c3 100644 --- a/app/views/general/blog.rhtml +++ b/app/views/general/blog.rhtml @@ -1,11 +1,11 @@ -<% @title = "#{site_name} blog and tweets" %> +<% @title = _("{{site_name}} blog and tweets", :site_name => site_name) %> <% if !@twitter_user.empty? %> <div id="right_column"> <div class="act_link"> - <h2>Stay up to date</h2> - <img src="/images/twitter-16.png" alt="twitter icon" class="twitter-icon"> <a href="http://www.twitter.com/<%= MySociety::Config.get('TWITTER_USERNAME') %>">Follow us on twitter</a><br/><br/> - <img src="/images/feed-16.png" alt="RSS icon" valign="middle"> <a href="<%= MySociety::Config.get('BLOG_FEED') %>">Subscribe to blog</a> + <h2><%= _("Stay up to date") %></h2> + <img src="/images/twitter-16.png" alt="twitter icon" class="twitter-icon"> <a href="http://www.twitter.com/<%= MySociety::Config.get('TWITTER_USERNAME') %>"><%= _("Follow us on twitter") %></a><br/><br/> + <img src="/images/feed-16.png" alt="RSS icon" valign="middle"> <a href="<%= MySociety::Config.get('BLOG_FEED') %>"><%= _("Subscribe to blog") %></a> </div> <div id="twitter"> <script src="http://widgets.twimg.com/j/2/widget.js"></script> @@ -50,10 +50,10 @@ <% for item in @blog_items: %> <div class="blog_post"> <h2><a href="<%=item['link']%>"><%=h item['title'] %></a></h2> - <p class="subtitle">Posted on <%= simple_date(Time.parse(item['pubDate'][0])) %> by <%=h item['creator'] %></p> + <p class="subtitle"><%= _("Posted on {{date}} by {{author}}", :date=>simple_date(Time.parse(item['pubDate'][0])), :author=>item['creator']) %></p> <div><%= item['encoded'] %></div> <p><em> - <a href="<%=item['comments'][0]%>"><%=item['comments'][1]%> comments</a> + <a href="<%=item['comments'][0]%>"><%= _("{{number_of_comments}} comments", :number_of_comments=>item['comments'][1]) %></a> </em> </p> </div> diff --git a/app/views/public_body/show.rhtml b/app/views/public_body/show.rhtml index ab8eb3826..19e3c5f5d 100644 --- a/app/views/public_body/show.rhtml +++ b/app/views/public_body/show.rhtml @@ -27,7 +27,7 @@ </div> <div id="header_left"> - <p class="public-body-name-prefix">Freedom of information requests to</p> + <p class="public-body-name-prefix"><%= _("Freedom of information requests to") %></p> <h1><%=h(@public_body.name)%></h1> <p class="subtitle"> diff --git a/app/views/request/_request_filter_form.rhtml b/app/views/request/_request_filter_form.rhtml index ac133889d..aa86e8596 100644 --- a/app/views/request/_request_filter_form.rhtml +++ b/app/views/request/_request_filter_form.rhtml @@ -26,7 +26,7 @@ <%= text_field_tag(:request_date_before, params[:request_date_before], {:class => "use-datepicker", :size => 10}) %> </div> <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")], diff --git a/app/views/request/_sidebar.rhtml b/app/views/request/_sidebar.rhtml index 62ece4821..2a9b5a73f 100644 --- a/app/views/request/_sidebar.rhtml +++ b/app/views/request/_sidebar.rhtml @@ -26,7 +26,7 @@ <%= render :partial => 'request/request_listing_short_via_event', :locals => { :event => result[:model], :info_request => result[:model].info_request } %> <% end %> <% if @xapian_similar_more %> - <p><%= link_to "More similar requests", request_similar_url(@info_request) %></p> + <p><%= link_to _("More similar requests"), request_similar_url(@info_request) %></p> <% end %> <!-- Important terms: <%= @xapian_similar.important_terms.join(" ") %> --> <% end %> diff --git a/app/views/user/set_draft_profile_photo.rhtml b/app/views/user/set_draft_profile_photo.rhtml index 70d27074b..90be49600 100644 --- a/app/views/user/set_draft_profile_photo.rhtml +++ b/app/views/user/set_draft_profile_photo.rhtml @@ -2,7 +2,7 @@ <% raise "internal error" if not @user %> -<h2>Choose your profile photo</h2> +<h2><%= _("Choose your profile photo") %></h2> <%= foi_error_messages_for :draft_profile_photo %> @@ -52,7 +52,7 @@ <% end %> <p> - <%= link_to h("Cancel, return to your profile page"), user_url(@user) %> + <%= link_to _("Cancel, return to your profile page"), user_url(@user) %> </p> </div> |