From 206dc5c50a73c5402b90d7fdc8945d3ba9356758 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Sat, 4 Jul 2026 01:24:55 +0200
Subject: Add self-service event creation from nodes#show

nodes#show's events table now renders unconditionally (previously
hidden entirely for a zero-event node) and gains an "add event" link.
The suggested tag_list is derived from the page's own category tags
via NodesHelper::DEFAULT_EVENT_TAG_BY_PAGE_TAG (erfa-detail/
chaostreff-detail -> open-day) rather than hardcoded, and degrades to
a blank field for any node whose tags don't match - deliberately
universal, not chapter-specific, since Updates have historically
carried event dates the same way.

events#new surfaces *why* the tag was pre-filled via flash.now (not
flash - this is a same-request render, not a redirect), using an
explicit auto_tag_source param passed alongside tag_list rather than
having the controller re-derive the reason from node_id.

No destroy link added to nodes#show's events list - deliberate, per
existing subnav-semantics convention (destructive actions live on the
resource's own views). Covered directly by test.

Adds real coverage for EventsController, previously 100% commented-out
scaffold, plus unit tests for the new tag-mapping helper and the
weekday-abbreviation helpers from the prior commit.
---
 test/models/helpers/content_helper_test.rb |  4 ++++
 test/models/helpers/nodes_helper_test.rb   | 21 +++++++++++++++++++++
 2 files changed, 25 insertions(+)

(limited to 'test/models/helpers')

diff --git a/test/models/helpers/content_helper_test.rb b/test/models/helpers/content_helper_test.rb
index 2da82d7..a7ed478 100644
--- a/test/models/helpers/content_helper_test.rb
+++ b/test/models/helpers/content_helper_test.rb
@@ -1,4 +1,8 @@
 require 'test_helper'
 
 class ContentHelperTest < ActionView::TestCase
+  test "weekday_abbr delegates through the current I18n locale" do
+    I18n.locale = :de
+    assert_equal "Mo", weekday_abbr(Time.parse("2026-07-06"))
+  end
 end
diff --git a/test/models/helpers/nodes_helper_test.rb b/test/models/helpers/nodes_helper_test.rb
index 13011de..5d91a88 100644
--- a/test/models/helpers/nodes_helper_test.rb
+++ b/test/models/helpers/nodes_helper_test.rb
@@ -1,4 +1,25 @@
 require 'test_helper'
 
 class NodesHelperTest < ActionView::TestCase
+  FakePage = Struct.new(:tag_list)
+
+  test "default_event_tag_mapping matches erfa-detail" do
+    page = FakePage.new(["erfa-detail"])
+    assert_equal ["erfa-detail", "open-day"], default_event_tag_mapping(page)
+  end
+
+  test "default_event_tag_mapping matches chaostreff-detail" do
+    page = FakePage.new(["chaostreff-detail"])
+    assert_equal ["chaostreff-detail", "open-day"], default_event_tag_mapping(page)
+  end
+
+  test "default_event_tag_mapping returns nil for unrelated tags" do
+    page = FakePage.new(["update"])
+    assert_nil default_event_tag_mapping(page)
+  end
+
+  test "default_event_tag_list is nil without a matching tag" do
+    page = FakePage.new([])
+    assert_nil default_event_tag_list(page)
+  end
 end
-- 
cgit v1.3


From c9401e45433ea45b46f9a8faf1e7e537e4683244 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Fri, 10 Jul 2026 18:07:15 +0200
Subject: Fix rrule/url column overflow on events#index

Long RRULEs previously overflowed their column with no wrap point;
now escaped and rendered with a <wbr> after each semicolon, so a
long rule wraps at a clause boundary instead of running off the
table. Deliberately not truncated -- a cut-off RRULE's trailing
clause (BYDAY, BYMONTH, etc.) is usually the most specific part.

The url column is now a real link, truncated with an ellipsis at a
fixed width -- deliberately no tooltip, since hovering a real link
already shows the full address in the browser's own status bar.

rrule_with_break_opportunities splits on the raw string's own
semicolons before escaping each piece, not after -- escaping first
and searching the result for semicolons also matches the ones inside
&lt;/&gt; entities, corrupting anything containing a literal < or >.
---
 app/helpers/events_helper.rb              | 11 +++++++++++
 app/views/events/index.html.erb           |  8 ++++++--
 public/stylesheets/admin.css              | 15 +++++++++++++++
 test/models/helpers/events_helper_test.rb | 21 +++++++++++++++++++++
 4 files changed, 53 insertions(+), 2 deletions(-)

(limited to 'test/models/helpers')

diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 8a9a878..5e84f53 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -1,2 +1,13 @@
+require 'cgi'
+
 module EventsHelper
+  # Insert a zero-width break opportunity after each semicolon, so a long
+  # RRULE can wrap at a clause boundary instead of overflowing its column.
+  # Deliberately <wbr>, not ellipsis -- unlike a URL, an RRULE's trailing
+  # characters (BYDAY, BYMONTH, etc.) are usually the most specific part,
+  # and truncating them would hide exactly the wrong end of the string.
+  def rrule_with_break_opportunities(rrule)
+    return "" if rrule.blank?
+    raw(rrule.split(';', -1).map { |part| CGI.escapeHTML(part) }.join(';<wbr>'))
+  end
 end
diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
index 8127e3a..3d953d5 100644
--- a/app/views/events/index.html.erb
+++ b/app/views/events/index.html.erb
@@ -22,9 +22,13 @@
     <td><%= link_to event.display_title, event %></td>
     <td><%=h event.start_time %></td>
     <td><%=h event.end_time %></td>
-    <td><%=h event.rrule %></td>
+    <td class="rrule_cell"><span class="rrule_text"><%= rrule_with_break_opportunities(event.rrule) %></span></td>
     <td><%=h event.allday %></td>
-    <td><%=h event.url %></td>
+    <td class="url_cell">
+    <% if event.url.present? %>
+    <span class="truncate"><%= link_to event.url, event.url %></span>
+    <% end %>
+    </td>
     <td><%= event.node ? link_to(event.node_id, node_path(event.node)) : '' %></td>
     <td><%= link_to 'edit', edit_event_path(event) %></td>
   </tr>
diff --git a/public/stylesheets/admin.css b/public/stylesheets/admin.css
index 1a81728..4723f50 100644
--- a/public/stylesheets/admin.css
+++ b/public/stylesheets/admin.css
@@ -519,6 +519,21 @@ table.revisions_table tr:hover {
   background-color: #f1f1f1;
 }
 
+.events_table .rrule_text {
+  display: inline-block;
+  max-width: 300px;
+  overflow-wrap: break-word;
+}
+
+.events_table .truncate {
+  display: inline-block;
+  max-width: 200px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  vertical-align: bottom;
+}
+
 #diffview del {
   background: #ffd7d5;
   color: #82071e;
diff --git a/test/models/helpers/events_helper_test.rb b/test/models/helpers/events_helper_test.rb
index 2e7567e..0486b3e 100644
--- a/test/models/helpers/events_helper_test.rb
+++ b/test/models/helpers/events_helper_test.rb
@@ -1,4 +1,25 @@
 require 'test_helper'
 
 class EventsHelperTest < ActionView::TestCase
+  test "rrule_with_break_opportunities inserts a break opportunity after each semicolon" do
+    result = rrule_with_break_opportunities("FREQ=MONTHLY;BYMONTH=1,2,3;BYDAY=-1TH")
+    assert_equal "FREQ=MONTHLY;<wbr>BYMONTH=1,2,3;<wbr>BYDAY=-1TH", result
+    assert result.html_safe?
+  end
+
+  test "rrule_with_break_opportunities escapes HTML-significant characters" do
+    result = rrule_with_break_opportunities("FREQ=WEEKLY;BYDAY=<script>")
+    assert_no_match /<script>/, result
+    assert_match "&lt;script&gt;", result
+  end
+
+  test "rrule_with_break_opportunities returns an empty string for blank input" do
+    assert_equal "", rrule_with_break_opportunities(nil)
+    assert_equal "", rrule_with_break_opportunities("")
+  end
+
+  test "rrule_with_break_opportunities preserves a trailing semicolon" do
+    result = rrule_with_break_opportunities("FREQ=WEEKLY;")
+    assert_equal "FREQ=WEEKLY;<wbr>", result
+  end
 end
-- 
cgit v1.3


From 45bf65d04d046c0ea4a1150096b2a9b846d6c0b8 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Sun, 12 Jul 2026 02:15:44 +0200
Subject: Give the sitemap its own view, with collapse and descendant counts

Extracted from admin#index's inline table into NodesController#sitemap.
Nested <details>/<summary> per branch, one linear pass over the
existing flat [node, level] list (no added queries) -- each node's own
descendant count computed the same way, via a small stack rather than
re-walking the tree per node. Branches under updates/, club/erfas,
club/chaostreffs, and disclosure start collapsed by default
(CccConventions::SITEMAP_COLLAPSED_PATHS); any branch currently
collapsed, whether by that default or because someone just closed it,
is highlighted via a plain :not([open]) selector -- no state tracked
outside the DOM itself.

Dropped the update?-post exclusion this view used to rely on -- no
longer needed now that updates/ collapses instead of being filtered
out, so its real children (previously silently absent) now show up
correctly. admin#index's own, separate @sitemap query is unchanged;
that view has no collapse mechanism to compensate and wasn't part of
this.
---
 app/controllers/nodes_controller.rb       | 23 ++++++++++++++
 app/helpers/nodes_helper.rb               |  5 ++-
 app/views/nodes/sitemap.html.erb          | 32 +++++++++++++++++++
 config/routes.rb                          |  1 +
 lib/ccc_conventions.rb                    |  1 +
 public/stylesheets/admin.css              | 40 ++++++++++++++++++++++++
 test/controllers/nodes_controller_test.rb | 52 +++++++++++++++++++++++++++++++
 test/models/helpers/nodes_helper_test.rb  | 11 +++++++
 8 files changed, 164 insertions(+), 1 deletion(-)
 create mode 100644 app/views/nodes/sitemap.html.erb

(limited to 'test/models/helpers')

diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index ede91ad..772bf4b 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -216,6 +216,11 @@ class NodesController < ApplicationController
     @nodes = nodes_matching_tags(tags)
   end
 
+  def sitemap
+    @sitemap = Node.root.self_and_descendants_ordered_with_level
+    @sitemap_descendant_counts = descendant_counts_for(@sitemap)
+  end
+
   private
 
     def slug_for(title)
@@ -248,6 +253,24 @@ class NodesController < ApplicationController
       end
     end
 
+    def descendant_counts_for(ordered_with_level)
+      counts = Hash.new(0)
+      stack = [] # [node, level, index]
+      ordered_with_level.each_with_index do |(node, level), index|
+        while stack.any? && stack.last[1] >= level
+          ancestor_node, _ancestor_level, ancestor_index = stack.pop
+          counts[ancestor_node.id] = index - ancestor_index - 1
+        end
+        stack << [node, level, index]
+      end
+      total = ordered_with_level.length
+      while stack.any?
+        ancestor_node, _ancestor_level, ancestor_index = stack.pop
+        counts[ancestor_node.id] = total - ancestor_index - 1
+      end
+      counts
+    end
+
     def nodes_matching_tags(tags)
       matching_pages = Page.tagged_with(tags, any: true).reselect(:id)
       base = Node.where(head_id: matching_pages).or(Node.where(draft_id: matching_pages))
diff --git a/app/helpers/nodes_helper.rb b/app/helpers/nodes_helper.rb
index a89f879..1268b63 100644
--- a/app/helpers/nodes_helper.rb
+++ b/app/helpers/nodes_helper.rb
@@ -12,7 +12,6 @@ module NodesHelper
     end
   end
   
-  
   def truncated_title_for_node node
     if (title = title_for_node node) && title.size > 20
       "<span title='#{title}'>#{truncate(title, 40)}</span>"
@@ -63,4 +62,8 @@ module NodesHelper
     path = node.unique_path
     CccConventions::NODE_KINDS.select { |_, config| config[:parent_match]&.call(path) }
   end
+
+  def sitemap_node_open?(node)
+    !CccConventions::SITEMAP_COLLAPSED_PATHS.include?(node.unique_name)
+  end
 end
diff --git a/app/views/nodes/sitemap.html.erb b/app/views/nodes/sitemap.html.erb
new file mode 100644
index 0000000..a799c17
--- /dev/null
+++ b/app/views/nodes/sitemap.html.erb
@@ -0,0 +1,32 @@
+<h1>Sitemap</h1>
+
+<div id="sitemap">
+<%
+  open_details = [] # levels with a currently-open <details>
+%>
+<% @sitemap.each_with_index do |(node, level), index| %>
+  <% while open_details.any? && open_details.last >= level %>
+    </details>
+    <% open_details.pop %>
+  <% end %>
+
+  <div class="sitemap_node">
+    <h4><%= link_to title_for_node(node), node_path(node) %></h4>
+    <span class="field_hint"><%= link_to_path("#{node.unique_name} ↗", node.unique_name) %></span>
+    <p class="sitemap_node_actions">
+      <%= link_to 'Show', node_path(node) %>
+      <%= link_to 'Create Child', new_node_path(:parent_id => node.id) %>
+    </p>
+  </div>
+
+  <% next_level = @sitemap[index + 1]&.last %>
+  <% if next_level && next_level > level %>
+    <details<%= ' open' if sitemap_node_open?(node) %>>
+      <summary>
+        <%= pluralize(@sitemap_descendant_counts[node.id], 'descendant', 'descendants') %>
+      </summary>
+    <% open_details.push(level) %>
+  <% end %>
+<% end %>
+<% open_details.length.times { %></details><% } %>
+</div>
diff --git a/config/routes.rb b/config/routes.rb
index 2c165d2..bb34bd8 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -43,6 +43,7 @@ Cccms::Application.routes.draw do
           get :recent
           get :mine
           get :chapters
+          get :sitemap
         end
 
         member do
diff --git a/lib/ccc_conventions.rb b/lib/ccc_conventions.rb
index b420452..352dd3c 100644
--- a/lib/ccc_conventions.rb
+++ b/lib/ccc_conventions.rb
@@ -1,6 +1,7 @@
 module CccConventions
   ERFA_PARENT_NAME       = "club/erfas"
   CHAOSTREFF_PARENT_NAME = "club/chaostreffs"
+  SITEMAP_COLLAPSED_PATHS = %w[updates club/erfas club/chaostreffs disclosure].freeze
 
   NODE_KINDS = {
     "top_level" => {
diff --git a/public/stylesheets/admin.css b/public/stylesheets/admin.css
index aa8b288..5c1e489 100644
--- a/public/stylesheets/admin.css
+++ b/public/stylesheets/admin.css
@@ -25,6 +25,7 @@ a:hover {
    body content, node listing tables, the child-creation shortcuts on
    nodes#show, and the dashboard draft list's Show/Revisions links. */
 #page_editor a,
+#sitemap a,
 table.node_table a,
 table.assets_table a,
 table.events_table a,
@@ -104,6 +105,11 @@ input[type=radio] {
     width: 100%;
     box-sizing: border-box;
   }
+
+  #sitemap details details {
+    margin-left: 0.75rem;
+    padding-left: 0.5rem;
+  }
 }
 
 #metadata,
@@ -773,6 +779,40 @@ form.button_to button[type="submit"] {
   white-space: nowrap;
 }
 
+.sitemap_node {
+  padding-bottom: 0.5rem;
+  margin-bottom: 0.5rem;
+  border-bottom: 1px solid #ececec;
+}
+
+.sitemap_node h4 {
+  margin: 0;
+}
+
+.sitemap_node .field_hint {
+  display: block;
+  margin: 2px 0 0;
+}
+
+.sitemap_node p {
+  margin: 2px 0 0;
+}
+
+#sitemap details details {
+  margin-left: 1.5rem;
+  border-left: 1px solid #e8e8e8;
+  padding-left: 0.75rem;
+}
+
+#sitemap summary {
+  padding: 4px 0;
+}
+
+#sitemap details:not([open]) > summary {
+  color: #ff9600;
+  font-weight: bold;
+}
+
 /* ============================================================
    Page editor / metadata forms
    ============================================================ */
