diff options
| author | fisharebest <fisharebest@gmail.com> | 2010-05-12 11:20:24 +0000 |
|---|---|---|
| committer | fisharebest <fisharebest@gmail.com> | 2010-05-12 11:20:24 +0000 |
| commit | 848f7d448f2c5f1813a4c7b25480e705c4b3ad63 (patch) | |
| tree | 04c5f899c976e6a8ec4cabd5a1cd877a07b82510 /includes/controllers | |
| parent | db0e90386e65aabc0dca9605067fa5f7c78c64fa (diff) | |
| download | webtrees-848f7d448f2c5f1813a4c7b25480e705c4b3ad63.tar.gz webtrees-848f7d448f2c5f1813a4c7b25480e705c4b3ad63.tar.bz2 webtrees-848f7d448f2c5f1813a4c7b25480e705c4b3ad63.zip | |
Use translate_fact() to translate fact names
Diffstat (limited to 'includes/controllers')
| -rw-r--r-- | includes/controllers/descendancy_ctrl.php | 4 | ||||
| -rw-r--r-- | includes/controllers/lifespan_ctrl.php | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/includes/controllers/descendancy_ctrl.php b/includes/controllers/descendancy_ctrl.php index 2c4ea544fb..efa1cdb59e 100644 --- a/includes/controllers/descendancy_ctrl.php +++ b/includes/controllers/descendancy_ctrl.php @@ -308,12 +308,12 @@ function print_family_descendancy(&$person, &$family, $depth) { $children = $family->getChildren(); print "<tr><td colspan=\"3\" class=\"details1\" > "; if ($children) { - print i18n::translate('NCHI').": ".count($children); + print translate_fact('NCHI').": ".count($children); } else { // Distinguish between no children (NCHI 0) and no recorded // children (no CHIL records) if (strpos($family->getGedcomRecord(), "\n1 NCHI 0")) { - print i18n::translate('NCHI').": ".count($children); + print translate_fact('NCHI').": ".count($children); } else { print i18n::translate('No children'); } diff --git a/includes/controllers/lifespan_ctrl.php b/includes/controllers/lifespan_ctrl.php index db8ce89478..df92d4f7cf 100644 --- a/includes/controllers/lifespan_ctrl.php +++ b/includes/controllers/lifespan_ctrl.php @@ -496,7 +496,7 @@ class LifespanControllerRoot extends BaseController { $indiName = PrintReady(str_replace(array('<span class="starredname">', '</span>'), array('<u>', '</u>'), $value->getFullName())); echo "\n\t<table><tr>\n\t\t<td width=\"15\"><a class=\"showit\" href=\"#\"><b>"; echo abbreviate_fact('BIRT'); - echo "</b><span>", $value->getSexImage(), $indiName, "<br/>", i18n::translate('BIRT'), " ", strip_tags($bdate->Display(false)), " ", PrintReady($value->getBirthPlace()), "</span></a></td>" , + echo "</b><span>", $value->getSexImage(), $indiName, "<br/>", translate_fact('BIRT'), " ", strip_tags($bdate->Display(false)), " ", PrintReady($value->getBirthPlace()), "</span></a></td>" , "\n\t\t<td align=\"left\" width=\"100%\"><a href=\"", encode_url($value->getLinkUrl()), "\">", $value->getSexImage(), $indiName, ": $lifespan </a></td>" , "\n\t\t<td width=\"15\">"; if ($value->isDead()) { @@ -504,7 +504,7 @@ class LifespanControllerRoot extends BaseController { print "<a class=\"showit\" href=\"#\"><b>"; echo abbreviate_fact('DEAT'); if (!$deathReal) print "*"; - print "</b><span>".$value->getSexImage().$indiName."<br/>".i18n::translate('DEAT')." ".strip_tags($ddate->Display(false))." ".PrintReady($value->getDeathPlace())."</span></a>"; + print "</b><span>".$value->getSexImage().$indiName."<br/>".translate_fact('DEAT')." ".strip_tags($ddate->Display(false))." ".PrintReady($value->getDeathPlace())."</span></a>"; } } print "</td></tr></table>"; @@ -525,7 +525,7 @@ class LifespanControllerRoot extends BaseController { print "\n\t<table dir=\"ltr\"><tr>\n\t\t<td width=\"15\"><a class=\"showit\" href=\"#\"><b>"; echo abbreviate_fact('BIRT'); if (!$birthReal) print "*"; - print "</b><span>".$value->getSexImage().$indiName."<br/>".i18n::translate('BIRT')." ".strip_tags($bdate->Display(false))." ".PrintReady($value->getBirthPlace())."</span></a></td>" . + print "</b><span>".$value->getSexImage().$indiName."<br/>".translate_fact('BIRT')." ".strip_tags($bdate->Display(false))." ".PrintReady($value->getBirthPlace())."</span></a></td>" . "<td align=\"left\" width=\"100%\"><a href=\"".encode_url($value->getLinkUrl())."\">".$value->getSexImage().$indiName."</a></td>" . "\n\t\t<td width=\"15\">"; if ($value->isDead()) { @@ -533,7 +533,7 @@ class LifespanControllerRoot extends BaseController { print "<a class=\"showit\" href=\"#\"><b>"; echo abbreviate_fact('DEAT'); if (!$deathReal) print "*"; - print "</b><span>".$value->getSexImage().$indiName."<br/>".i18n::translate('DEAT')." ".strip_tags($ddate->Display(false))." ".PrintReady($value->getDeathPlace())."</span></a>"; + print "</b><span>".$value->getSexImage().$indiName."<br/>".translate_fact('DEAT')." ".strip_tags($ddate->Display(false))." ".PrintReady($value->getDeathPlace())."</span></a>"; } } print "</td></tr></table>"; @@ -544,13 +544,13 @@ class LifespanControllerRoot extends BaseController { $indiName = PrintReady(str_replace(array('<span class="starredname">', '</span>'), array('<u>', '</u>'), $value->getFullName())); print "<a class=\"showit\" href=\"".encode_url($value->getLinkUrl())."\"><b>"; echo abbreviate_fact('BIRT'); - print "</b><span>".$value->getSexImage().$indiName."<br/>".i18n::translate('BIRT')." ".strip_tags($bdate->Display(false))." ".PrintReady($value->getBirthPlace())."<br/>"; + print "</b><span>".$value->getSexImage().$indiName."<br/>".translate_fact('BIRT')." ".strip_tags($bdate->Display(false))." ".PrintReady($value->getBirthPlace())."<br/>"; foreach($eventinformation as $evtwidth=>$val){ $text = explode("-fact,", $val); $val = $text[1]; print $val."<br />\n"; } - if ($value->isDead() && $deathReal) print i18n::translate('DEAT')." ".strip_tags($ddate->Display(false))." ".PrintReady($value->getDeathPlace()); + if ($value->isDead() && $deathReal) print translate_fact('DEAT')." ".strip_tags($ddate->Display(false))." ".PrintReady($value->getDeathPlace()); print "</span></a>"; echo '</div>'; } |
