Extract public-site strings to i18n

The public views were never part of the admin extraction and were
broken in both directions: German visitors got "Featured", "Calendar"
and "Tags", English visitors got "Suchergebnisse für Suchbegriff:".
Also picks up the unlock-confirm message in link_helper, a straggler
from the revisions/menu_items batch, and drops two raw() calls in the
application layout in favour of link_to blocks.

11 files changed, 56 insertions, 49 deletions

diff --git a/app/helpers/link_helper.rb b/app/helpers/link_helper.rb
index 9b0b4e10..2121133e 100644
--- a/app/helpers/link_helper.rb
+++ b/app/helpers/link_helper.rb
@@ -39,9 +39,9 @@ module LinkHelper
   end
 
   def unlock_link
-    message = "Are you sure you want to unlock?\n" \
-      "Locked by #{@node.lock_owner.login}\n" \
-      "Last modified #{@page.updated_at.to_fs(:db)}"
+    message = t("admin.common.unlock_confirm",
+                :login => @node.lock_owner.login,
+                :time  => @page.updated_at.to_fs(:db))
     button_to 'Unlock', unlock_node_path(@node),
       method: :put,
       form: { data: { confirm: message }, class: 'button_to state_changing' }
diff --git a/app/views/content/_featured_articles.html.erb b/app/views/content/_featured_articles.html.erb
index 6717c51f..2dfc4967 100644
--- a/app/views/content/_featured_articles.html.erb
+++ b/app/views/content/_featured_articles.html.erb
@@ -1,5 +1,5 @@
 <div id="featured_articles">