diff --git a/test/controllers/nodes_controller_test.rb b/test/controllers/nodes_controller_test.rb
index 05cb195..b43d2de 100644
--- a/test/controllers/nodes_controller_test.rb
+++ b/test/controllers/nodes_controller_test.rb
@@ -575,4 +575,56 @@ class NodesControllerTest < ActionController::TestCase
     get :chapters
     assert_select "h1", "Chapters"
   end
+
+  test "sitemap collapses configured paths but leaves others open" do
+    club = Node.root.children.create!(:slug => "club")
+    erfas = club.children.create!(:slug => "erfas")
+    erfas.children.create!(:slug => "one_chapter")
+    other = Node.root.children.create!(:slug => "sitemap_controller_open_test")
+    other.children.create!(:slug => "sitemap_controller_open_child")
+
+    login_as :quentin
+    get :sitemap
+    assert_response :success
+
+    doc = Nokogiri::HTML::DocumentFragment.parse(response.body)
+
+    erfas_node_div = doc.css('.sitemap_node').find { |div| div.at_css('.field_hint')&.text&.include?(erfas.unique_name) }
+    other_node_div = doc.css('.sitemap_node').find { |div| div.at_css('.field_hint')&.text&.include?(other.unique_name) }
+
+    erfas_details = erfas_node_div.next_element
+    other_details = other_node_div.next_element
+
+    assert_equal 'details', erfas_details.name
+    assert_equal 'details', other_details.name
+    assert_not erfas_details.key?('open')
+    assert other_details.key?('open')
+  end
+
+  test "sitemap shows how many descendants a collapsed branch is hiding" do
+    club = Node.root.children.create!(:slug => "club")
+    erfas = club.children.create!(:slug => "erfas")
+    erfas.children.create!(:slug => "one_chapter")
+    erfas.children.create!(:slug => "another_chapter")
+
+    login_as :quentin
+    get :sitemap
+    assert_response :success
+
+    doc = Nokogiri::HTML::DocumentFragment.parse(response.body)
+    erfas_node_div = doc.css('.sitemap_node').find { |div| div.at_css('.field_hint')&.text&.include?(erfas.unique_name) }
+    erfas_details = erfas_node_div.next_element
+
+    assert_equal 'details', erfas_details.name
+    assert_match "2 descendants", erfas_details.at_css('summary').text
+  end
+
+  test "sitemap shows Show and Create Child, not Revisions" do
+    node = Node.root.children.create!(:slug => "sitemap_actions_test")
+    login_as :quentin
+    get :sitemap
+    assert_select ".sitemap_node_actions", :text => /Show/
+    assert_select ".sitemap_node_actions", :text => /Create Child/
+    assert_select ".sitemap_node_actions", :text => /Revisions/, :count => 0
+  end
 end
