summaryrefslogtreecommitdiff
path: root/resources/js
diff options
context:
space:
mode:
authorGreg Roach <greg@subaqua.co.uk>2021-09-28 08:51:16 +0100
committerGreg Roach <greg@subaqua.co.uk>2021-09-28 08:51:16 +0100
commit9026ef5bd8d55330f29b7fff025dae728574371b (patch)
tree443f2b07d078608ae6a74ebc917080ef334447e2 /resources/js
parent90bd3e8bcf49ae5a120b175c9559459863a185d0 (diff)
downloadwebtrees-9026ef5bd8d55330f29b7fff025dae728574371b.tar.gz
webtrees-9026ef5bd8d55330f29b7fff025dae728574371b.tar.bz2
webtrees-9026ef5bd8d55330f29b7fff025dae728574371b.zip
SPFX ending with apostrophe doesn't need a space
Diffstat (limited to 'resources/js')
-rw-r--r--resources/js/webtrees.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/resources/js/webtrees.js b/resources/js/webtrees.js
index 544a6ce989..9a479c5ec4 100644
--- a/resources/js/webtrees.js
+++ b/resources/js/webtrees.js
@@ -94,7 +94,9 @@
surn = inflectSurname(trim(surn.replace(/,/g, separator)), sex);
nsfx = trim(nsfx);
- const surname = trim(spfx + separator + surn);
+ const surname_separator = spfx.endsWith('\'') || spfx.endsWith('‘') ? '' : ' ';
+
+ const surname = trim(spfx + surname_separator + surn);
const name = surnameFirst ? slash + surname + slash + separator + givn : givn + separator + slash + surname + slash;