<p dir="auto">This PR changes the about and copyright pages to use <code class="notranslate">I18n.with_locale</code> blocks, instead of using <code class="notranslate">:locale</code> overrides on each translation.</p>
<p dir="auto">This makes it slightly less verbose, and slightly easier to get right when adding additional translations to these sections. But more importantly, it makes it much less verbose when using interpolated translations, e.g.</p>
<div class="highlight highlight-text-html-erb notranslate position-relative overflow-auto" dir="auto" data-snippet-clipboard-copy-content="<%= t ".foo_html", :locale => @locale,
:first_link => link_to(t(".bar", :locale => @locale), t(".bar_url", :locale => @locale)),
:second_link => link_to(t(".baz", :locale => @locale), t(".baz_url", :locale => @locale)),
... etc ..."><pre class="notranslate"><span class="pl-k"><%=</span> <span class="pl-en">t</span> <span class="pl-s">".foo_html"</span><span class="pl-kos">,</span> <span class="pl-pds">:locale</span> <span class="pl-c1">=></span> <span class="pl-c1">@locale</span><span class="pl-kos">,</span>
<span class="pl-pds">:first_link</span> <span class="pl-c1">=></span> <span class="pl-en">link_to</span><span class="pl-kos">(</span><span class="pl-en">t</span><span class="pl-kos">(</span><span class="pl-s">".bar"</span><span class="pl-kos">,</span> <span class="pl-pds">:locale</span> <span class="pl-c1">=></span> <span class="pl-c1">@locale</span><span class="pl-kos">)</span><span class="pl-kos">,</span> <span class="pl-en">t</span><span class="pl-kos">(</span><span class="pl-s">".bar_url"</span><span class="pl-kos">,</span> <span class="pl-pds">:locale</span> <span class="pl-c1">=></span> <span class="pl-c1">@locale</span><span class="pl-kos">)</span><span class="pl-kos">)</span><span class="pl-kos">,</span>
<span class="pl-pds">:second_link</span> <span class="pl-c1">=></span> <span class="pl-en">link_to</span><span class="pl-kos">(</span><span class="pl-en">t</span><span class="pl-kos">(</span><span class="pl-s">".baz"</span><span class="pl-kos">,</span> <span class="pl-pds">:locale</span> <span class="pl-c1">=></span> <span class="pl-c1">@locale</span><span class="pl-kos">)</span><span class="pl-kos">,</span> <span class="pl-en">t</span><span class="pl-kos">(</span><span class="pl-s">".baz_url"</span><span class="pl-kos">,</span> <span class="pl-pds">:locale</span> <span class="pl-c1">=></span> <span class="pl-c1">@locale</span><span class="pl-kos">)</span><span class="pl-kos">)</span><span class="pl-kos">,</span>
... <span class="pl-en">etc</span> ...
<span class="pl-k"></span></pre></div>
<p dir="auto">vs</p>
<div class="highlight highlight-text-html-erb notranslate position-relative overflow-auto" dir="auto" data-snippet-clipboard-copy-content="<% I18n.with_locale @locale do %>
<%= t ".foo_html", :first_link => link_to(t(".bar"), t(".bar_url")),
:second_link => link_to(t(".baz", t(".baz_url"))
... etc ..."><pre class="notranslate"><span class="pl-k"><%</span> <span class="pl-v">I18n</span><span class="pl-kos">.</span><span class="pl-en">with_locale</span> <span class="pl-c1">@locale</span> <span class="pl-k">do</span> <span class="pl-k">%></span><span class="pl-k"></span>
<span class="pl-k"> <%=</span> <span class="pl-en">t</span> <span class="pl-s">".foo_html"</span><span class="pl-kos">,</span> <span class="pl-pds">:first_link</span> <span class="pl-c1">=></span> <span class="pl-en">link_to</span><span class="pl-kos">(</span><span class="pl-en">t</span><span class="pl-kos">(</span><span class="pl-s">".bar"</span><span class="pl-kos">)</span><span class="pl-kos">,</span> <span class="pl-en">t</span><span class="pl-kos">(</span><span class="pl-s">".bar_url"</span><span class="pl-kos">)</span><span class="pl-kos">)</span><span class="pl-kos">,</span>
<span class="pl-pds">:second_link</span> <span class="pl-c1">=></span> <span class="pl-en">link_to</span><span class="pl-kos">(</span><span class="pl-en">t</span><span class="pl-kos">(</span><span class="pl-s">".baz"</span><span class="pl-kos">,</span> <span class="pl-en">t</span><span class="pl-kos">(</span><span class="pl-s">".baz_url"</span><span class="pl-kos">)</span><span class="pl-kos">)</span>
... <span class="pl-en">etc</span> ...
<span class="pl-k"></span></pre></div>
<p dir="auto">The <code class="notranslate">with_locale</code> setting also applies to partials used within the block, so the override is no longer needed there. The indentation fix commit makes it a bit easier to understand the logic at the top of the copyright page, and is a historic whitespace issue.</p>
<hr>
<h4>You can view, comment on, or merge this pull request online at:</h4>
<p> <a href='https://github.com/openstreetmap/openstreetmap-website/pull/3982'>https://github.com/openstreetmap/openstreetmap-website/pull/3982</a></p>
<h4>Commit Summary</h4>
<ul>
<li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/3982/commits/a91afa0e78a5fa3e54aee38ec64c43fcea0b7abb" class="commit-link">a91afa0</a> Use .with_locale for about page</li>
<li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/3982/commits/031b767b0dc05c190945dbe68f074cc8059605ca" class="commit-link">031b767</a> Use with_locale for the copyright page</li>
<li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/3982/commits/d54f697c74fc37843117da48a629e4490b549872" class="commit-link">d54f697</a> Fix indentation</li>
</ul>
<h4 style="display: inline-block">File Changes </h4> <p style="display: inline-block">(<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3982/files">4 files</a>)</p>
<ul>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3982/files#diff-974f51a98574cf4fb44fa863ad955eb790c32ebcef5e99ff691a95d72f34cde5">app/views/site/_about_section.html.erb</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3982/files#diff-20b1b4068a14bbb692bf60b143f2cd17d495893dbd397e41eadeb732056341d7">app/views/site/about.html.erb</a>
(71)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3982/files#diff-6d1c2a3c013c9bfb7a5d14e48aaf10688765c4433ed14ca6932786c5cfd09d65">app/views/site/copyright.html.erb</a>
(90)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3982/files#diff-9f03db15fcff47ba34e79c28103e35c66caf837939a1268a6f6103f9b2eefea0">test/controllers/site_controller_test.rb</a>
(5)
</li>
</ul>
<h4>Patch Links:</h4>
<ul>
<li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/3982.patch'>https://github.com/openstreetmap/openstreetmap-website/pull/3982.patch</a></li>
<li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/3982.diff'>https://github.com/openstreetmap/openstreetmap-website/pull/3982.diff</a></li>
</ul>
<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />Reply to this email directly, <a href="https://github.com/openstreetmap/openstreetmap-website/pull/3982">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AAK2OLI3BRTORH2FBCB276TW5LIOFANCNFSM6AAAAAAWDT5FXA">unsubscribe</a>.<br />You are receiving this because you are subscribed to this thread.<img src="https://github.com/notifications/beacon/AAK2OLIMNGA65RXRGYI53LTW5LIOFA5CNFSM6AAAAAAWDT5FXCWGG33NNVSW45C7OR4XAZNFJFZXG5LFVJRW63LNMVXHIX3JMTHGC64ZDQ.gif" height="1" width="1" alt="" /><span style="color: transparent; font-size: 0; display: none; visibility: hidden; overflow: hidden; opacity: 0; width: 0; height: 0; max-width: 0; max-height: 0; mso-hide: all">Message ID: <span><openstreetmap/openstreetmap-website/pull/3982</span><span>@</span><span>github</span><span>.</span><span>com></span></span></p>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/openstreetmap/openstreetmap-website/pull/3982",
"url": "https://github.com/openstreetmap/openstreetmap-website/pull/3982",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>