diff --git a/test/models/helpers/nodes_helper_test.rb b/test/models/helpers/nodes_helper_test.rb
index 5d91a88..5ab924f 100644
--- a/test/models/helpers/nodes_helper_test.rb
+++ b/test/models/helpers/nodes_helper_test.rb
@@ -22,4 +22,15 @@ class NodesHelperTest < ActionView::TestCase
     page = FakePage.new([])
     assert_nil default_event_tag_list(page)
   end
+
+  test "sitemap_node_open? is false for a configured collapsed path" do
+    club = Node.root.children.create!(:slug => "club")
+    erfas = club.children.create!(:slug => "erfas")
+    assert_equal false, sitemap_node_open?(erfas)
+  end
+
+  test "sitemap_node_open? is true for anything not configured as collapsed" do
+    node = Node.root.children.create!(:slug => "sitemap_open_test")
+    assert_equal true, sitemap_node_open?(node)
+  end
 end
-- 
cgit v1.3


From cf93acb8ad44ba9cd486e8f6457d9fd9fbc041cc Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Sun, 12 Jul 2026 23:42:23 +0200
Subject: Add a locale-aware relative-time helper; drop stale locale overrides

Node.recently_changed and the new dashboard need "X ago" rendered
correctly in both locales. Rails' own distance_of_time_in_words/
time_ago_in_words can't do this on their own -- the scope option
changes which translation key is looked up, not the underlying
grammar, and German's "vor" requires dative case, which is a
different word form than the nominative plural Rails computes by
default. relative_time_phrase/relative_distance is a small, from-
scratch bucketing helper instead, with an explicit, hand-checked
translation table per unit per locale.

