diff options
| author | erdgeist <erdgeist@erdgeist.org> | 2026-07-25 20:16:32 +0200 |
|---|---|---|
| committer | erdgeist <erdgeist@erdgeist.org> | 2026-07-25 20:16:32 +0200 |
| commit | f8ce323663debb22890ad1ed29f385b8b832abc6 (patch) | |
| tree | e872c2d8a6af8de6ad84ef285240f0c130b26bcc /app/views/layouts | |
| parent | fe104aa2c52f61cd8555fbc98c20501f50f4aae8 (diff) | |
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.
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/application.html.erb | 8 | ||||
| -rw-r--r-- | app/views/layouts/assets.html.erb | 17 | ||||
| -rw-r--r-- | app/views/layouts/pages.html.erb | 19 |
3 files changed, 4 insertions, 40 deletions
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 @@ | |||
| 37 | <%= render :partial => "content/search" %> | 37 | <%= render :partial => "content/search" %> |
| 38 | </div> | 38 | </div> |
| 39 | <div id="light-mode-div"> | 39 | <div id="light-mode-div"> |
| 40 | <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> | 40 | <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> |
| 41 | </div> | 41 | </div> |
| 42 | <div id="burger-div"> | 42 | <div id="burger-div"> |
| 43 | <input type="checkbox" id="menu-toggle" class="menu-checkbox"> | 43 | <input type="checkbox" id="menu-toggle" class="menu-checkbox"> |
| @@ -49,10 +49,10 @@ | |||
| 49 | 49 | ||
| 50 | <% if current_user && @page.node %> | 50 | <% if current_user && @page.node %> |
| 51 | <div class="main_navigation"> | 51 | <div class="main_navigation"> |
| 52 | <h2>Admin</h2> | 52 | <h2><%= t(".admin") %></h2> |
| 53 | <ul> | 53 | <ul> |
| 54 | <li><%= link_to raw('<span class="inactive admin_edit_link">⚙️ Overview</span>'), admin_path %></li> | 54 | <li><%= link_to admin_path do %><span class="inactive admin_edit_link">⚙️ <%= t(".overview") %></span><% end %></li> |
| 55 | <li><%= link_to raw('<span class="inactive admin_edit_link">✎ Edit</span>'), node_path(@page.node) %></li> | 55 | <li><%= link_to node_path(@page.node) do %><span class="inactive admin_edit_link">✎ <%= t(".edit") %></span><% end %></li> |
| 56 | </ul> | 56 | </ul> |
| 57 | </div> | 57 | </div> |
| 58 | <% end %> | 58 | <% 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 @@ | |||
| 1 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" | ||
| 2 | "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> | ||
| 3 | |||
| 4 | <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> | ||
| 5 | <head> | ||
| 6 | <meta http-equiv="content-type" content="text/html;charset=UTF-8" /> | ||
| 7 | <title>Assets: <%= controller.action_name %></title> | ||
| 8 | <%= stylesheet_link_tag 'scaffold' %> | ||
| 9 | </head> | ||
| 10 | <body> | ||
| 11 | |||
| 12 | <p style="color: green"><%= flash[:notice] %></p> | ||
| 13 | |||
| 14 | <%= yield %> | ||
| 15 | |||
| 16 | </body> | ||
| 17 | </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 @@ | |||
| 1 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" | ||
| 2 | "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> | ||
| 3 | |||
| 4 | <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> | ||
| 5 | <head> | ||
| 6 | <meta http-equiv="content-type" content="text/html;charset=UTF-8" /> | ||
| 7 | <meta name="viewport" content="width=device-width,initial-scale=1" /> | ||
| 8 | <meta property="og:image" content="https://www.ccc.de/images/chaosknoten.svg" /> | ||
| 9 | <title>Pages: <%= controller.action_name %></title> | ||
| 10 | <%= stylesheet_link_tag 'scaffold' %> | ||
| 11 | </head> | ||
| 12 | <body> | ||
| 13 | |||
| 14 | <p style="color: green"><%= flash[:notice] %></p> | ||
| 15 | |||
| 16 | <%= yield %> | ||
| 17 | |||
| 18 | </body> | ||
| 19 | </html> | ||