From bf01926b46a85b5aed7c293342eda3ed1b10eb5c Mon Sep 17 00:00:00 2001 From: Peter Stadler Date: Wed, 15 Jan 2014 18:10:35 +0100 Subject: [PATCH] changed maiden name to birth name (cf. 6c0847ad710131de2226c15b150d13a910e7639a) --- webapp/xml/dictionary_de.xml | 6 ++++-- webapp/xml/dictionary_en.xml | 4 +++- webapp/xql/modules/wega.xqm | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/webapp/xml/dictionary_de.xml b/webapp/xml/dictionary_de.xml index 831fd6b9d..292d31443 100644 --- a/webapp/xml/dictionary_de.xml +++ b/webapp/xml/dictionary_de.xml @@ -196,6 +196,8 @@ Richtlinien Publikationen Projektbeschreibung + Notenedition + Bandübersicht Aktuelles vom %1 Digitale Edition Zur Ausgabe @@ -301,7 +303,7 @@ Zeitschriftenaufsatz Sammelbandbeitrag Aufsatz in Konferenzbericht - Noten + Notenband Varia Monographie Rezension @@ -328,7 +330,7 @@ Spätestens am %1 %1 v. Chr. Auswertung - Mädchenname + Geburtsname Ehename Wirklicher Name Begräbnis diff --git a/webapp/xml/dictionary_en.xml b/webapp/xml/dictionary_en.xml index 6a58edaf9..b347fd353 100644 --- a/webapp/xml/dictionary_en.xml +++ b/webapp/xml/dictionary_en.xml @@ -193,6 +193,8 @@ Guidelines Publications Project Description + Printed Scores + Contents of Series and Volumes News of %1 Digital Edition About the project @@ -300,7 +302,7 @@ %1 at the latest %1 BC Analysis - Maiden Name + Birth Name Married Name Real Name Funeral diff --git a/webapp/xql/modules/wega.xqm b/webapp/xql/modules/wega.xqm index fe75dba5b..e4fd5d1b4 100644 --- a/webapp/xql/modules/wega.xqm +++ b/webapp/xql/modules/wega.xqm @@ -832,8 +832,8 @@ element div { return ( {wega:cleanString($i)}, (: transform:transform($i, doc("/db/webapp/xsl/person_singleView.xsl"), $xslParams),:) - if($i[@subtype='maiden']) - then {concat(' (', wega:getLanguageString('maidenName',$lang), ')')} + if($i[@subtype='birth']) + then {concat(' (', wega:getLanguageString('birthName',$lang), ')')} else if($i[@subtype='married']) then {concat(' (', wega:getLanguageString('marriedName',$lang), ')')} else '',