Also removes de.yml's datetime.distance_in_words and activerecord.
errors blocks. Both used the old {{count}}/{{model}} interpolation
syntax the current i18n gem no longer recognizes -- it silently
leaves the literal placeholder text in the rendered output rather
than erroring, which is why this went unnoticed until now. Both were
shadowing rails-i18n's own current, correct translations for exactly
these keys; deleting the local override lets the gem's version take
over instead of maintaining a second, broken copy.
---
 app/helpers/datetime_helper.rb              | 53 ++++++++++++++++++++++
 config/locales/de.yml                       | 70 ++---------------------------
 config/locales/en.yml                       |  4 ++
 test/models/helpers/datetime_helper_test.rb | 19 ++++++++
 4 files changed, 80 insertions(+), 66 deletions(-)
 create mode 100644 app/helpers/datetime_helper.rb
 create mode 100644 test/models/helpers/datetime_helper_test.rb

(limited to 'test/models/helpers')

diff --git a/app/helpers/datetime_helper.rb b/app/helpers/datetime_helper.rb
new file mode 100644
index 0000000..8497b1c
--- /dev/null
+++ b/app/helpers/datetime_helper.rb
@@ -0,0 +1,53 @@
+module DatetimeHelper
+
+  def relative_distance(time, now = Time.current)
+    seconds = (now - time).abs
+
+    case seconds
+    when 0...90
+      [1, :minute]
+    when 90...45.minutes
+      [(seconds / 60).round, :minute]
+    when 45.minutes...24.hours
+      [(seconds / 1.hour).round, :hour]
+    when 24.hours...30.days
+      [(seconds / 1.day).round, :day]
+    when 30.days...365.days
+      [(seconds / 30.days).round, :month]
+    else
+      [(seconds / 365.days).round, :year]
+    end
+  end
+
+  RELATIVE_TIME_UNIT_FORMS = {
+    en: {
+      minute: { one: "minute", other: "minutes" },
+      hour:   { one: "hour",   other: "hours" },
+      day:    { one: "day",    other: "days" },
+      month:  { one: "month",  other: "months" },
+      year:   { one: "year",   other: "years" },
+    },
+    de: {
+      # "other" here is the DATIVE plural needed after "vor" -- not the
+      # nominative plural you'd use standing alone ("3 Tage" vs "vor 3
+      # Tagen"). All five happen to be the nominative plural + "n", since
+      # none of them already end in -n or -s -- a property of these five
+      # specific words, not a rule to extend to new units without checking.
+      minute: { one: "Minute", other: "Minuten" },
+      hour:   { one: "Stunde", other: "Stunden" },
+      day:    { one: "Tag",    other: "Tagen" },
+      month:  { one: "Monat",  other: "Monaten" },
+      year:   { one: "Jahr",   other: "Jahren" },
+    },
+  }.freeze
+
+  def relative_time_phrase(time, now = Time.current)
+    count, unit = relative_distance(time, now)
+    locale = I18n.locale.to_sym
+    forms = RELATIVE_TIME_UNIT_FORMS.fetch(locale, RELATIVE_TIME_UNIT_FORMS[:en])
+    word = forms.fetch(unit).fetch(count == 1 ? :one : :other)
+
+    locale == :de ? "vor #{count} #{word}" : "#{count} #{word} ago"
+  end
+
+end
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 1f2222c..550ccb3 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -14,6 +14,10 @@ de:
   open_days_label: "Offene Tage"
   upcoming_events: "Weitere Termine"
   open_today: "Das Chaos, lokal und heute offen"
