summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/Factories/ElementFactory.php12
-rw-r--r--app/Gedcom.php2
-rw-r--r--resources/views/admin/tags.phtml41
3 files changed, 7 insertions, 48 deletions
diff --git a/app/Factories/ElementFactory.php b/app/Factories/ElementFactory.php
index 6193b4be13..b26cdf69ac 100644
--- a/app/Factories/ElementFactory.php
+++ b/app/Factories/ElementFactory.php
@@ -302,7 +302,7 @@ class ElementFactory implements ElementFactoryInterface
'FAM:*:PLAC:ROMN:TYPE' => new RomanizedType(I18N::translate('Type')),
'FAM:*:RELI' => new ReligiousAffiliation(I18N::translate('Religion')),
'FAM:*:RESN' => new RestrictionNotice(I18N::translate('Restriction')),
- 'FAM:*:SOUR' => new XrefSource(I18N::translate('Source')),
+ 'FAM:*:SOUR' => new XrefSource(I18N::translate('Source citation')),
'FAM:*:SOUR:DATA' => new SourceData(I18N::translate('Data')),
'FAM:*:SOUR:DATA:DATE' => new EntryRecordingDate(I18N::translate('Date of entry in original source')),
'FAM:*:SOUR:DATA:TEXT' => new TextFromSource(I18N::translate('Text')),
@@ -354,7 +354,7 @@ class ElementFactory implements ElementFactoryInterface
'FAM:SLGS:STAT' => new LdsSpouseSealingDateStatus(I18N::translate('Status')),
'FAM:SLGS:STAT:DATE' => new ChangeDate(I18N::translate('Status change date')),
'FAM:SLGS:TEMP' => new TempleCode(I18N::translate('Temple')),
- 'FAM:SOUR' => new XrefSource(I18N::translate('Source')),
+ 'FAM:SOUR' => new XrefSource(I18N::translate('Source citation')),
'FAM:SOUR:DATA' => new SourceData(I18N::translate('Data')),
'FAM:SOUR:DATA:DATE' => new EntryRecordingDate(I18N::translate('Date of entry in original source')),
'FAM:SOUR:DATA:TEXT' => new TextFromSource(I18N::translate('Text')),
@@ -432,7 +432,7 @@ class ElementFactory implements ElementFactoryInterface
'INDI:*:PLAC:ROMN:TYPE' => new RomanizedType(I18N::translate('Type')),
'INDI:*:RELI' => new ReligiousAffiliation(I18N::translate('Religion')),
'INDI:*:RESN' => new RestrictionNotice(I18N::translate('Restriction')),
- 'INDI:*:SOUR' => new XrefSource(I18N::translate('Source')),
+ 'INDI:*:SOUR' => new XrefSource(I18N::translate('Source citation')),
'INDI:*:SOUR:DATA' => new SourceData(I18N::translate('Data')),
'INDI:*:SOUR:DATA:DATE' => new EntryRecordingDate(I18N::translate('Date of entry in original source')),
'INDI:*:SOUR:DATA:TEXT' => new TextFromSource(I18N::translate('Text')),
@@ -599,7 +599,7 @@ class ElementFactory implements ElementFactoryInterface
'INDI:SLGC:STAT' => new LdsChildSealingDateStatus(I18N::translate('Status')),
'INDI:SLGC:STAT:DATE' => new ChangeDate(I18N::translate('Status change date')),
'INDI:SLGC:TEMP' => new TempleCode(I18N::translate('Temple')),
- 'INDI:SOUR' => new XrefSource(I18N::translate('Source')),
+ 'INDI:SOUR' => new XrefSource(I18N::translate('Source citation')),
'INDI:SOUR:DATA' => new SourceData(I18N::translate('Data')),
'INDI:SOUR:DATA:DATE' => new EntryRecordingDate(I18N::translate('Date of entry in original source')),
'INDI:SOUR:DATA:TEXT' => new TextFromSource(I18N::translate('Text')),
@@ -622,7 +622,7 @@ class ElementFactory implements ElementFactoryInterface
'NOTE:REFN' => new UserReferenceNumber(I18N::translate('Reference number')),
'NOTE:REFN:TYPE' => new UserReferenceType(I18N::translate('Type of reference number')),
'NOTE:RIN' => new AutomatedRecordId(I18N::translate('Record ID number')),
- 'NOTE:SOUR' => new XrefSource(I18N::translate('Source')),
+ 'NOTE:SOUR' => new XrefSource(I18N::translate('Source citation')),
'NOTE:SOUR:DATA' => new SourceData(I18N::translate('Data')),
'NOTE:SOUR:DATA:DATE' => new EntryRecordingDate(I18N::translate('Date of entry in original source')),
'NOTE:SOUR:DATA:TEXT' => new TextFromSource(I18N::translate('Text')),
@@ -645,7 +645,7 @@ class ElementFactory implements ElementFactoryInterface
'OBJE:REFN' => new UserReferenceNumber(I18N::translate('Reference number')),
'OBJE:REFN:TYPE' => new UserReferenceType(I18N::translate('Type of reference number')),
'OBJE:RIN' => new AutomatedRecordId(I18N::translate('Record ID number')),
- 'OBJE:SOUR' => new XrefSource(I18N::translate('Source')),
+ 'OBJE:SOUR' => new XrefSource(I18N::translate('Source citation')),
'OBJE:SOUR:DATA' => new SourceData(I18N::translate('Data')),
'OBJE:SOUR:DATA:DATE' => new EntryRecordingDate(I18N::translate('Date of entry in original source')),
'OBJE:SOUR:DATA:TEXT' => new TextFromSource(I18N::translate('Text')),
diff --git a/app/Gedcom.php b/app/Gedcom.php
index 7fdb575b4d..6db570fa23 100644
--- a/app/Gedcom.php
+++ b/app/Gedcom.php
@@ -101,7 +101,7 @@ class Gedcom
'SOUR_NOTE' => [':SOUR:NOTE'],
'SOUR_QUAY' => [':SOUR:QUAY'],
// Sources
- 'SOUR_DATA' => ['SOUR:DATA'],
+ 'SOUR_DATA' => ['SOUR:DATA:EVEN', 'SOUR:DATA:AGNC', 'SOUR:DATA:NOTE'],
// Individuals
'BIRT_FAMC' => ['INDI:BIRT:FAMC'],
'RELI' => ['INDI:RELI'],
diff --git a/resources/views/admin/tags.phtml b/resources/views/admin/tags.phtml
index 0464e607ef..4288ac975e 100644
--- a/resources/views/admin/tags.phtml
+++ b/resources/views/admin/tags.phtml
@@ -423,47 +423,6 @@ use Fisharebest\Webtrees\Site;
<?= view('components/checkbox-inline', ['name' => 'HIDE_SOUR_DATA', 'label' => I18N::translate('hide'), 'checked' => (bool) Site::getPreference('HIDE_SOUR_EVEN')]) ?>
</td>
</tr>
-
- <tr>
- <td>
- <?= $element_factory->make('INDI:SOUR:DATA:DATE')->label() ?>
- </td>
- <td>
- <code dir="ltr">SOUR:DATA:DATE</code>
- </td>
-
- <td>
- <?= view('components/checkbox-inline', ['name' => 'HIDE_SOUR_DATE', 'label' => I18N::translate('hide'), 'checked' => (bool) Site::getPreference('HIDE_SOUR_DATE')]) ?>
- </td>
- </tr>
-
- <tr>
- <td>
- <?= $element_factory->make('INDI:SOUR:NOTE')->label() ?>
- </td>
-
- <td>
- <code dir="ltr">SOUR:NOTE</code>
- </td>
-
- <td>
- <?= view('components/checkbox-inline', ['name' => 'HIDE_SOUR_NOTE', 'label' => I18N::translate('hide'), 'checked' => (bool) Site::getPreference('HIDE_SOUR_NOTE')]) ?>
- </td>
- </tr>
-
- <tr>
- <td>
- <?= $element_factory->make('INDI:SOUR:QUAY')->label() ?>
- </td>
-
- <td>
- <code dir="ltr">SOUR:QUAY</code>
- </td>
-
- <td>
- <?= view('components/checkbox-inline', ['name' => 'HIDE_SOUR_QUAY', 'label' => I18N::translate('hide'), 'checked' => (bool) Site::getPreference('HIDE_SOUR_QUAY')]) ?>
- </td>
- </tr>
</tbody>
</table>