From 3665322ff52b069ae1efa18c2b6dfa5036225f10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Fri, 20 Sep 2024 22:41:50 +0200
Subject: [PATCH] etymology: link to name:etymology:website or :url
---
etymology.yaml | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/etymology.yaml b/etymology.yaml
index 73cccfe..d00f136 100644
--- a/etymology.yaml
+++ b/etymology.yaml
@@ -49,7 +49,12 @@ feature:
{% set label = wikidata ? (wikidata.labels[user.data_lang]|default(wikidata.labels[user.ui_lang])|default(wikidata.labels.en)).value : etymName[i]|default(etymWikidata[i]) %}
{% set desc = wikidata ? (wikidata.descriptions[user.data_lang]|default(wikidata.descriptions[user.ui_lang])|default(wikidata.descriptions.en)).value|default(etymDesc) : etymDesc %}
- {% set result = result|merge([ etymWikidata[i] ? '<a target="_blank" href="https://wikidata.org/wiki/' ~ etymWikidata[i]|url_encode ~ '">' ~ (etymName[i]|default(label))|e ~ '</a>' ~ (desc ? ' (' ~ desc|e ~ ')' : '') : etymName[i]|e ~ (desc ? ' (' ~ desc|e ~ ')' : '') ]) %}
+ {% set url = attribute(tags, 'name:etymology:website')
+ |default(attribute(tags, 'name:etymology:url'))
+ |default(etymWikidata[i] ? 'https://wikidata.org/wiki/' ~ etymWikidata[i]|url_encode : null)
+ %}
+
+ {% set result = result|merge([ url ? '<a target="_blank" href="' ~ url ~ '">' ~ (etymName[i]|default(label))|e ~ '</a>' ~ (desc ? ' (' ~ desc|e ~ ')' : '') : etymName[i]|e ~ (desc ? ' (' ~ desc|e ~ ')' : '') ]) %}
{% endfor %}
{{ result|enumerate|raw }}
</span>