+  published: "veröffentlicht"
+  published_by: "veröffentlicht durch %{editor}"
+  editor_self: "du"
+  publisher_self: "dich"
   date:
     formats:
       default: "%d.%m.%Y"
@@ -29,7 +33,6 @@ de:
       - :day
       - :month
       - :year
-
   time:
     formats:
       default: "%A, %e. %B %Y, %H:%M Uhr"
@@ -41,42 +44,6 @@ de:
     am: "vormittags"
     pm: "nachmittags"
 
-  datetime:
-    distance_in_words:
-      half_a_minute: 'eine halbe Minute'
-      less_than_x_seconds:
-        zero: 'weniger als 1 Sekunde'
-        one: 'weniger als 1 Sekunde'
-        other: 'weniger als {{count}} Sekunden'
-      x_seconds:
-        one: '1 Sekunde'
-        other: '{{count}} Sekunden'
-      less_than_x_minutes:
-        zero: 'weniger als 1 Minute'
-        one: 'weniger als eine Minute'
-        other: 'weniger als {{count}} Minuten'
-      x_minutes:
-        one: '1 Minute'
-        other: '{{count}} Minuten'
-      about_x_hours:
-        one: 'etwa 1 Stunde'
-        other: 'etwa {{count}} Stunden'
-      x_days:
-        one: '1 Tag'
-        other: '{{count}} Tage'
-      about_x_months:
-        one: 'etwa 1 Monat'
-        other: 'etwa {{count}} Monate'
-      x_months:
-        one: '1 Monat'
-        other: '{{count}} Monate'
-      about_x_years:
-        one: 'etwa 1 Jahr'
-        other: 'etwa {{count}} Jahre'
-      over_x_years:
-        one: 'mehr als 1 Jahr'
-        other: 'mehr als {{count}} Jahre'
-
   number:
     format:
       precision: 2
