Ensure long title for votes, short title for elections

Author: Tschuppi81

src/onegov/election_day/collections/archived_results.py

@@ -293,14 +293,23 @@ def update(
         result.name = request.app.principal.name
         result.date = item.date
         result.shortcode = item.shortcode
-        short_titles = {
-            k: v for k, v in (item.short_title_translations or {}).items() if v
-        }
-        result.title_translations = dict(
-            short_titles
-            or item.title_translations
-            or {}
-        )
+
+        # prioritize short title for elections, long title for votes
+        if isinstance(item, Election):
+            short_titles = {
+                k: v
+                for k, v in (item.short_title_translations or {}).items()
+                if v
+            }
+            result.title_translations = dict(
+                short_titles or item.title_translations or {}
+            )
+        else:
+            result.title_translations = dict(
+                item.title_translations
+                or item.short_title_translations
+                or {}
+            )
         result.last_modified = item.last_modified
         result.last_result_change = item.last_result_change
         result.external_id = item.id

tests/onegov/election_day/views/test_views_election.py

@@ -1060,7 +1060,7 @@ def test_views_election_municipal_and_municipality(
     assert 'Kommunale Wahlen und Abstimmungen' in goldach_page
     assert 'Goldach' in goldach_page
     assert 'Wahl' in goldach_page
-    title = 'Ersatzwahl der Schulpräsidentin/des Schulpräsidenten'
+    title = 'Wahl Schulpräsidium'  # short title
     assert title in goldach_page
-    assert (goldach_page.click('Ersatzwahl der Schulpräsidentin').
+    assert (goldach_page.click(title).
             maybe_follow().status_code == 200)