summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNigel Osborne <kiwi3685@me.com>2010-07-13 00:45:44 +0000
committerNigel Osborne <kiwi3685@me.com>2010-07-13 00:45:44 +0000
commit777f2cba3a3046f26a4687370dd95ed65fd5b81c (patch)
tree2f24794a01fb0aad6ee07930e09baf9a6973e103
parent03d0f41125ade453146e7872828c311b0ece5834 (diff)
downloadwebtrees-777f2cba3a3046f26a4687370dd95ed65fd5b81c.tar.gz
webtrees-777f2cba3a3046f26a4687370dd95ed65fd5b81c.tar.bz2
webtrees-777f2cba3a3046f26a4687370dd95ed65fd5b81c.zip
Small changes related to PGV to webtrees transfer wizard
-rw-r--r--help_text.php6
-rw-r--r--pgv_to_wt.php17
2 files changed, 9 insertions, 14 deletions
diff --git a/help_text.php b/help_text.php
index 0cb86d941f..c6634df5c3 100644
--- a/help_text.php
+++ b/help_text.php
@@ -3853,7 +3853,7 @@ case 'password':
case 'PGV_WIZARD':
$title=i18n::translate('PhpGedView to webtrees transfer wizard');
- $text =i18n::translate('This link will start the PGV to <b>webtrees</b> wizard. This is an automated process to assist administrators making the move from a PGV installation to a new <b>webtrees</b> one. It will transfer all PGV GEDCOM and other databse information directly to your new <b>webtrees</b> database. The following requirements are necessary:');
+ $text =i18n::translate('The PGV to <b>webtrees</b> wizard is an automated process to assist administrators make the move from a PGV installation to a new <b>webtrees</b> one. It will transfer all PGV GEDCOM and other databse information directly to your new <b>webtrees</b> database. The following requirements are necessary:');
$text .= '<ul><li>';
$text .= i18n::translate('webtrees database must be on the same server as PGV\'s');
$text .= '</li><li>';
@@ -3866,7 +3866,9 @@ case 'PGV_WIZARD':
$text .= i18n::translate('The current webtrees admin username must be the same as an existing PGV admin username');
$text .= '</li><li>';
$text .= i18n::translate('All existing PGV users must have distinct email addresses');
- $text .= '</li></ul>';
+ $text .= '</li></ul><p>';
+ $text .= i18n::translate('<b>Important Note:</b> The transfer wizard is not able to assist with moving media items. You will need to set up and move or copy your media configuration and objects separately after the transfer wizard is finished.');
+ $text .= '</p>';
break;
case 'phpinfo':
diff --git a/pgv_to_wt.php b/pgv_to_wt.php
index 9d650e1225..ec128ca741 100644
--- a/pgv_to_wt.php
+++ b/pgv_to_wt.php
@@ -111,7 +111,11 @@ if ($PGV_PATH) {
if ($error || empty($PGV_PATH)) {
// Prompt for location of PhpGedView installation
echo '<div id="container">';
- echo '<h2>', i18n::translate('PhpGedView to <b>webtrees</b> transfer wizard'), '</h2>';
+ echo
+ '<h2>',
+ i18n::translate('PhpGedView to <b>webtrees</b> transfer wizard'),
+ help_link('PGV_WIZARD'),
+ '</h2>';
if ($error) {
echo '<p class="bad">', $error, '</p>';
}
@@ -122,17 +126,6 @@ if ($error || empty($PGV_PATH)) {
'<dt>',i18n::translate('Installation directory'), '</dt>',
'<dd><input type="text" name="PGV_PATH" size="40" value="'.htmlspecialchars($PGV_PATH).'"><dd>',
'</dl>';
- // Get media options
- echo
- '<p>', i18n::translate('Media item options (select one):'), '</p>',
- '<dl>',
- '<dt>',i18n::translate('Use existing PGV media directory for <b>webtrees</b>'), '</dt>',
- '<dd>', edit_field_yes_no('media', get_gedcom_setting(WT_GED_ID, 'media')), '</dd>',
- '<dt>',i18n::translate('Copy media from PGV media directory to <b>webtrees</b> media directory'), '</dt>',
- '<dd>', edit_field_yes_no('media', get_gedcom_setting(WT_GED_ID, 'media')), '</dd>',
- '<dt>',i18n::translate('Move media from PGV media directory to <b>webtrees</b> media directory'), '</dt>',
- '<dd>', edit_field_yes_no('media', get_gedcom_setting(WT_GED_ID, 'media')), '</dd>',
- '</dl>';
// Finish
echo '<div class="center"><input type="submit" value="'.i18n::translate('next').'"></div>';
echo '</form>';