@@ -105,35 +72,6 @@ de:
       sentence_connector: "und"
       skip_last_comma: true
 
-  activerecord:
-    errors:
-      template:
-        header:
-          one: 1 error prohibited this {{model}} from being saved
-          other: "{{count}} errors prohibited this {{model}} from being saved"
-        body: "There were problems with the following fields:"
-
-      messages:
-        inclusion: "is not included in the list"
-        exclusion: "is reserved"
-        invalid: "is invalid"
-        confirmation: "doesn't match confirmation"
-        accepted: "must be accepted"
-        empty: "can't be empty"
-        blank: "can't be blank"
-        too_long: "is too long (maximum is {{count}} characters)"
-        too_short: "is too short (minimum is {{count}} characters)"
-        wrong_length: "is the wrong length (should be {{count}} characters)"
-        taken: "has already been taken"
-        not_a_number: "is not a number"
-        greater_than: "must be greater than {{count}}"
-        greater_than_or_equal_to: "must be greater than or equal to {{count}}"
-        equal_to: "must be equal to {{count}}"
-        less_than: "must be less than {{count}}"
-        less_than_or_equal_to: "must be less than or equal to {{count}}"
-        odd: "must be odd"
-        even: "must be even"
-
   will_paginate:
     previous_label: "&#8592; Zurück"
     previous_aria_label: "Vorherige Seite"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 59c7304..73271ed 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -15,6 +15,10 @@ en:
   open_days_label: "Open days"
   upcoming_events: "Upcoming events"
   open_today: "Open today"