-  <h2>Featured</h2>
+  <h2><%= t(".title") %></h2>
 
   <!-- %= link_to(
         image_tag( '34c3-tuwat.1e4e25c.png' ),
diff --git a/app/views/content/_front_page_calendar.html.erb b/app/views/content/_front_page_calendar.html.erb
index e7f46ba5..dc4ba884 100644
--- a/app/views/content/_front_page_calendar.html.erb
+++ b/app/views/content/_front_page_calendar.html.erb
@@ -1,5 +1,5 @@
 <div id="frontpage_calendar">
-  <h2>Calendar</h2>
+  <h2><%= t(".title") %></h2>
   <ul class="teasertext">
     <% occurrences.each do |occurrence| %>
       <li>
@@ -8,4 +8,4 @@
       </li>
     <% end %>
   </ul>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/content/_tags.html.erb b/app/views/content/_tags.html.erb
index f0e7210c..cf339b6f 100644
--- a/app/views/content/_tags.html.erb
+++ b/app/views/content/_tags.html.erb
@@ -1,6 +1,6 @@
 <% unless @page.nil? || @page.tags.empty? %>
 <div id="tags">
-  <h2>Tags</h2>
+  <h2><%= t(".title") %></h2>
   <ul class="teasertext">
     <% @page.tags.each do |tag| %>
       <li><%= link_to tag.name, tag_path(tag.name) %></li>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index f981fc11..f95ea889 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -37,7 +37,7 @@
           <%= render :partial => "content/search" %>
         </div>
         <div id="light-mode-div">
-          <input id="light-mode" type="checkbox" aria-label="Switch between dark and light mode" /><label for="light-mode"><span class="hide-me">lights</span></label>
+          <input id="light-mode" type="checkbox" aria-label="<%= t(".light_mode_aria") %>" /><label for="light-mode"><span class="hide-me"><%= t(".light_mode_label") %></span></label>
         </div>
         <div id="burger-div">
           <input type="checkbox" id="menu-toggle" class="menu-checkbox">
@@ -49,10 +49,10 @@
 
         <% if current_user && @page.node %>
           <div class="main_navigation">
-            <h2>Admin</h2>
+            <h2><%= t(".admin") %></h2>
             <ul>
-              <li><%= link_to raw('<span class="inactive admin_edit_link">⚙️ Overview</span>'), admin_path %></li>
-              <li><%= link_to raw('<span class="inactive admin_edit_link">✎ Edit</span>'), node_path(@page.node) %></li>
+              <li><%= link_to admin_path do %><span class="inactive admin_edit_link">⚙️ <%= t(".overview") %></span><% end %></li>
+              <li><%= link_to node_path(@page.node) do %><span class="inactive admin_edit_link">✎ <%= t(".edit") %></span><% end %></li>
             </ul>
           </div>
         <% end %>
diff --git a/app/views/layouts/assets.html.erb b/app/views/layouts/assets.html.erb
deleted file mode 100644
index 9d629c8d..00000000
--- a/app/views/layouts/assets.html.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
-  <title>Assets: <%= controller.action_name %></title>
-  <%= stylesheet_link_tag 'scaffold' %>
-</head>
-<body>
-
-<p style="color: green"><%= flash[:notice] %></p>
-
-<%= yield %>
-
-</body>
-</html>
diff --git a/app/views/layouts/pages.html.erb b/app/views/layouts/pages.html.erb
deleted file mode 100644
index 70ceece9..00000000
--- a/app/views/layouts/pages.html.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
-  <meta name="viewport" content="width=device-width,initial-scale=1" />
-  <meta property="og:image" content="https://www.ccc.de/images/chaosknoten.svg" />
-  <title>Pages: <%= controller.action_name %></title>
-  <%= stylesheet_link_tag 'scaffold' %>
-</head>
-<body>
-
-<p style="color: green"><%= flash[:notice] %></p>
-
-<%= yield  %>
-
-</body>
-</html>
diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb
index 81ffb0dc..bb8f63b7 100644
--- a/app/views/search/index.html.erb
+++ b/app/views/search/index.html.erb
@@ -1,5 +1,5 @@
 <% if params[:search_term] %>
-  <h2>Suchergebnisse für Suchbegriff: <%=h params[:search_term] %></h2>
+  <h2><%= t(".results_for", :query => params[:search_term]) %></h2>
 <% end %>
 
 <%= 
diff --git a/app/views/tags/show.html.erb b/app/views/tags/show.html.erb
index 3a235223..eddf9b88 100644
--- a/app/views/tags/show.html.erb
+++ b/app/views/tags/show.html.erb
@@ -1,7 +1,7 @@
 <h2><%= t(:show_tag_headline) %> »<%=h @tag %>«</h2>
 
 <p class="feed_link">
-  <%= link_to "Subscribe to updates tagged »#{@tag}«",
+  <%= link_to t(".subscribe", :tag => @tag),
         rss_tag_url(:tag => @tag, :format => :xml),
         :type => "application/atom+xml" %>
 </p>
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 0ffc6ecc..ae1149a4 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -118,6 +118,20 @@ de:
   tags:
     index:
       title: "Tags"
+    show:
+      subscribe: "Änderungen mit dem Tag »%{tag}« abonnieren"
+
+  content:
+    featured_articles:
+      title: "Ausgewählt"
+    front_page_calendar:
+      title: "Termine"
+    tags:
+      title: "Tags"
+
+  search:
+    index:
+      results_for: "Suchergebnisse für: %{query}"
 
   node_actions:
     heading: "Letzte Änderungen"
@@ -245,6 +259,7 @@ de:
       update: "Aktualisieren"
       confirm_sure: "Wirklich?"
       confirm_irreversible: "Das kann nicht rückgängig gemacht werden. Fortfahren?"
+      unlock_confirm: "Wirklich entsperren?\nGesperrt von %{login}\nZuletzt geändert %{time}"
       toggle_preview: "Live-Vorschau umschalten"
       force_render: "Vorschau neu rendern"
       "yes": "ja"
@@ -630,6 +645,12 @@ de:
       title: "Menüeintrag bearbeiten"
 
   layouts:
+    application:
+      light_mode_aria: "Zwischen dunklem und hellem Modus wechseln"
+      light_mode_label: "Licht"
+      admin: "Verwaltung"
+      overview: "Übersicht"
+      edit: "Bearbeiten"
     flash:
       go_to_status: "Zum Status"
       stale_prefix: "Die %{lang}-Übersetzung ist womöglich veraltet —"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5f2f266a..50811b37 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -70,6 +70,21 @@ en:
   tags:
     index:
       title: "Tags"
+    show:
+      subscribe: "Subscribe to updates tagged »%{tag}«"
+
+  content:
+    featured_articles:
+      title: "Featured"
+    front_page_calendar:
+      title: "Calendar"
+    tags:
+      title: "Tags"
+
+  search:
+    index:
+      results_for: "Search results for: %{query}"
+
 
   node_actions:
     heading: "Action log"
@@ -197,6 +212,7 @@ en:
       update: "Update"
       confirm_sure: "Are you sure?"
       confirm_irreversible: "This cannot be undone. Continue?"
+      unlock_confirm: "Are you sure you want to unlock?\nLocked by %{login}\nLast modified %{time}"
       toggle_preview: "Toggle live preview"
       force_render: "Force preview render"
       "yes": "yes"
@@ -581,6 +597,12 @@ en:
       default_marker: "default"
 
   layouts:
+    application:
+      light_mode_aria: "Switch between dark and light mode"
+      light_mode_label: "lights"
+      admin: "Admin"
+      overview: "Overview"
+      edit: "Edit"
     flash:
       go_to_status: "Go to Status"
       stale_prefix: "The %{lang} translation may be out of date —"