summaryrefslogtreecommitdiff
path: root/modules_v3/googlemap
diff options
context:
space:
mode:
Diffstat (limited to 'modules_v3/googlemap')
-rw-r--r--modules_v3/googlemap/googlemap.php12
-rw-r--r--modules_v3/googlemap/placehierarchy.php8
2 files changed, 9 insertions, 11 deletions
diff --git a/modules_v3/googlemap/googlemap.php b/modules_v3/googlemap/googlemap.php
index 9e9f080edd..ce971d6680 100644
--- a/modules_v3/googlemap/googlemap.php
+++ b/modules_v3/googlemap/googlemap.php
@@ -424,14 +424,14 @@ function build_indiv_map($indifacts, $famids) {
$i = $i + 1;
$markers[$i]=array('index'=>'', 'tabindex'=>'', 'placed'=>'no');
if (strpos($srec, "\n1 SEX F")!==false) {
- $markers[$i]['fact'] = WT_I18N::translate('Daughter');
+ $markers[$i]['fact'] = WT_I18N::translate('daughter');
$markers[$i]['class'] = 'person_boxF';
} else {
if (strpos($srec, "\n1 SEX M")!==false) {
- $markers[$i]['fact'] = WT_I18N::translate('Son');
+ $markers[$i]['fact'] = WT_I18N::translate('son');
$markers[$i]['class'] = 'person_box';
} else {
- $markers[$i]['fact'] = WT_Gedcom_Tag::getLabel('CHIL');
+ $markers[$i]['fact'] = WT_I18N::translate('child');
$markers[$i]['class'] = 'person_boxNN';
}
}
@@ -457,14 +457,14 @@ function build_indiv_map($indifacts, $famids) {
if ((count($latlongval) != 0) && ($latlongval['lati'] != NULL) && ($latlongval['long'] != NULL)) {
$i = $i + 1;
$markers[$i]=array('index'=>'', 'tabindex'=>'', 'placed'=>'no');
- $markers[$i]['fact'] = WT_Gedcom_Tag::getLabel('CHIL');
+ $markers[$i]['fact'] = WT_I18N::translate('child');
$markers[$i]['class'] = 'option_boxNN';
if (strpos($srec, "\n1 SEX F")!==false) {
- $markers[$i]['fact'] = WT_I18N::translate('Daughter');
+ $markers[$i]['fact'] = WT_I18N::translate('daughter');
$markers[$i]['class'] = 'person_boxF';
}
if (strpos($srec, "\n1 SEX M")!==false) {
- $markers[$i]['fact'] = WT_I18N::translate('Son');
+ $markers[$i]['fact'] = WT_I18N::translate('son');
$markers[$i]['class'] = 'person_box';
}
$markers[$i]['icon'] = $latlongval['icon'];
diff --git a/modules_v3/googlemap/placehierarchy.php b/modules_v3/googlemap/placehierarchy.php
index c0dfadfde0..62a07c85b9 100644
--- a/modules_v3/googlemap/placehierarchy.php
+++ b/modules_v3/googlemap/placehierarchy.php
@@ -33,8 +33,6 @@ if (file_exists(WT_ROOT.WT_MODULES_DIR.'googlemap/defaultconfig.php')) {
require WT_ROOT.WT_MODULES_DIR.'googlemap/defaultconfig.php';
}
-$stats = new WT_Stats($GEDCOM);
-
function place_id_to_hierarchy($id) {
$statement=
WT_DB::prepare("SELECT pl_parent_id, pl_place FROM `##placelocation` WHERE pl_id=?");
@@ -178,9 +176,9 @@ function create_map($placelevels) {
$placelevels=preg_replace('/, '.WT_I18N::translate('unknown').'/', ', ', $placelevels); // replace ", unknown" with ", "
$placelevels=substr($placelevels, 2); // remove the leading ", "
if ($placelevels) {
- $batchupdate_url='module.php?mod=batch_update&mod_action=admin_batch_update&plugin=search_replace_bu_plugin&method=exact&GEDCOM='.WT_GEDCOM.'&search='.urlencode($placelevels); // exact match
+ $batchupdate_url='module.php?mod=batch_update&mod_action=admin_batch_update&plugin=search_replace_bu_plugin&method=exact&ged='.WT_GEDCOM.'&search='.urlencode($placelevels); // exact match
echo ' | ';
- echo '<a href="'.$batchupdate_url.'">', WT_I18N::translate('Batch Update'), '</a>';
+ echo '<a href="'.$batchupdate_url.'">', WT_I18N::translate('Batch update'), '</a>';
}
}
}
@@ -294,7 +292,7 @@ function check_place($place_names, $place) {
}
function print_how_many_people($level, $parent) {
- global $GEDCOM, $stats;
+ $stats = new WT_Stats(WT_GEDCOM);
$place_count_indi = 0;
$place_count_fam = 0;