+  published: "published"
+  published_by: "published by %{editor}"
+  publisher_self: "you"
+  editor_self: "you"
 
   time:
     formats:
diff --git a/test/models/helpers/datetime_helper_test.rb b/test/models/helpers/datetime_helper_test.rb
new file mode 100644
index 0000000..a24e5d3
--- /dev/null
+++ b/test/models/helpers/datetime_helper_test.rb
@@ -0,0 +1,19 @@
+require 'test_helper'
+
+class DatetimeHelperTest < ActionView::TestCase
+  test "relative_time_phrase pluralizes correctly in English and German" do
+    travel_to Time.zone.parse("2026-07-12 12:00:00") do
+      I18n.with_locale(:en) do
+        assert_equal "1 day ago", relative_time_phrase(1.day.ago)
+        assert_equal "3 days ago", relative_time_phrase(3.days.ago)
+      end
+      I18n.with_locale(:de) do
+        assert_equal "vor 1 Tag", relative_time_phrase(1.day.ago)
+        assert_equal "vor 3 Tagen", relative_time_phrase(3.days.ago)
+        assert_equal "vor 1 Monat", relative_time_phrase(30.days.ago)
+        assert_equal "vor 2 Monaten", relative_time_phrase(45.days.ago)
+        assert_equal "vor 2 Jahren", relative_time_phrase(2.years.ago)
+      end
+    end
+  end
+end
-- 
cgit v1.3


