diff options
28 files changed, 67 insertions, 85 deletions
diff --git a/app/views/admin_general/stats.rhtml b/app/views/admin_general/stats.rhtml index f95d381fb..b22adb581 100644 --- a/app/views/admin_general/stats.rhtml +++ b/app/views/admin_general/stats.rhtml @@ -32,8 +32,7 @@ <h2>Web analytics</h2> -<p><a href="http://piwik.mysociety.org/index.php?module=CoreHome&action=index&idSite=4&period=month&date=yesterday">WhatDoTheyKnow on piwik</a> -<br><a href="https://secure.mysociety.org/admin/awstats.pl?config=www.whatdotheyknow.com">WhatDoTheyKnow on awstats</a> + </p> diff --git a/app/views/comment/new.rhtml b/app/views/comment/new.rhtml index 7e375d638..25380d23f 100644 --- a/app/views/comment/new.rhtml +++ b/app/views/comment/new.rhtml @@ -49,25 +49,25 @@ <li><%= _(' Ideas on what <strong>other documents to request</strong> which the authority may hold. ')%></li> <% end %> <% if [ 'rejected' ].include?(@info_request.described_state) %> - <li> Advise on whether the <strong>refusal is legal</strong>, and how to complain about it if not. </li> + <li> <%= _('Advise on whether the <strong>refusal is legal</strong>, and how to complain about it if not.') %> </li> <% end %> <% if [ 'internal_review' ].include?(@info_request.described_state) %> - <li> <strong>Advice</strong> on how to get a response that will satisfy the requester. </li> + <li> <%= _('<strong>Advice</strong> on how to get a response that will satisfy the requester. </li>') %> <% end %> <% if [ 'error_message' ].include?(@info_request.described_state) %> - <li> You know what caused the error, and can <strong>suggest a solution</strong>, such as a working email address. </li> + <li> <%= _('You know what caused the error, and can <strong>suggest a solution</strong>, such as a working email address.')%> </li> <% end %> <% if [ 'requires_admin' ].include?(@info_request.described_state) %> - <li> Your thoughts on what the WhatDoTheyKnow <strong>administrators</strong> should do about the request. </li> + <li> <%= _('Your thoughts on what the WhatDoTheyKnow <strong>administrators</strong> should do about the request.') %> </li> <% end %> </ul> <p> - <big>Annotations will be posted publicly here, and are - <strong>not</strong> sent to <%=h @info_request.public_body.name %>.</big> + <big><%= _('Annotations will be posted publicly here, and are + <strong>not</strong> sent to {{public_body_name}}.',:public_body_name=>h(@info_request.public_body.name)) %></big> </p> <%= render :partial => 'comment/comment_form', :locals => { :track_thing => @track_thing } %> diff --git a/app/views/comment/preview.rhtml b/app/views/comment/preview.rhtml index 54037cf0e..702bd9a9b 100644 --- a/app/views/comment/preview.rhtml +++ b/app/views/comment/preview.rhtml @@ -1,8 +1,8 @@ -<% @title = "Preview new annotation on '" + h(@info_request.title) + "'" %> +<% @title = _("Preview new annotation on '{{info_request_title}}'",:info_request_title=>h(@info_request.title)) %> <% form_for(:comment, @comment, :html => { :id => 'preview_form' }, :url => { :controller => "comment", :action => "new", :type => "request" } ) do |f| %> - <h1>Now preview your annotation</h1> + <h1><%= _('Now preview your annotation') %></h1> <%= render :partial => 'comment/single_comment', :locals => { :comment => @comment } %> @@ -17,8 +17,8 @@ <% end %> <%= hidden_field_tag(:submitted_comment, 1) %> <%= hidden_field_tag(:preview, 0 ) %> - <%= submit_tag "Re-edit this annotation", :name => 'reedit' %> - <%= submit_tag "Post annotation", :name => 'submit' %> + <%= submit_tag _("Re-edit this annotation"), :name => 'reedit' %> + <%= submit_tag _("Post annotation"), :name => 'submit' %> </p> <% end %> diff --git a/app/views/general/_before_body_end.rhtml b/app/views/general/_before_body_end.rhtml index 8d7ebeeb5..4374a3f28 100644 --- a/app/views/general/_before_body_end.rhtml +++ b/app/views/general/_before_body_end.rhtml @@ -1,16 +1 @@ -<% if MySociety::Config.get("DOMAIN", '127.0.0.1:3000') == 'www.whatdotheyknow.com' %> -<!-- Piwik --> -<script type="text/javascript"> -var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.mysociety.org/" : "http://piwik.mysociety.org/"); -document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E")); -</script><script type="text/javascript"> -try { -var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 4); -piwikTracker.trackPageView(); -piwikTracker.enableLinkTracking(); -} catch( err ) {} -</script><noscript><p><img src="http://piwik.mysociety.org/piwik.php?idsite=4" style="border:0" alt=""/></p></noscript> -<!-- End Piwik Tag --> -<% end %> - - +<!-- TO DO: add here Analytics Scripts (Google or something else) --> diff --git a/app/views/general/_locale_switcher.rhtml b/app/views/general/_locale_switcher.rhtml index 4f01a4d13..812256ccf 100644 --- a/app/views/general/_locale_switcher.rhtml +++ b/app/views/general/_locale_switcher.rhtml @@ -1,12 +1,12 @@ <% if FastGettext.default_available_locales.length > 1 %> <div id="user_locale_switcher"> - Language: <% for possible_locale in FastGettext.default_available_locales %> <% if possible_locale == I18n.locale.to_s %> - <%= possible_locale %> + <span class="active"><%= locale_name(possible_locale) %></span> <% else %> - <a href="<%= locale_switcher(possible_locale, params) %>"><%= possible_locale %></a> + <a href="<%= locale_switcher(possible_locale, params) %>"><%= locale_name(possible_locale) %></a> <% end %> <% end %> </div> <% end %> +<br/> diff --git a/app/views/general/blog.rhtml b/app/views/general/blog.rhtml index cda1c5769..3f3abf42a 100644 --- a/app/views/general/blog.rhtml +++ b/app/views/general/blog.rhtml @@ -1,4 +1,4 @@ -<% @title = "WhatDoTheyKnow blog and tweets" %> +<% @title = "WhatDoTheyKnow blog and tweets" %> <div id="blog_sidebar"> <h1><img src="/images/twitter.png" alt=""> <a href="http://www.twitter.com/whatdotheyknow">Follow us on twitter</a></h1> @@ -24,7 +24,7 @@ <div class="twitter_post"> <h2><a href="<%=item['link']%>">@whatdotheyknow on <%= simple_date(Time.parse(item['pubDate'][0])) %></a></h2> <p><%=MySociety::Format.make_clickable(h(item['title'][0].sub("WhatDoTheyKnow: ", ""))) %></a></p> - <div> + </div> <% end %> <% end %> diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml index aa532e481..8b6ce4f1a 100644 --- a/app/views/layouts/default.rhtml +++ b/app/views/layouts/default.rhtml @@ -27,7 +27,7 @@ <!--[if LT IE 7]> <style type="text/css">@import url("/stylesheets/ie6-custom.css");</style> <![endif]--> - <%= stylesheet_link_tag 'main-custom', :title => "Main", :rel => "stylesheet" %> + <%= stylesheet_link_tag 'custom', :title => "Main", :rel => "stylesheet" %> <% if @feed_autodetect %> <% for feed in @feed_autodetect %> @@ -77,22 +77,19 @@ </div> =end %> - - <div id="banner"> - </div> +<div class="entirebody"> <div id="header"> + <div class="lang"><%= render :partial => 'general/locale_switcher' %></div> <h1> - <%= link_to site_name, frontpage_url %> + <%= link_to " ", frontpage_url %> </h1> + <div id="tagline"> <%= _('Make and explore Freedom of Information requests') %> </div> - <%= render :partial => 'general/locale_switcher' %> </div> - <div id="orglogo"> - <%= render :partial => 'general/orglink' %> - </div> + <div id="navigation_search"> <% form_tag({:controller => "general", :action => "search_redirect"}, {:id => "navigation_search_form"}) do %> @@ -146,8 +143,9 @@ <%= link_to _("Contact {{site_name}}", :site_name => site_name), help_contact_url %> <%= render :partial => 'general/credits' %> </div> + <div class="after-footer"> </div> <%= render :partial => 'general/before_body_end' %> - +</div> </body> </html> diff --git a/app/views/outgoing_mailer/followup.rhtml b/app/views/outgoing_mailer/followup.rhtml index 82f8afcfc..aa00d7461 100644 --- a/app/views/outgoing_mailer/followup.rhtml +++ b/app/views/outgoing_mailer/followup.rhtml @@ -4,7 +4,7 @@ ------------------------------------------------------------------- <%= _('Disclaimer: This message and any reply that you make will be published on the internet. Our privacy and copyright policies:')%> -http://www.whatdotheyknow.com/help/officers +http://www.informatazyrtare.org/help/officers <%= _('Please use this email address for all replies to this request:')%> <%= @info_request.incoming_email %> diff --git a/app/views/outgoing_mailer/initial_request.rhtml b/app/views/outgoing_mailer/initial_request.rhtml index f45634e62..1813e5348 100644 --- a/app/views/outgoing_mailer/initial_request.rhtml +++ b/app/views/outgoing_mailer/initial_request.rhtml @@ -2,13 +2,13 @@ ------------------------------------------------------------------- <%= _('Disclaimer: This message and any reply that you make will be published on the internet. Our privacy and copyright policies:')%> -http://www.whatdotheyknow.com/help/officers +http://www.informatazyrtare.org/help/officers <%= _('Please use this email address for all replies to this request:')%> <%= @info_request.incoming_email %> Is <%= @info_request.public_body.request_email%> the wrong address for <%= @info_request.law_used_full %> requests to <%= @info_request.public_body.name%>? If so please contact us using this form: -http://www.whatdotheyknow.com/help/contact +http://www.informatazyrtare.org/help/contact <%= _('If you find WhatDoTheyKnow useful as an FOI officer, please ask your web manager to suggest us on your organisation\'s FOI page.')%> ------------------------------------------------------------------- diff --git a/app/views/request/_correspondence.rhtml b/app/views/request/_correspondence.rhtml index 090f5a728..4e46347b8 100644 --- a/app/views/request/_correspondence.rhtml +++ b/app/views/request/_correspondence.rhtml @@ -24,8 +24,8 @@ if not incoming_message.nil? <% if !@user.nil? && @user.admin_page_links? %> <%= link_to "Admin", admin_url("request/show_raw_email/" + incoming_message.raw_email_id.to_s) %> | <% end %> - <%= link_to "Link to this", incoming_message_url(incoming_message) %> | - <%= link_to "Reply to this message", show_response_url(:id => incoming_message.info_request.id, :incoming_message_id => incoming_message.id) + "#followup" %> + <%= link_to _("Link to this"), incoming_message_url(incoming_message) %> | + <%= link_to _("Reply to this message"), show_response_url(:id => incoming_message.info_request.id, :incoming_message_id => incoming_message.id) + "#followup" %> </p> </div> @@ -54,8 +54,8 @@ elsif [ 'sent', 'followup_sent' ].include?(info_request_event.event_type) <% end %> --> - <%= link_to "Link to this", outgoing_message_url(outgoing_message) %> | - <%= link_to "Send follow up", show_response_no_followup_url(:id => outgoing_message.info_request.id, :incoming_message_id => nil) + "#followup" %> + <%= link_to _("Link to this"), outgoing_message_url(outgoing_message) %> | + <%= link_to _("Send follow up"), show_response_no_followup_url(:id => outgoing_message.info_request.id, :incoming_message_id => nil) + "#followup" %> </p> </div> <% elsif [ 'resent', 'followup_resent' ].include?(info_request_event.event_type) %> diff --git a/app/views/request/_other_describe_state.rhtml b/app/views/request/_other_describe_state.rhtml index 66f64c27a..7bd4bf7ea 100644 --- a/app/views/request/_other_describe_state.rhtml +++ b/app/views/request/_other_describe_state.rhtml @@ -1,60 +1,60 @@ <% form_for(:incoming_message, @info_request, :url => describe_state_url(:id => @info_request.id)) do |f| %> - <h2>Hi! We need your help. The person who made the following request - hasn't told us whether or not it was successful. Would you mind taking + <h2><%= _('Hi! We need your help. The person who made the following request + hasn\'t told us whether or not it was successful. Would you mind taking a moment to read it and help us keep the place tidy for everyone? - Thanks.</h2> + Thanks.') %></h2> <hr> <!------------------------------------------------> <% if @info_request.described_state != 'internal_review' %> <div> <%= radio_button "incoming_message", "described_state", "waiting_response", :id => 'waiting_response' + id_suffix %> - <label for="waiting_response<%=id_suffix%>"><strong>No response</strong> has been received - <small>(maybe there's just an acknowledgement)</small></label> + <label for="waiting_response<%=id_suffix%>"><%= _('<strong>No response</strong> has been received + <small>(maybe there\'s just an acknowledgement)</small>') %></label> </div> <% end %> <% if @info_request.described_state == 'internal_review' %> <div> <%= radio_button "incoming_message", "described_state", "internal_review", :id => 'internal_review' + id_suffix %> - <label for="internal_review<%=id_suffix%>">Still awaiting an <strong>internal review</strong></label> + <label for="internal_review<%=id_suffix%>"><%= _('Still awaiting an <strong>internal review</strong>') %></label> </div> <% end %> <% if @info_request.described_state != 'internal_review' %> <div> <%= radio_button "incoming_message", "described_state", "waiting_clarification", :id => 'waiting_clarification' + id_suffix %> - <label for="waiting_clarification<%=id_suffix%>"><strong>Clarification</strong> has been requested</label> + <label for="waiting_clarification<%=id_suffix%>"><%= _('<strong>Clarification</strong> has been requested') %></label> </div> <% end %> <div> <%= radio_button "incoming_message", "described_state", "gone_postal", :id => 'gone_postal' + id_suffix %> - <label for="gone_postal<%=id_suffix%>">A response will be sent <strong>by post</strong></label> + <label for="gone_postal<%=id_suffix%>"><%= _('A response will be sent <strong>by post</strong>') %></label> </div> <hr> <!------------------------------------------------> <% if @info_request.described_state == 'internal_review' %> - <p>The <strong>review has finished</strong> and overall:</p> + <p><%= _('The <strong>review has finished</strong> and overall:') %></p> <% end %> <div> <%= radio_button "incoming_message", "described_state", "not_held", :id => 'not_held' + id_suffix %> - <label for="not_held<%=id_suffix%>">The authority do <strong>not have</strong> the information <small>(maybe they say who does)</small></label> + <label for="not_held<%=id_suffix%>"><%= _('The authority do <strong>not have</strong> the information <small>(maybe they say who does)') %></small></label> </div> <div> <%= radio_button "incoming_message", "described_state", "partially_successful", :id => 'partially_successful' + id_suffix %> - <label for="partially_successful<%=id_suffix%>"><strong>Some of the information</strong> has been sent </label> + <label for="partially_successful<%=id_suffix%>"><%= _('<strong>Some of the information</strong> has been sent ') %></label> </div> <div> <%= radio_button "incoming_message", "described_state", "successful", :id => 'successful' + id_suffix %> - <label for="successful<%=id_suffix%>"><strong>All the information</strong> has been sent</label> + <label for="successful<%=id_suffix%>"><%= _('<strong>All the information</strong> has been sent') %></label> </div> <div> <%= radio_button "incoming_message", "described_state", "rejected", :id => 'rejected' + id_suffix %> - <label for="rejected<%=id_suffix%>">The request has been <strong>refused</strong></label> + <label for="rejected<%=id_suffix%>"><%= _('The request has been <strong>refused</strong>') %></label> </div> <hr> <!------------------------------------------------> @@ -62,7 +62,7 @@ <div> <%= radio_button "incoming_message", "described_state", "error_message", :id => 'error_message' + id_suffix %> <label for="error_message<%=id_suffix%>"> - An <strong>error message</strong> has been received + <%= _('An <strong>error message</strong> has been received') %> </label> </div> diff --git a/app/views/request/followup_bad.rhtml b/app/views/request/followup_bad.rhtml index 670139211..306eddd10 100644 --- a/app/views/request/followup_bad.rhtml +++ b/app/views/request/followup_bad.rhtml @@ -21,8 +21,7 @@ an email which will go to the right place, please <a href="%s">send it to us</a>.') % [help_contact_path] %> </p> <% elsif @reason == 'bad_contact' %> - <p><%= _('We do not have a working') %> <%=h @info_request.law_used_full %> - <%= _('address for') %> <%=h @info_request.public_body.name %>. <%= _('You may be able to find + <p><%= _('We do not have a working {{law_used_full}} address for {{public_body_name}}.',:law_used_full=>h(@info_request.law_used_full),:public_body_name=>h(@info_request.public_body.name)) %> <%= _('You may be able to find one on their website, or by phoning them up and asking. If you manage to find one, then please <a href="%s">send it to us</a>.') % [help_contact_path] %> </p> diff --git a/app/views/request_mailer/comment_on_alert.rhtml b/app/views/request_mailer/comment_on_alert.rhtml index b1650318d..46cee3b1a 100644 --- a/app/views/request_mailer/comment_on_alert.rhtml +++ b/app/views/request_mailer/comment_on_alert.rhtml @@ -1,6 +1,6 @@ -<%=@comment.user.name%> has annotated your <%=@info_request.law_used_short%> -request. Follow this link to see what they wrote. +<%= _('{{user_name}} has annotated your {{law_used_short}} +request. Follow this link to see what they wrote.',:user_name=>@comment.user.name,:law_used_short=>@info_request.law_used_short) %> <%=@url%> --- the WhatDoTheyKnow team +-- <%= _('the WhatDoTheyKnow team') %> diff --git a/app/views/request_mailer/comment_on_alert_plural.rhtml b/app/views/request_mailer/comment_on_alert_plural.rhtml index fd202cc2f..3871a9598 100644 --- a/app/views/request_mailer/comment_on_alert_plural.rhtml +++ b/app/views/request_mailer/comment_on_alert_plural.rhtml @@ -2,6 +2,6 @@ <%=@url%> --- the WhatDoTheyKnow team +-- <%= _('the WhatDoTheyKnow team') %> diff --git a/app/views/request_mailer/new_response.rhtml b/app/views/request_mailer/new_response.rhtml index 2c58d154e..c3e979cd6 100644 --- a/app/views/request_mailer/new_response.rhtml +++ b/app/views/request_mailer/new_response.rhtml @@ -12,6 +12,6 @@ contains any useful information.' )%> <%= _('Although all responses are automatically published, we depend on you, the original requester, to evaluate them.')%> --- the WhatDoTheyKnow team +-- <%= _('the WhatDoTheyKnow team') %> diff --git a/app/views/request_mailer/new_response_reminder_alert.rhtml b/app/views/request_mailer/new_response_reminder_alert.rhtml index 5d0e08a98..cde7851db 100644 --- a/app/views/request_mailer/new_response_reminder_alert.rhtml +++ b/app/views/request_mailer/new_response_reminder_alert.rhtml @@ -4,6 +4,7 @@ <%= _('Your request was called {{info_request}}. Letting everyone know whether you got the information will help us keep tabs on',:info_request=>@info_request.title)%> <%= @info_request.public_body.name %>. --- the WhatDoTheyKnow team + +-- <%= _('the WhatDoTheyKnow team') %> diff --git a/app/views/request_mailer/not_clarified_alert.rhtml b/app/views/request_mailer/not_clarified_alert.rhtml index f6d625555..2e6cf6a05 100644 --- a/app/views/request_mailer/not_clarified_alert.rhtml +++ b/app/views/request_mailer/not_clarified_alert.rhtml @@ -6,4 +6,4 @@ <%= _('You will only get an answer to your request if you follow up with the clarification.')%> --- the WhatDoTheyKnow team +-- <%= _('the WhatDoTheyKnow team') %> diff --git a/app/views/request_mailer/old_unclassified_updated.rhtml b/app/views/request_mailer/old_unclassified_updated.rhtml index 9112e72a4..69f54323d 100644 --- a/app/views/request_mailer/old_unclassified_updated.rhtml +++ b/app/views/request_mailer/old_unclassified_updated.rhtml @@ -9,5 +9,5 @@ you believe to be more accurate.',:law_used_full=>@info_request.law_used_full,:t <%= @url %> --- the WhatDoTheyKnow team +-- <%= _('the WhatDoTheyKnow team') %> diff --git a/app/views/request_mailer/overdue_alert.rhtml b/app/views/request_mailer/overdue_alert.rhtml index 13f3e2853..65ae207a2 100644 --- a/app/views/request_mailer/overdue_alert.rhtml +++ b/app/views/request_mailer/overdue_alert.rhtml @@ -6,6 +6,6 @@ <%=@url%> --- the WhatDoTheyKnow team +-- <%= _('the WhatDoTheyKnow team') %> diff --git a/app/views/request_mailer/requires_admin.rhtml b/app/views/request_mailer/requires_admin.rhtml index 51d874b85..acd37f405 100644 --- a/app/views/request_mailer/requires_admin.rhtml +++ b/app/views/request_mailer/requires_admin.rhtml @@ -6,6 +6,6 @@ email to let them know what you are going to do about it.')%> Request '<%=@info_request.title%>': <%= @url %> -Administration URL: +<%= _('Administration URL:') %> <%= @admin_url %> --------------------------------------------------------------------- diff --git a/app/views/request_mailer/stopped_responses.rhtml b/app/views/request_mailer/stopped_responses.rhtml index 7032468e9..eb53cee1c 100644 --- a/app/views/request_mailer/stopped_responses.rhtml +++ b/app/views/request_mailer/stopped_responses.rhtml @@ -13,7 +13,7 @@ email {{contact_email}} for help.',:user=>@info_request.user.name,:contact_email <%= _('Your original message is attached.')%> --- the WhatDoTheyKnow team +-- <%= _('the WhatDoTheyKnow team') %> diff --git a/app/views/request_mailer/very_overdue_alert.rhtml b/app/views/request_mailer/very_overdue_alert.rhtml index 06a418a15..e61b3a206 100644 --- a/app/views/request_mailer/very_overdue_alert.rhtml +++ b/app/views/request_mailer/very_overdue_alert.rhtml @@ -8,4 +8,4 @@ review, asking them to find out why response to the request has been so slow.',: <%=@url%> --- the WhatDoTheyKnow team +-- <%= _('the WhatDoTheyKnow team') %> diff --git a/app/views/user/set_crop_profile_photo.rhtml b/app/views/user/set_crop_profile_photo.rhtml index 9ca162144..33b78e193 100644 --- a/app/views/user/set_crop_profile_photo.rhtml +++ b/app/views/user/set_crop_profile_photo.rhtml @@ -1,9 +1,9 @@ -<% @title = "Change profile photo" %> +<% @title = _("Change profile photo") %> <% @profile_photo_javascript = true %> <% raise "internal error" if not @user %> -<h2>Crop your profile photo</h2> +<h2><%= _('Crop your profile photo') %></h2> <%= foi_error_messages_for :set_profile_photo %> diff --git a/app/views/user/show.rhtml b/app/views/user/show.rhtml index 49c4b07d1..09bf3de5f 100644 --- a/app/views/user/show.rhtml +++ b/app/views/user/show.rhtml @@ -59,7 +59,7 @@ <h1> <%= h(@display_user.name) + (@is_you ? _(" (you)") : "") %></h1> <p class="subtitle"> - <%= _('Joined WhatDoTheyKnow')%>in <%= year_from_date(@display_user.created_at) %> + <%= _('Joined WhatDoTheyKnow in') %> <%= year_from_date(@display_user.created_at) %> <% if !@user.nil? && @user.admin_page_links? %> (<%= link_to "admin", user_admin_url(@display_user) %>) <% end %> diff --git a/app/views/user_mailer/already_registered.rhtml b/app/views/user_mailer/already_registered.rhtml index f71610d6f..3bdb3d04b 100644 --- a/app/views/user_mailer/already_registered.rhtml +++ b/app/views/user_mailer/already_registered.rhtml @@ -8,4 +8,4 @@ Please click on the link below.')%> <%=@reasons[:email]%> <%=@url%> --- the WhatDoTheyKnow team +-- <%= _('the WhatDoTheyKnow team') %> diff --git a/app/views/user_mailer/changeemail_already_used.rhtml b/app/views/user_mailer/changeemail_already_used.rhtml index 581e8af06..011c6ee81 100644 --- a/app/views/user_mailer/changeemail_already_used.rhtml +++ b/app/views/user_mailer/changeemail_already_used.rhtml @@ -6,4 +6,4 @@ the email address ')%><%=@new_email%>. <%= _('The accounts have been left as they previously were.')%> --- the WhatDoTheyKnow team +-- <%= _('the WhatDoTheyKnow team') %> diff --git a/app/views/user_mailer/changeemail_confirm.rhtml b/app/views/user_mailer/changeemail_confirm.rhtml index 7af096aa1..b7eff308d 100644 --- a/app/views/user_mailer/changeemail_confirm.rhtml +++ b/app/views/user_mailer/changeemail_confirm.rhtml @@ -9,4 +9,4 @@ from ')%><%=@old_email%> <%= _('to ')%><%=@new_email%> <%= _('We will not reveal your email addresses to anybody unless you or the law tell us to.')%> --- the WhatDoTheyKnow team +-- <%= _('the WhatDoTheyKnow team') %> diff --git a/app/views/user_mailer/confirm_login.rhtml b/app/views/user_mailer/confirm_login.rhtml index fdc038d67..b68e9abb1 100644 --- a/app/views/user_mailer/confirm_login.rhtml +++ b/app/views/user_mailer/confirm_login.rhtml @@ -8,4 +8,4 @@ <%= _('We will not reveal your email address to anybody unless you or the law tell us to.')%> --- the WhatDoTheyKnow team +-- <%= _('the WhatDoTheyKnow team') %> |