From 1d5ba57c4943c804486ab2891ae5e73a6c798a4d Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 15 Mar 2023 18:13:56 +0000 Subject: [PATCH 1/2] Remove the language block from around the guidance This was unnecessary and also incorrect. The guidance is shown in the users own language, not in the @locale of the copyright statement, and so doesn't need any language wrapping and certainly not stating that it's in the @locale. --- app/views/site/copyright.html.erb | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/app/views/site/copyright.html.erb b/app/views/site/copyright.html.erb index 3253aebe1..903838461 100644 --- a/app/views/site/copyright.html.erb +++ b/app/views/site/copyright.html.erb @@ -3,19 +3,17 @@ <% if t(".legal_babble", :locale => I18n.locale) != t(".legal_babble", :locale => :en) %> - <%= tag.div :lang => @locale, :dir => t("html.dir", :locale => @locale) do %> -

<%= t ".native.title" %>

-

- <%= t ".native.html", - :native_link => link_to(t(".native.native_link"), - :controller => "site", - :action => "copyright", - :copyright_locale => nil), - :mapping_link => link_to(t(".native.mapping_link"), - :controller => "site", - :action => "index") %> -

- <% end %> +

<%= t ".native.title" %>

+

+ <%= t ".native.html", + :native_link => link_to(t(".native.native_link"), + :controller => "site", + :action => "copyright", + :copyright_locale => nil), + :mapping_link => link_to(t(".native.mapping_link"), + :controller => "site", + :action => "index") %> +


<% end %> <% else %> From 473d425c10862824ffdaa21f9ed68a9e9f33bc0e Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 15 Mar 2023 18:45:41 +0000 Subject: [PATCH 2/2] Remove the language block from around the original guidance The guidance is shown in the user's own language, not in english. --- app/views/site/copyright.html.erb | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/app/views/site/copyright.html.erb b/app/views/site/copyright.html.erb index 903838461..f8ea248b5 100644 --- a/app/views/site/copyright.html.erb +++ b/app/views/site/copyright.html.erb @@ -19,16 +19,14 @@ <% else %> <% if t(".legal_babble", :locale => @locale) != t(".legal_babble", :locale => :en) %> - <%= tag.div :lang => "en", :dir => t("html.dir", :locale => "en") do %> -

<%= t ".foreign.title" %>

-

- <%= t ".foreign.html", - :english_original_link => link_to(t(".foreign.english_link"), - :controller => "site", - :action => "copyright", - :copyright_locale => "en") %> -

- <% end %> +

<%= t ".foreign.title" %>

+

+ <%= t ".foreign.html", + :english_original_link => link_to(t(".foreign.english_link"), + :controller => "site", + :action => "copyright", + :copyright_locale => "en") %> +


<% end %> <% end %>