diff options
| author | Greg Roach <greg@subaqua.co.uk> | 2021-02-11 14:55:13 +0000 |
|---|---|---|
| committer | Greg Roach <greg@subaqua.co.uk> | 2021-02-11 14:55:13 +0000 |
| commit | 8d25f0db9abe7567e9286c98ffa37254bf1be0be (patch) | |
| tree | 1ae3d247a8a49084596948673b2fd0182631e84c /resources | |
| parent | 70ac1a220d7b8b1a9f0b161d319970c889724f43 (diff) | |
| download | webtrees-8d25f0db9abe7567e9286c98ffa37254bf1be0be.tar.gz webtrees-8d25f0db9abe7567e9286c98ffa37254bf1be0be.tar.bz2 webtrees-8d25f0db9abe7567e9286c98ffa37254bf1be0be.zip | |
Fix: #3719 - HTML titles for name types in lists
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/views/lists/families-table.phtml | 5 | ||||
| -rw-r--r-- | resources/views/lists/individuals-table.phtml | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/resources/views/lists/families-table.phtml b/resources/views/lists/families-table.phtml index 83b6041c93..99bc22bcb6 100644 --- a/resources/views/lists/families-table.phtml +++ b/resources/views/lists/families-table.phtml @@ -8,7 +8,6 @@ use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Family; -use Fisharebest\Webtrees\GedcomTag; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\View; @@ -243,7 +242,7 @@ $marriageAgeData = [ <td colspan="2" data-sort="<?= e(str_replace([',', Individual::PRAENOMEN_NESCIO, Individual::NOMEN_NESCIO], 'AAAA', implode(',', array_reverse(explode(',', $husb->sortName()))))) ?>"> <?php foreach ($husb->getAllNames() as $num => $name) : ?> <?php if ($name['type'] !== '_MARNM' || $num == $husb->getPrimaryName()) : ?> - <a title="<?= $name['type'] === 'NAME' ? '' : Registry::elementFactory()->make('INDI:NAME:' . $name['type'])->label() ?>" href="<?= e($family->url()) ?>" class="<?= $num === $husb->getPrimaryName() ? 'name2' : '' ?>"> + <a title="<?= $name['type'] === '_MARNM' ? I18N::translate('Married name') : '' ?>" href="<?= e($family->url()) ?>" class="<?= $num === $husb->getPrimaryName() ? 'name2' : '' ?>"> <?= $name['full'] ?> </a> <?php if ($num === $husb->getPrimaryName()) : ?> @@ -278,7 +277,7 @@ $marriageAgeData = [ <td colspan="2" data-sort="<?= e(str_replace([',', Individual::PRAENOMEN_NESCIO, Individual::NOMEN_NESCIO], 'AAAA', implode(',', array_reverse(explode(',', $wife->sortName()))))) ?>"> <?php foreach ($wife->getAllNames() as $num => $name) : ?> <?php if ($name['type'] !== '_MARNM' || $num == $wife->getPrimaryName()) : ?> - <a title="<?= $name['type'] === 'NAME' ? '' : Registry::elementFactory()->make('INDI:NAME:' . $name['type'])->label() ?>" href="<?= e($family->url()) ?>" class="<?= $num === $wife->getPrimaryName() ? 'name2' : '' ?>"> + <a title="<?= $name['type'] === '_MARNM' ? I18N::translate('Married name') : '' ?>" href="<?= e($family->url()) ?>" class="<?= $num === $wife->getPrimaryName() ? 'name2' : '' ?>"> <?= $name['full'] ?> </a> <?php if ($num === $wife->getPrimaryName()) : ?> diff --git a/resources/views/lists/individuals-table.phtml b/resources/views/lists/individuals-table.phtml index 4ee316f67e..4ff346e5e9 100644 --- a/resources/views/lists/individuals-table.phtml +++ b/resources/views/lists/individuals-table.phtml @@ -6,13 +6,11 @@ use Fisharebest\Webtrees\Age; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Carbon; use Fisharebest\Webtrees\Date; -use Fisharebest\Webtrees\GedcomTag; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\Module\ModuleChartInterface; use Fisharebest\Webtrees\Module\ModuleInterface; use Fisharebest\Webtrees\Module\RelationshipsChartModule; -use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\View; @@ -266,7 +264,7 @@ $deathAgeData = [ <tr class="<?= $individual->isPendingAddition() ? 'wt-new' : '' ?> <?= $individual->isPendingDeletion() ? 'wt-old' : '' ?>"> <td colspan="2" data-sort="<?= e(str_replace([',', Individual::PRAENOMEN_NESCIO, Individual::NOMEN_NESCIO], 'AAAA', implode(',', array_reverse(explode(',', $individual->sortName()))))) ?>"> <?php foreach ($individual->getAllNames() as $num => $name) : ?> - <a title="<?= $name['type'] === 'NAME' ? '' : Registry::elementFactory()->make('INDI:NAME:' . $name['type'])->label() ?>" href="<?= e($individual->url()) ?>" class="<?= $num === $individual->getPrimaryName() ? 'name2' : '' ?>"> + <a title="<?= $name['type'] === '_MARNM' ? I18N::translate('Married name') : '' ?>" href="<?= e($individual->url()) ?>" class="<?= $num === $individual->getPrimaryName() ? 'name2' : '' ?>"> <?= $name['full'] ?> </a> <?php if ($num === $individual->getPrimaryName()) : ?> |