diff options
| -rw-r--r-- | includes/classes/class_i18n.php | 5 | ||||
| -rw-r--r-- | modules/relatives/pgv_module.php | 48 |
2 files changed, 8 insertions, 45 deletions
diff --git a/includes/classes/class_i18n.php b/includes/classes/class_i18n.php index 6df04b2d97..6be232bbe8 100644 --- a/includes/classes/class_i18n.php +++ b/includes/classes/class_i18n.php @@ -225,11 +225,6 @@ class i18n { return call_user_func_array('sprintf', $args); } - // These two functions are deprecated. - static public function is_translated($string) { - return i18n::translate($string)!=$string; - } - // Convert an array to a list. For example // array("red", "green", "yellow", "blue") => "red, green, yellow and blue" static public function make_list($array) { diff --git a/modules/relatives/pgv_module.php b/modules/relatives/pgv_module.php index ad9d93f559..42f832994b 100644 --- a/modules/relatives/pgv_module.php +++ b/modules/relatives/pgv_module.php @@ -194,52 +194,20 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab { <?php //echo "<span class=\"details_label\">".i18n::translate('NCHI').": </span>".$family->getNumberOfChildren()."<br />";?> <?php if ($date && $date->isOK() || $place) { $marr_type = "MARR_".strtoupper($family->getMarriageType()); - if (i18n::is_translated($marr_type)) echo "<span class=\"details_label\">".i18n::translate($marr_type).": </span>"; - else echo "<span class=\"details_label\">".i18n::translate('MARR').": </span>".$family->getMarriageType(); + echo "<span class=\"details_label\">".i18n::translate('MARR').": </span>".$family->getMarriageType(); if ($date) { echo $date->Display(false); if (!empty($place)) echo ' -- '; } if (!empty($place)) echo $place; - } - else if (get_sub_record(1, "1 _NMR", find_family_record($famid, WT_GED_ID))) { - // Allow special processing for different languages - $func="fact_NMR_localisation_".WT_LOCALE; - if (function_exists($func)) { - // Localise the _NMR facts - echo i18n::translate($func("_NMR", $famid)); - } else { - echo i18n::translate('_NMR'); - } - } - else if (get_sub_record(1, "1 _NMAR", find_family_record($famid, WT_GED_ID))) { - // Allow special processing for different languages - $func="fact_NMR_localisation_".WT_LOCALE; - if (function_exists($func)) { - // Localise the _NMR facts - echo i18n::translate($func("_NMAR", $famid)); - } else { - echo i18n::translate('_NMAR'); - } - } - else if ($family->getMarriageRecord()=="" && $this->controller->canedit) { + } else if (get_sub_record(1, "1 _NMR", find_family_record($famid, WT_GED_ID))) { + echo i18n::translate('_NMR'); + } else if (get_sub_record(1, "1 _NMAR", find_family_record($famid, WT_GED_ID))) { + echo i18n::translate('_NMAR'); + } else if ($family->getMarriageRecord()=="" && $this->controller->canedit) { print "<a href=\"#\" onclick=\"return add_new_record('".$famid."', 'MARR');\">".i18n::translate('Add marriage details')."</a>"; - } - else { - $factdetail = explode(' ', trim($family->getMarriageRecord())); - if ($family->getMarriageType()) - $marr_type = "MARR_".strtoupper($family->getMarriageType()); - else - $marr_type = "MARR"; - if (i18n::is_translated($marr_type)) { - if (isset($factdetail)) - if (count($factdetail) == 3) - if (strtoupper($factdetail[2]) == "Y") - echo "<span class=\"details_label\">".i18n::translate($marr_type).": </span>".i18n::translate('Yes'); - else if (strtoupper($factdetail[2]) == "N") - echo "<span class=\"details_label\">".i18n::translate($marr_type).": </span>".i18n::translate('No'); - } - else echo "<span class=\"details_label\">".i18n::translate('MARR').": </span>".$family->getMarriageType(); + } else { + echo "<span class=\"details_label\">".i18n::translate('MARR').": </span>".$family->getMarriageType(); } ?> </td> |