diff --git a/src/components/GrampsjsFormSelectDate.js b/src/components/GrampsjsFormSelectDate.js index b6cf860e..42a1597b 100644 --- a/src/components/GrampsjsFormSelectDate.js +++ b/src/components/GrampsjsFormSelectDate.js @@ -13,12 +13,14 @@ import {GrampsjsTranslateMixin} from '../mixins/GrampsjsTranslateMixin.js' const modifiers = { 0: 'Regular', - 1: 'Before', - 2: 'After', - 3: 'About', + 1: 'before', + 2: 'after', + 3: 'about', 4: 'Range', 5: 'Span', // 6: 'Text only' + 7: 'from', + 8: 'to', } const qualifiers = { @@ -265,7 +267,7 @@ class GrampsjsFormSelectDate extends GrampsjsTranslateMixin(LitElement) { } _hasSecondDate() { - return this.data?.modifier >= 4 + return this.data?.modifier === 4 || this.data?.modifier === 5 } reset() { diff --git a/src/strings.js b/src/strings.js index 1f24cec0..acb2748d 100644 --- a/src/strings.js +++ b/src/strings.js @@ -77,6 +77,7 @@ export const grampsStrings = [ '_Save', 'Abbreviation', 'Abort changes?', + 'about', 'About', 'Above the name', 'Add a new event', @@ -91,6 +92,7 @@ export const grampsStrings = [ 'Adopted people', 'Adopted', 'Adult Christening', + 'after', 'After', 'Age at death', 'Age', @@ -115,6 +117,7 @@ export const grampsStrings = [ 'Baptism', 'Bar Mitzvah', 'Bas Mitzvah', + 'before', 'Before', 'between', 'Birth Date', @@ -266,6 +269,7 @@ export const grampsStrings = [ 'Filter', 'First Communion', 'Foster', + 'from', 'FTP', 'full circle', 'Full Name', @@ -570,6 +574,7 @@ export const grampsStrings = [ 'Timeline', 'Title', 'To Do', + 'to', 'Tombstone', 'Top Left', 'Top paper margin',