diff options
21 files changed, 63 insertions, 90 deletions
diff --git a/app/views/comment/_comment_form.rhtml b/app/views/comment/_comment_form.rhtml index 011393256..8ca30324c 100644 --- a/app/views/comment/_comment_form.rhtml +++ b/app/views/comment/_comment_form.rhtml @@ -14,7 +14,7 @@ <%= hidden_field_tag 'submitted_comment', 1 %> <%= hidden_field_tag 'preview', 1 %> <%= submit_tag _('Preview your annotation') %> - <%= _(' (<strong>no ranty</strong> politics, read our <a href="%s">moderation policy</a>)' % [help_requesting '#moderation'] %> + <%= _(' (<strong>no ranty</strong> politics, read our <a href="%s">moderation policy</a>)') % [help_requesting_path+'#moderation'] %> </p> <% end %> diff --git a/app/views/comment/_single_comment.rhtml b/app/views/comment/_single_comment.rhtml index 71ddd04cb..5b37db41a 100644 --- a/app/views/comment/_single_comment.rhtml +++ b/app/views/comment/_single_comment.rhtml @@ -7,8 +7,7 @@ <h2> <%# When not logged in, but mid-comment-leaving, there'll be no comment.user %> - <%= comment.user ? user_link(comment.user) : "You" %> - left an annotation (<%= simple_date(comment.created_at || Time.now) %>) + <%= comment.user ? user_link(comment.user) : _("You") %> <%= _("left an annotation") (<%= simple_date(comment.created_at || Time.now) %>) </h2> <div class="comment_in_request_text"> <p> diff --git a/app/views/general/exception_caught.rhtml b/app/views/general/exception_caught.rhtml index 44d5803de..61337494d 100644 --- a/app/views/general/exception_caught.rhtml +++ b/app/views/general/exception_caught.rhtml @@ -1,13 +1,13 @@ -<h1>Sorry, we couldn't find that page</h1> +<h1><%= _("Sorry, we couldn't find that page") %></h1> -<p>The page either doesn't exist, or is broken. Things you can try now:</p> +<p><%= _("The page either doesn't exist, or is broken. Things you can try now:")%></p> <ul> -<li>Check for mistakes if you typed or copied the address.</li> -<li>Search the site to find what you were looking for. +<li><%= _("Check for mistakes if you typed or copied the address.")%></li> +<li><%= _("Search the site to find what you were looking for.")%> <% form_tag({:controller => "general", :action => "search_redirect"}, {:id => "search_form"}) do %> <%= text_field_tag 'query', params[:query], { :size => 30 } %> - <%= submit_tag "Search" %> + <%= submit_tag _("Search") %> <% end %> </li> <li><a href="/help/contact">Contact us</a> to tell us about @@ -15,4 +15,4 @@ <li>Go to our <a href="/">front page</a></li> </ul> -<p id="error_technical_details"><strong>Technical details:</strong> <%=@exception_class ? @exception_class : "Unknown"%></p> +<p id="error_technical_details"><%= _("<strong>Technical details:</strong>")%> <%=@exception_class ? @exception_class : _("Unknown")%></p> diff --git a/app/views/general/frontpage.rhtml b/app/views/general/frontpage.rhtml index 276ac70a7..dbed2f0e9 100644 --- a/app/views/general/frontpage.rhtml +++ b/app/views/general/frontpage.rhtml @@ -30,13 +30,11 @@ <div id="frontpage_examples"> <% if @popular_bodies.size > 0 %> <div id="examples_0"> - <ul> <% for popular_body in @popular_bodies %> - <li><%=public_body_link(popular_body)%> - <%= n_('%d request', '%d requests', popular_body.info_requests.count) % popular_body.info_requests.count %> + <li><%=public_body_link(popular_body)%> + <%= n_('%d request', '%d requests', popular_body.info_requests.count) % popular_body.info_requests.count %> </li> <% end%> - </ul> <p><strong> <%= link_to _('More authorities...'), list_public_bodies_default %> </strong></p> diff --git a/app/views/outgoing_mailer/followup.rhtml b/app/views/outgoing_mailer/followup.rhtml index 361a819a2..82f8afcfc 100644 --- a/app/views/outgoing_mailer/followup.rhtml +++ b/app/views/outgoing_mailer/followup.rhtml @@ -3,11 +3,11 @@ <%= @outgoing_message.quoted_part_to_append_to_email.strip %> ------------------------------------------------------------------- -Disclaimer: This message and any reply that you make will be published on the internet. Our privacy and copyright policies: +<%= _('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 -Please use this email address for all replies to this request: +<%= _('Please use this email address for all replies to this request:')%> <%= @info_request.incoming_email %> -If you find WhatDoTheyKnow useful as an FOI officer, please ask your web manager to suggest us on your organisation's FOI page. +<%= _('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/outgoing_mailer/initial_request.rhtml b/app/views/outgoing_mailer/initial_request.rhtml index e0acdb4a0..b0907763c 100644 --- a/app/views/outgoing_mailer/initial_request.rhtml +++ b/app/views/outgoing_mailer/initial_request.rhtml @@ -1,14 +1,14 @@ <%= @outgoing_message.body.strip %> ------------------------------------------------------------------- -Disclaimer: This message and any reply that you make will be published on the internet. Our privacy and copyright policies: +<%= _('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 -Please use this email address for all replies to this request: +<%= _('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 -If you find WhatDoTheyKnow useful as an FOI officer, please ask your web manager to suggest us on your organisation's FOI page. +<%= _('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/public_body/show.rhtml b/app/views/public_body/show.rhtml index e152498d7..d3c299140 100644 --- a/app/views/public_body/show.rhtml +++ b/app/views/public_body/show.rhtml @@ -25,7 +25,9 @@ <h1><%=h(@public_body.name)%></h1> <p class="subtitle"> -<%=@public_body.type_of_authority(true)%><% if not @public_body.short_name.empty? %>, <%= _('also called {{public_body_short_name}}', :public_body_short_name => h(@public_body.short_name))%><% end %> +<%=@public_body.type_of_authority(true)%> +<% if not @public_body.short_name.empty? %>, +<%= _('also called {{public_body_short_name}}', :public_body_short_name => h(@public_body.short_name))%><% end %> <% if !@user.nil? && @user.admin_page_links? %> (<%= link_to _("admin"), public_body_admin_url(@public_body) %>) <% end %> @@ -43,7 +45,7 @@ <strong> <% if @public_body.is_requestable? || @public_body.not_requestable_reason == 'bad_contact' %> <% if @public_body.eir_only? %> - <%= link_to "Make a new Environmental Information request", new_request_to_body_url(:url_name => @public_body.url_name)%> to <%= h(@public_body.name) %> + <%= link_to _("Make a new Environmental Information request"), new_request_to_body_url(:url_name => @public_body.url_name)%> to <%= h(@public_body.name) %> <% else %> <%= _('<a href="%s">Make a new Freedom of Information request</a> to {{public_body_name}}', @@ -65,19 +67,19 @@ <% if !@xapian_requests.nil? %> <% if @xapian_requests.results.empty? %> <% if @public_body.eir_only? %> - <h2>Environmental Information Regulations requests made using this site</h2> - <h4>XXX this section needs localising re EIR as these are specific to UK law</h4> + <h2><%= _('Environmental Information Regulations requests made using this site') %></h2> + <h4><%= _('XXX this section needs localising re EIR as these are specific to UK law') %></h4> <p>Nobody has made any Environmental Information Regulations requests to <%=h(@public_body.name)%> using this site yet.</p> <% else %> - <h2> <%= _('Freedom of Information requests made using this site')%></h2> - <p> <%= _('Nobody has made any Freedom of Information requests to {{public_body_name}} using this site yet.', :public_body_name => h(@public_body.name))%></p> + <h2><%= _('Freedom of Information requests made using this site')%></h2> + <p><%= _('Nobody has made any Freedom of Information requests to {{public_body_name}} using this site yet.', :public_body_name => h(@public_body.name))%></p> <% end %> <% else %> <h2> <% if @public_body.eir_only? %> - <%=pluralize(@public_body.info_requests.size, "Environmental Information Regulations request") %> made using this site + <%= pluralize(@public_body.info_requests.size, "Environmental Information Regulations request made using this site") %> <% else %> - <%= n_('%d Freedom of Information request', '%d Freedom of Information requests', @public_body.info_requests.size) % @public_body.info_requests.size %> made using this site + <%= n_('%d Freedom of Information request', '%d Freedom of Information requests', @public_body.info_requests.size) % @public_body.info_requests.size %> made using this site <% end %> <%= @page_desc %> </h2> @@ -93,7 +95,7 @@ <% end %> <% else %> <% if @public_body.eir_only? %> - <h2>Environmental Information Regulations requests made</h2> + <h2><%= _('Environmental Information Regulations requests made') %></h2> <% else %> <h2> <%= _('Freedom of Information requests made')%></h2> <% end %> diff --git a/app/views/public_body/view_email.rhtml b/app/views/public_body/view_email.rhtml index 895b2c686..8725930b8 100644 --- a/app/views/public_body/view_email.rhtml +++ b/app/views/public_body/view_email.rhtml @@ -1,14 +1,13 @@ <% @title = "FOI email address for '" + h(@public_body.name) + "'" %> -<h1>FOI email address for '<%=public_body_link(@public_body)%>'</h1> +<h1><%= _('FOI email address for {{public_body}}',:public_body=> public_body_link(@public_body))%></h1> <p> <% if @public_body.is_requestable? %> - <%= _('WhatDoTheyKnow sends new requests to')%> <strong><%=h @public_body.request_email%></strong><% _(' for this authority.')%> +<%= _('WhatDoTheyKnow sends new requests to <strong>{{request_email}}</strong> for this authority.':request_email=> h(@public_body.request_email))%> <% else %> <% if @public_body.not_requestable_reason == 'not_apply' %> - <p><%= _('Freedom of Information law no longer applies to this authority. - Follow up messages to existing requests are sent to ')%><strong><%=h @public_body.request_email%></strong>. + <p><%= _('Freedom of Information law no longer applies to this authority.Follow up messages to existing requests are sent to ')%><strong><%=h @public_body.request_email%></strong>. </p> <% elsif @public_body.not_requestable_reason == 'defunct' %> <p><%=h @public_body.name %> no longer exists. diff --git a/app/views/public_body/view_email_captcha.rhtml b/app/views/public_body/view_email_captcha.rhtml index 95b50ddd8..67c07934f 100644 --- a/app/views/public_body/view_email_captcha.rhtml +++ b/app/views/public_body/view_email_captcha.rhtml @@ -1,9 +1,8 @@ -<% @title = "View FOI email address for '" + h(@public_body.name) + "'" %> +<% @title = _("View FOI email address for '{{public_body_name}}'",:public_body_name => h(@public_body.name)) %> <h1><%= _('View FOI email address for {{public_body_name}}',:public_body_name=>public_body_link(@public_body))%></h1> -<p><%= _('To view the email address that we use to send FOI requests to ')%><%=h @public_body.name%>, -<%= _('please enter these words.')%><p> +<p><%= _('To view the email address that we use to send FOI requests to {{@public_body_name}}, please enter these words.', :public_body_name => h(@public_body.name))%></p> <% form_for :contact do |f| %> <%= recaptcha_tags %> @@ -12,5 +11,3 @@ <p><%= submit_tag _("View email") %></p> <% end %> - - diff --git a/app/views/request/_after_actions.rhtml b/app/views/request/_after_actions.rhtml index aa0a95c67..a62724df6 100644 --- a/app/views/request/_after_actions.rhtml +++ b/app/views/request/_after_actions.rhtml @@ -6,8 +6,7 @@ <strong><%= _('Anyone:') %></strong> <ul> <li> - <%= link_to _('Add an annotation'), new_comment_url(:url_title => @info_request.url_title) %> - (<%= _('to help the requester or others') %>) + <%= _('<a href="%s">Add an annotation</a> (to help the requester or others)') % [new_comment_url(:url_title => @info_request.url_title)] %> </li> <% if @old_unclassified %> <li> @@ -18,7 +17,7 @@ </div> <div id="owner_actions"> - <strong><%=h @info_request.user.name %> <%= _('only:') %></strong> + <strong><%= _('{{info_request_user_name}} only:',:info_request_user_name=>h(@info_request.user.name)) %></strong> <ul> <li> <% if @last_response.nil? %> @@ -41,12 +40,11 @@ </div> <div id="public_body_actions"> - <strong><%=h @info_request.public_body.name %> <%= _('only:') %></strong> + <strong><%= _('{{public_body_name}} only:',:public_body_name=>h(@info_request.public_body.name) ) %> </strong> <ul> <li> <%= link_to _("Respond to request"), upload_response_url(:url_title => @info_request.url_title) %> </li> </ul> </div> - </div> diff --git a/app/views/request/_describe_state.rhtml b/app/views/request/_describe_state.rhtml index 5c2e113b8..b72f7711c 100644 --- a/app/views/request/_describe_state.rhtml +++ b/app/views/request/_describe_state.rhtml @@ -98,10 +98,8 @@ <%= render :partial => 'other_describe_state', :locals => {:id_suffix => id_suffix } %> <% else %> <%= _('We don\'t know whether the most recent response to this request contains - information or not') %> + information or not – -<%= _('if you are {{user_link}} please',:user_link=>user_link(@info_request.user)) %> - <%= link_to "sign in", signin_url(:r => request.request_uri) %> - <%= _('and let everyone know.') %> + if you are {{user_link}} please <a href="%s">sign in</a> and let everyone know.',:user_link=>user_link(@info_request.user)) % [signin_url(:r => request.request_uri)] %> <% end %> diff --git a/app/views/request/_followup.rhtml b/app/views/request/_followup.rhtml index 47857108d..393233682 100644 --- a/app/views/request/_followup.rhtml +++ b/app/views/request/_followup.rhtml @@ -14,8 +14,7 @@ <% if @info_request.allow_new_responses_from == 'nobody' %> <p><%= _('Follow ups and new responses to this request have been stopped to prevent spam. Please - <a href="%s">contact us</a> if you are') % [help_contact_path] %> <%= user_link(@info_request.user) %> - <%= _('and need to send a follow up.') %></p> + <a href="%s">contact us</a> if you are {{user_link}} and need to send a follow up.',:user_link=>user_link(@info_request.user) ) % [help_contact_path] %></p> <% else %> <% if @internal_review %> <p> @@ -27,9 +26,8 @@ <p> <%= _('Please <strong>only</strong> write messages directly relating to your - request') %> '<%= request_link(@info_request) %>'. <%= _('If you would like to ask for information - that was not in your original request, then') %> - <%= link_to _("file a new request"), new_request_to_body_url(:url_name => @info_request.public_body.url_name) %>. + request {{request_link}}. If you would like to ask for information + that was not in your original request, then <a href="%s">file a new request</a>.',:request_link=>request_link(@info_request)) % [new_request_to_body_url(:url_name => @info_request.public_body.url_name)] %> </p> <% status = @info_request.calculate_status %> @@ -40,7 +38,7 @@ <% if @info_request.public_body.is_school? %> <%= _('in term time') %> <% end %> - <%= _('by') %> <strong><%= simple_date(@info_request.date_response_required_by) %></strong> + <%= _('by <strong>{{date}}</strong>',:date=>simple_date(@info_request.date_response_required_by)) %> (<%= _('<a href="%s">details</a>') % ["#{help_requesting_path}#quickly_response"] %>). </p> diff --git a/app/views/request/_hidden_correspondence.rhtml b/app/views/request/_hidden_correspondence.rhtml index efed2975a..0ea6fcddd 100644 --- a/app/views/request/_hidden_correspondence.rhtml +++ b/app/views/request/_hidden_correspondence.rhtml @@ -8,26 +8,20 @@ <div class="correspondence" id="incoming-<%=incoming_message.id.to_s%>"> <p> <%= _('This response has been hidden. See annotations to find out why. - If you are the requester, then you may') %> - <%= link_to "sign in", signin_url(:r => request.request_uri) %> - <%= _('to view the response.') %> + If you are the requester, then you may <a href="%s">sign in</a> to view the response.') % [signin_url(:r => request.request_uri)] %> </p> </div> <% elsif [ 'sent', 'followup_sent', 'resent', 'followup_resent' ].include?(info_request_event.event_type) %> <div class="correspondence" id="outgoing-<%=outgoing_message.id.to_s%>"> <p> - <%= _('This outgoing message has been hidden. See annotations to - find out why. If you are the requester, then you may') %> <%= link_to - "sign in", signin_url(:r => request.request_uri) %> <%= _('to view the - response.') %> + <%= _('This outgoing message has been hidden. See annotations to + find out why. If you are the requester, then you may <a href="%s">sign in</a> to view the response.') % [signin_url(:r => request.request_uri)] %> </p> </div> <% elsif info_request_event.event_type == 'comment' %> <div class="comment_in_request" id="comment-<%=comment.id.to_s%>"> <p><%= _('This comment has been hidden. See annotations to - find out why. If you are the requester, then you may') %> <%= link_to - "sign in", signin_url(:r => request.request_uri) %> <%= _('to view the - response.') %> + find out why. If you are the requester, then you may <a href="%s">sign in</a> to view the response.') % [signin_url(:r => request.request_uri)]%> </p> </div> <% end %> diff --git a/app/views/request/_request_listing_short_via_event.rhtml b/app/views/request/_request_listing_short_via_event.rhtml index f47444bfe..cc2a5a162 100644 --- a/app/views/request/_request_listing_short_via_event.rhtml +++ b/app/views/request/_request_listing_short_via_event.rhtml @@ -5,8 +5,9 @@ end %> <div class="request_short_listing"> <h3><%= link_to highlight_words(info_request.title, @highlight_words), request_url(info_request) %></h3> <p> - <%= _('To') %> <%= public_body_link_absolute(info_request.public_body) %> - <%= _('by') %> <%= user_link_absolute(info_request.user) %>, + +<%= _('To {{public_body_link_absolute}}',:public_body_link_absolute => public_body_link_absolute(info_request.public_body))%> +<%= _('by {{user_link_absolute}}',:user_link_absolute => user_link_absolute(info_request.user))%> <%= simple_date(info_request.created_at) %> </p> </div> diff --git a/app/views/request/hidden.rhtml b/app/views/request/hidden.rhtml index 7ad6ad14d..a4afb63c6 100644 --- a/app/views/request/hidden.rhtml +++ b/app/views/request/hidden.rhtml @@ -12,9 +12,7 @@ various reasons why we might have done this, sorry we can\'t be more specific he </p> <% if @info_request.prominence == 'requester_only' %> <p> - <%= _('If you are the requester, then you may') %> - <%= link_to "sign in", signin_url(:r => request.request_uri) %> - <%= _('to view the request.') %> + <%= _('If you are the requester, then you may <a href="%s">sign in</a> to view the request.') % [signin_url(:r => request.request_uri)] %> </p> <% end %> diff --git a/app/views/request/new.rhtml b/app/views/request/new.rhtml index b4e4866f7..5925ca3fb 100644 --- a/app/views/request/new.rhtml +++ b/app/views/request/new.rhtml @@ -1,12 +1,11 @@ -<% @title = _("Make an ") + h(@info_request.law_used_short) + _(" request to '") + h(@info_request.public_body.name) + "'" %> +<% @title = _("Make an {{law_used_short}} request to '{{public_body_name}}'",:law_used_short=>h(@info_request.law_used_short),:public_body_name=>h(@info_request.public_body.name)) %> <% if @existing_request %> <div class="errorExplanation" id="errorExplanation"><ul> <li> - <%= user_or_you_capital_link(@existing_request.user) %> <%= _('already - created the same request on') %> <%=simple_date(@existing_request.created_at)%>. - <%= _('You can either view the <a href="{{existing_request}}">existing request</a>, - or edit the details below to make a new but similar request.',:existing_request=>request_url(@existing_request)) %> + <%= _('{{existing_request_user}} already + created the same request on {{date}}. You can either view the <a href="{{existing_request}}">existing request</a>, + or edit the details below to make a new but similar request.',:existing_request_user=>user_or_you_capital_link(@existing_request.user), :date=>simple_date(@existing_request.created_at), :existing_request=>request_url(@existing_request)) %> </li> </ul></div> <% end %> @@ -19,11 +18,9 @@ <li> <% form_tag("http://www.google.co.uk/search", {:id => "search_body_website_form", :method => "get"} ) do %> <p> - First, + <%= _('First,') %> <% if !@info_request.public_body.publication_scheme.empty? %> - <strong>browse</strong> <%= _('the authority\'s') %> - <%= link_to "publication scheme", @info_request.public_body.publication_scheme %> - <%= _('or <strong>search</strong> their web site ...') %> + <%= _('<strong>browse</strong> the authority\'s <a href="%s">publication scheme</a> or <strong>search</strong> their web site ...') % [@info_request.public_body.publication_scheme] %> <% else %> <%= _('<strong>search</strong> the authority\'s web site ...') %> <% end %> @@ -41,9 +38,7 @@ <li> <% if @info_request.public_body.info_requests.size > 0 %> - <%= _('Browse') %> <%= link_to "other requests", public_body_url(@info_request.public_body) %> - <%= _('to') %> '<%= h(@info_request.public_body.name) %>' - <%= _('for examples of how to word your request.') %> + <%= _("Browse <a href='%s'>other requests</a> to '{{public_body_name}}' for examples of how to word your request.", :public_body_name=>h(@info_request.public_body.name)) % [public_body_url(@info_request.public_body)] %> <% else %> <%= _('Browse <a href="%s">other requests</a> for examples of how to word your request.') % [request_list_url] %> <% end %> diff --git a/app/views/request/new_please_describe.rhtml b/app/views/request/new_please_describe.rhtml index a82321ec5..ce80f51f0 100644 --- a/app/views/request/new_please_describe.rhtml +++ b/app/views/request/new_please_describe.rhtml @@ -13,9 +13,7 @@ if they are successful yet or not.') %> </ul> <p> - <%= _('When you\'re done, <strong>come back here</strong>') %>, - <%= link_to "reload this page", request.request_uri %> - <%= _('and file your new request.') %> + <%= _('When you\'re done, <strong>come back here</strong>, <a href="%s">reload this page</a> and file your new request.') % [request.request_uri] %> </p> <p> diff --git a/app/views/request/show.rhtml b/app/views/request/show.rhtml index 9b6758312..ab8e3f93d 100644 --- a/app/views/request/show.rhtml +++ b/app/views/request/show.rhtml @@ -32,13 +32,11 @@ <% end %> <p class="subtitle"> - <%= user_link(@info_request.user) %> <%= _('made this') %> - <%=h @info_request.law_used_full%> - <%= _('request') %> + <%= _('{{user}} made this {{law_used_full}} request',:user=>user_link(@info_request.user), :law_used_full=>h(@info_request.law_used_full)) %> <% if !@user.nil? && @user.admin_page_links? %> (<%= link_to "admin", request_admin_url(@info_request) %>) <% end %> - <%= _('to') %> <%= public_body_link(@info_request.public_body) %> + <%= _('to {{public_body}}',:public_body=>public_body_link(@info_request.public_body)) %> </p> <p id="request_status" class="request_icon_line icon_<%= @info_request.calculate_status %>"> diff --git a/app/views/request/show_response.rhtml b/app/views/request/show_response.rhtml index 68c5fdf85..40c3b3d5b 100644 --- a/app/views/request/show_response.rhtml +++ b/app/views/request/show_response.rhtml @@ -65,7 +65,7 @@ <% end %> <% else %> <% if @incoming_message.recently_arrived %> - <h2>New response to <%=h(@info_request.law_used_short)%> request '<%= request_link @info_request %>'</h2> + <h2><%= _('New response to {{law_used_short}} request',:law_used_short => h(@info_request.law_used_short))%> '<%= request_link @info_request %>'</h2> <% else %> <h2>Response to <%=h(@info_request.law_used_short)%> request '<%= request_link @info_request %>'</h2> <% end %> diff --git a/app/views/user/show.rhtml b/app/views/user/show.rhtml index 17c3a77c6..49c4b07d1 100644 --- a/app/views/user/show.rhtml +++ b/app/views/user/show.rhtml @@ -101,7 +101,7 @@ <% if @is_you %> <p id="user_change_password_email"> <% if @display_user.profile_photo %> - <%= link_to _('Change profile photo')%>, set_profile_photo_url() %> | + <%= link_to _('Change profile photo'), set_profile_photo_url() %> | <% end %> <%= link_to _('Change your password'), signchangepassword_url() %> | <%= link_to _('Change your email'), signchangeemail_url() %> @@ -205,7 +205,7 @@ <%= track_thing.params[:list_description] %> <%= hidden_field_tag 'track_medium', "delete", { :id => 'track_medium_' + track_thing.id.to_s } %> <%= hidden_field_tag 'r', request.request_uri, { :id => 'r_' + track_thing.id.to_s } %> - <%= submit_tag <%= _('unsubscribe') %> + <%= submit_tag _('unsubscribe') %> </div> <% end %> </li> diff --git a/app/views/user/signchangepassword.rhtml b/app/views/user/signchangepassword.rhtml index b31757ba5..edb980b9f 100644 --- a/app/views/user/signchangepassword.rhtml +++ b/app/views/user/signchangepassword.rhtml @@ -1,4 +1,4 @@ -<% @title = _("Change your password on {{site_name}}', :site_name => site_name) %> +<% @title = _('Change your password on {{site_name}}', :site_name => site_name) %> <% raise "internal error" if not @user %> |