From 8d45f1a5cfa3fa399645a50987fe06b443a9fcd0 Mon Sep 17 00:00:00 2001
From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 25 Apr 2018 16:04:34 +0800
Subject: [PATCH 1/1] Use lazy lookups for site translations

---
 app/views/site/_markdown_help.html.erb | 28 +++++++++++++-------------
 app/views/site/edit.html.erb           |  6 +++---
 app/views/site/key.html.erb            |  2 +-
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/views/site/_markdown_help.html.erb b/app/views/site/_markdown_help.html.erb
index 7c5639912..aeb3a1be5 100644
--- a/app/views/site/_markdown_help.html.erb
+++ b/app/views/site/_markdown_help.html.erb
@@ -1,26 +1,26 @@
-<h4 class='heading'><%= t "site.markdown_help.title_html" %></h4>
+<h4 class='heading'><%= t ".title_html" %></h4>
 <ul>
   <li>
-    <h4><%= t "site.markdown_help.headings" %></h4>
-    <p># <%= t "site.markdown_help.heading" %><br>
-       ## <%= t "site.markdown_help.subheading" %></p>
+    <h4><%= t ".headings" %></h4>
+    <p># <%= t ".heading" %><br>
+       ## <%= t ".subheading" %></p>
   </li>
   <li>
-    <h4><%= t "site.markdown_help.unordered" %></h4>
-    <p>* <%= t "site.markdown_help.first" %><br>
-       * <%= t "site.markdown_help.second" %></p>
+    <h4><%= t ".unordered" %></h4>
+    <p>* <%= t ".first" %><br>
+       * <%= t ".second" %></p>
   </li>
   <li>
-    <h4><%= t "site.markdown_help.ordered" %></h4>
-    <p>1. <%= t "site.markdown_help.first" %><br>
-       2. <%= t "site.markdown_help.second" %></p>
+    <h4><%= t ".ordered" %></h4>
+    <p>1. <%= t ".first" %><br>
+       2. <%= t ".second" %></p>
   </li>
   <li>
-    <h4><%= t "site.markdown_help.link" %></h4>
-    <span>[<%= t "site.markdown_help.text" %>](<%= t "site.markdown_help.url" %>)</span>
+    <h4><%= t ".link" %></h4>
+    <span>[<%= t ".text" %>](<%= t ".url" %>)</span>
   </li>
   <li>
-    <h4><%= t "site.markdown_help.image" %></h4>
-    <span>![<%= t "site.markdown_help.alt" %>](<%= t "site.markdown_help.url" %>)</span>
+    <h4><%= t ".image" %></h4>
+    <span>![<%= t ".alt" %>](<%= t ".url" %>)</span>
   </li>
 </ul>
diff --git a/app/views/site/edit.html.erb b/app/views/site/edit.html.erb
index 81095140e..e84adf2d4 100644
--- a/app/views/site/edit.html.erb
+++ b/app/views/site/edit.html.erb
@@ -4,9 +4,9 @@
   <% elsif STATUS == :database_readonly or STATUS == :api_readonly %>
     <p><%= t 'layouts.osm_read_only' %></p>
   <% elsif !current_user.data_public? %>
-    <p><%= t 'site.edit.not_public' %></p>
-    <p><%= raw t 'site.edit.not_public_description', :user_page => (link_to t('site.edit.user_page_link'), {:controller => 'user', :action => 'account', :display_name => current_user.display_name, :anchor => 'public'}) %></p>
-    <p><%= raw t 'site.edit.anon_edits', :link => link_to(t('site.edit.anon_edits_link_text'), t('site.edit.anon_edits_link')) %></p>
+    <p><%= t '.not_public' %></p>
+    <p><%= raw t '.not_public_description', :user_page => (link_to t('.user_page_link'), {:controller => 'user', :action => 'account', :display_name => current_user.display_name, :anchor => 'public'}) %></p>
+    <p><%= raw t 'site.edit.anon_edits', :link => link_to(t('.anon_edits_link_text'), t('.anon_edits_link')) %></p>
   <% else %>
     <%= render :partial => preferred_editor %>
   <% end %>
diff --git a/app/views/site/key.html.erb b/app/views/site/key.html.erb
index 039c9a51c..91dfd1250 100644
--- a/app/views/site/key.html.erb
+++ b/app/views/site/key.html.erb
@@ -7,7 +7,7 @@
             <%= image_tag "key/#{name}/#{entry['image']}" %>
           </td>
           <td class="mapkey-table-value">
-            <%= [*t("site.key.table.entry.#{entry['name']}")].to_sentence %>
+            <%= [*t(".table.entry.#{entry['name']}")].to_sentence %>
           </td>
         </tr>
       <% end %>
-- 
2.43.2