From 802e81f8551e10a3f97846a49636e675c7e21cb3 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Mon, 13 Jul 2026 23:29:54 +0200
Subject: Add cache-buster using mtime of css and js files outside the asset
 pipeline

---
 app/helpers/admin_helper.rb              |  6 ++++++
 app/views/layouts/admin.html.erb         |  8 ++++----
 test/models/helpers/admin_helper_test.rb | 10 ++++++++++
 3 files changed, 20 insertions(+), 4 deletions(-)

(limited to 'test/models/helpers')

diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb
index 08336ef..1e84620 100644
--- a/app/helpers/admin_helper.rb
+++ b/app/helpers/admin_helper.rb
@@ -8,4 +8,10 @@ module AdminHelper
       link_to raw('<span class="inactive">English</span>'), url_for(params.permit(:locale, :page_path).to_h.merge('locale' => 'de'))
     end
   end
+
+  def mtime_busted_path(path)
+    file = Rails.public_path.join(path.sub(%r{\A/}, ""))
+    raise "Static asset not found for cache-busting: #{path} (looked for #{file})" unless File.exist?(file)
+    "#{path}?v=#{File.mtime(file).to_i}"
+  end
 end
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index 8bbc0d5..0856a0f 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -10,10 +10,10 @@
     <%= javascript_tag "var AUTH_TOKEN = #{form_authenticity_token.inspect};" if protect_against_forgery? %>
     <%= javascript_include_tag 'admin_bundle' %>
     <%= tinymce_assets %>
-    <link rel="stylesheet" href="/stylesheets/admin.css">
-    <script src="/javascripts/admin_search.js"></script>
-    <script src="/javascripts/admin_interface.js"></script>
-    <script src="/javascripts/related_assets.js"></script>
+    <link rel="stylesheet" href="<%= mtime_busted_path('/stylesheets/admin.css') %>">
+    <script src="<%= mtime_busted_path('/javascripts/admin_search.js') %>"></script>
+    <script src="<%= mtime_busted_path('/javascripts/admin_interface.js') %>"></script>
+    <script src="<%= mtime_busted_path('/javascripts/related_assets.js') %>"></script>
     <script>
       var ADMIN_SEARCH_URL = "<%= admin_search_path %>";
       var ADMIN_MENU_SEARCH_URL = "<%= admin_menu_search_path %>";
diff --git a/test/models/helpers/admin_helper_test.rb b/test/models/helpers/admin_helper_test.rb
index 23d9f40..94e9861 100644
--- a/test/models/helpers/admin_helper_test.rb
+++ b/test/models/helpers/admin_helper_test.rb
@@ -1,4 +1,14 @@
 require 'test_helper'
 
 class AdminHelperTest < ActionView::TestCase
+  test "mtime_busted_path appends the file's real mtime as a query param" do
+    path = "/stylesheets/admin.css"
+    expected_mtime = File.mtime(Rails.public_path.join("stylesheets/admin.css")).to_i
+
+    assert_equal "#{path}?v=#{expected_mtime}", mtime_busted_path(path)
+  end
+
+  test "mtime_busted_path raises clearly for a missing file rather than silently omitting the version" do
+    assert_raises(RuntimeError) { mtime_busted_path("/stylesheets/does_not_exist.css") }
+  end
 end
-- 
cgit v1.3