diff --git a/public_html/admin/install/classes/installer.class.php b/public_html/admin/install/classes/installer.class.php index 8047a9739..01a9628f3 100644 --- a/public_html/admin/install/classes/installer.class.php +++ b/public_html/admin/install/classes/installer.class.php @@ -3663,6 +3663,10 @@ private function migrateStep1() $this->env['alert_message2'] = $alertMessage2; + // Update migration warning language about outdated custom theme with default theme + // Use env to overwrite Language Variable with updated info + $this->env['LANG']['MIGRATE'][5] = sprintf($LANG_MIGRATE[5], self::DEFAULT_THEME); + return MicroTemplate::quick(PATH_LAYOUT, 'step1-migrate', $this->env); } diff --git a/public_html/admin/install/language/chinese_simplified_utf-8.php b/public_html/admin/install/language/chinese_simplified_utf-8.php index 18089ac70..e94dc2007 100644 --- a/public_html/admin/install/language/chinese_simplified_utf-8.php +++ b/public_html/admin/install/language/chinese_simplified_utf-8.php @@ -214,7 +214,7 @@ 2 => 'Be sure any previously installed plugins have been copied to your new server.', 3 => 'Be sure any images from public_html/images/articles/, public_html/images/topics/, and public_html/images/userphotos/, have been copied to your new server.', 4 => 'If you\'re upgrading from a Geeklog version older than 1.5.0, then make sure to copy over all your old config.php files so that the migration can pick up your settings.', - 5 => 'If you\'re upgrading to a new Geeklog version, then don\'t upload your theme just yet. Use the included default theme until you can be sure your migrated site works properly.', + 5 => 'If you\'re upgrading to a new Geeklog version during your migration and your current theme is not packaged with Geeklog, then don\'t upload your theme just yet unless you are sure it supports this version of Geeklog. Use the included default theme "%s" until you can be sure your migrated site works properly.', 6 => 'Select an existing backup', 7 => 'Choose file...', 8 => 'From the server\'s backups directory', diff --git a/public_html/admin/install/language/chinese_traditional_utf-8.php b/public_html/admin/install/language/chinese_traditional_utf-8.php index 82cb7f44f..64ce6fe9a 100644 --- a/public_html/admin/install/language/chinese_traditional_utf-8.php +++ b/public_html/admin/install/language/chinese_traditional_utf-8.php @@ -214,7 +214,7 @@ 2 => 'Be sure any previously installed plugins have been copied to your new server.', 3 => 'Be sure any images from public_html/images/articles/, public_html/images/topics/, and public_html/images/userphotos/, have been copied to your new server.', 4 => 'If you\'re upgrading from a Geeklog version older than 1.5.0, then make sure to copy over all your old config.php files so that the migration can pick up your settings.', - 5 => 'If you\'re upgrading to a new Geeklog version, then don\'t upload your theme just yet. Use the included default theme until you can be sure your migrated site works properly.', + 5 => 'If you\'re upgrading to a new Geeklog version during your migration and your current theme is not packaged with Geeklog, then don\'t upload your theme just yet unless you are sure it supports this version of Geeklog. Use the included default theme "%s" until you can be sure your migrated site works properly.', 6 => 'Select an existing backup', 7 => 'Choose file...', 8 => 'From the server\'s backups directory', diff --git a/public_html/admin/install/language/english.php b/public_html/admin/install/language/english.php index 12c99bcbd..a880e0a97 100644 --- a/public_html/admin/install/language/english.php +++ b/public_html/admin/install/language/english.php @@ -218,7 +218,7 @@ 2 => 'Be sure any previously installed plugins have been copied to your new server.', 3 => 'Be sure any images from public_html/images/articles/, public_html/images/topics/, and public_html/images/userphotos/, have been copied to your new server.', 4 => 'If you\'re upgrading from a Geeklog version older than 1.5.0, then make sure to copy over all your old config.php files so that the migration can pick up your settings.', - 5 => 'If you\'re upgrading to a new Geeklog version, then don\'t upload your theme just yet. Use the included default theme "denim" until you can be sure your migrated site works properly.', + 5 => 'If you\'re upgrading to a new Geeklog version during your migration and your current theme is not packaged with Geeklog, then don\'t upload your theme just yet unless you are sure it supports this version of Geeklog. Use the included default theme "%s" until you can be sure your migrated site works properly.', 6 => 'Select an existing backup', 7 => 'Choose file...', 8 => 'From the server\'s backups directory', diff --git a/public_html/admin/install/language/english_utf-8.php b/public_html/admin/install/language/english_utf-8.php index 12c99bcbd..a880e0a97 100644 --- a/public_html/admin/install/language/english_utf-8.php +++ b/public_html/admin/install/language/english_utf-8.php @@ -218,7 +218,7 @@ 2 => 'Be sure any previously installed plugins have been copied to your new server.', 3 => 'Be sure any images from public_html/images/articles/, public_html/images/topics/, and public_html/images/userphotos/, have been copied to your new server.', 4 => 'If you\'re upgrading from a Geeklog version older than 1.5.0, then make sure to copy over all your old config.php files so that the migration can pick up your settings.', - 5 => 'If you\'re upgrading to a new Geeklog version, then don\'t upload your theme just yet. Use the included default theme "denim" until you can be sure your migrated site works properly.', + 5 => 'If you\'re upgrading to a new Geeklog version during your migration and your current theme is not packaged with Geeklog, then don\'t upload your theme just yet unless you are sure it supports this version of Geeklog. Use the included default theme "%s" until you can be sure your migrated site works properly.', 6 => 'Select an existing backup', 7 => 'Choose file...', 8 => 'From the server\'s backups directory', diff --git a/public_html/admin/install/language/german_utf-8.php b/public_html/admin/install/language/german_utf-8.php index 6ed34b5ab..388df6546 100644 --- a/public_html/admin/install/language/german_utf-8.php +++ b/public_html/admin/install/language/german_utf-8.php @@ -213,7 +213,7 @@ 2 => 'Stelle sicher, dass alle bereits installierten Plugins auf den neuen Server kopiert wurden.', 3 => 'Stelle sicher, dass alle Bilder aus public_html/images/articles/, public_html/images/topics/, und public_html/images/userphotos/ auf den neuen Server kopiert wurden.', 4 => 'Wenn Du von einer Geeklog-Version älter als 1.5.0 aktualisierst solltest Du sicherstellen, dass alle alten config.php-Dateien (von Geeklog und von den Plugins) auf den neuen Server kopiert wurden, damit die alten Einstellungen übernommen werden können.', - 5 => 'Wenn Du von einer älteren Geeklog-Version aktualisierst, dann solltest Du Dein Theme noch nicht hochladen. Benutze zuerst das mitgelieferte Theme bis sicher ist, dass die Migration erfolgreich war.', + 5 => 'If you\'re upgrading to a new Geeklog version during your migration and your current theme is not packaged with Geeklog, then don\'t upload your theme just yet unless you are sure it supports this version of Geeklog. Use the included default theme "%s" until you can be sure your migrated site works properly.', 6 => 'Backup auswählen', 7 => 'Datei auswählen...', 8 => 'Vom backups-Verzeichnis des Webservers', diff --git a/public_html/admin/install/language/japanese_utf-8.php b/public_html/admin/install/language/japanese_utf-8.php index d2ba2d8e7..f2868a6ec 100644 --- a/public_html/admin/install/language/japanese_utf-8.php +++ b/public_html/admin/install/language/japanese_utf-8.php @@ -215,7 +215,7 @@ 2 => '以前のプラグインが新しいサーバーにコピーされていることを確認してください。', 3 => '画像ディレクトリ:
public_html/images/articles/
public_html/images/topics/
public_html/images/userphotos/
が、新しいサーバーに移行されていることを確認してください。', 4 => '1.5.0以前のバージョンからアップグレードする場合は、config.phpもコピーしてください。移行後、これを参照して設定できます。', - 5 => 'アップグレードの場合、テーマをそのままアップロードしないでください。テーマを完全に移行するまでは、付属のデフォルトテーマを活用してください。', + 5 => 'If you\'re upgrading to a new Geeklog version during your migration and your current theme is not packaged with Geeklog, then don\'t upload your theme just yet unless you are sure it supports this version of Geeklog. Use the included default theme "%s" until you can be sure your migrated site works properly.', 6 => 'バックアップファイルを選択', 7 => 'ファイル選択...', 8 => 'サーバーのbackupsディレクトリから', diff --git a/public_html/admin/install/language/polish_utf-8.php b/public_html/admin/install/language/polish_utf-8.php index bb9ca9d59..e38c44970 100644 --- a/public_html/admin/install/language/polish_utf-8.php +++ b/public_html/admin/install/language/polish_utf-8.php @@ -213,7 +213,7 @@ 2 => 'Be sure any previously installed plugins have been copied to your new server.', 3 => 'Be sure any images from public_html/images/articles/, public_html/images/topics/, and public_html/images/userphotos/, have been copied to your new server.', 4 => 'If you\'re upgrading from a Geeklog version older than 1.5.0, then make sure to copy over all your old config.php files so that the migration can pick up your settings.', - 5 => 'If you\'re upgrading to a new Geeklog version, then don\'t upload your theme just yet. Use the included default theme until you can be sure your migrated site works properly.', + 5 => 'If you\'re upgrading to a new Geeklog version during your migration and your current theme is not packaged with Geeklog, then don\'t upload your theme just yet unless you are sure it supports this version of Geeklog. Use the included default theme "%s" until you can be sure your migrated site works properly.', 6 => 'Select an existing backup', 7 => 'Choose file...', 8 => 'From the server\'s backups directory',