diff options
| author | Richard McGirr <rmcgirr83@gmail.com> | 2016-04-05 06:57:32 -0400 |
|---|---|---|
| committer | Richard McGirr <rmcgirr83@gmail.com> | 2016-04-05 07:09:12 -0400 |
| commit | 04f320cb011f386d11672547c17965a7bd16ef35 (patch) | |
| tree | d233fa57ab885bcf6b236fde47c4bd6d304939b2 /phpBB/language | |
| parent | d0f5b39f117376a037bdeabc91f32c1d5436d99b (diff) | |
| download | forums-04f320cb011f386d11672547c17965a7bd16ef35.tar forums-04f320cb011f386d11672547c17965a7bd16ef35.tar.gz forums-04f320cb011f386d11672547c17965a7bd16ef35.tar.bz2 forums-04f320cb011f386d11672547c17965a7bd16ef35.tar.xz forums-04f320cb011f386d11672547c17965a7bd16ef35.zip | |
[ticket/13716] Check phpBB version against config version
Display a warning in the ACP if the version constant (files)
does not match the phpbb_config version
(often indicating that the database updates hasn't been run)
PHPBB3-13716
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/install.php | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index dd22e84fcb..a14489b80f 100644 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -400,6 +400,7 @@ $lang = array_merge($lang, array( 'DATABASE_UPDATE_CONTINUE' => 'Continue database update', 'DATABASE_UPDATE_INFO_OLD' => 'The database update file within the install directory is outdated. Please make sure you uploaded the correct version of the file.', 'DATABASE_UPDATE_NOT_COMPLETED' => 'The database update has not yet completed.', + 'DATABASE_VERSION' => 'Database version', 'DELETE_USER_REMOVE' => 'Delete user and remove posts', 'DELETE_USER_RETAIN' => 'Delete user but keep posts', 'DESTINATION' => 'Destination file', @@ -439,6 +440,7 @@ $lang = array_merge($lang, array( 'FILES_NOT_MODIFIED_EXPLAIN' => 'The following files are not modified and represent the original phpBB files from the version you want to update from.', 'FILES_UP_TO_DATE' => 'Already updated files', 'FILES_UP_TO_DATE_EXPLAIN' => 'The following files are already up to date and do not need to be updated.', + 'FILES_VERSION' => 'Files Version', 'FTP_SETTINGS' => 'FTP settings', 'FTP_UPDATE_METHOD' => 'FTP upload', @@ -486,6 +488,7 @@ $lang = array_merge($lang, array( 'OLD_UPDATE_FILES' => 'Update files are out of date. The update files found are for updating from phpBB %1$s to phpBB %2$s but the latest version of phpBB is %3$s.', 'PACKAGE_UPDATES_TO' => 'Current package updates to version', + 'PACKAGE_VERSION' => 'Package version installed', 'PERFORM_DATABASE_UPDATE' => 'Perform database update', 'PERFORM_DATABASE_UPDATE_EXPLAIN' => 'Below you will find a button to the database update script. The database update can take a while, so please do not stop the execution if it seems to hang. After the database update has been performed just follow the instructions to continue the update process.', 'PREVIOUS_VERSION' => 'Previous version', @@ -530,6 +533,28 @@ $lang = array_merge($lang, array( 'UPDATE_DATABASE_SCHEMA' => 'Updating database schema', 'UPDATE_FILES' => 'Update files', 'UPDATE_FILES_NOTICE' => 'Please make sure you have updated your board files too, this file is only updating your database.', + 'UPDATE_INCOMPLETE' => 'Your phpBB installation has not been correctly updated.', + 'UPDATE_INCOMPLETE_MORE' => 'Please see the information below to know how to fix that.', + 'UPDATE_INCOMPLETE_EXPLAIN' => '<h1>Incomplete update</h1> + + <p>We noticed that the last update of your phpBB installation hasn’t been correctly completed. Have you updated your files and forget to update your database? In this case, phpBB can’t work correctly and you may notice some strange behaviour.</p> + + <br> + + <h1>How to complete the update of phpBB?</h1> + + <p>If you have updated phpBB using the Automatic Update Package, please restart the update process to be sure that all steps are correctly completed.</p> + + <ul style="margin-left: 20px; font-size: 1.1em;"> + <li>Retrieve the Automatic Update Package that you’ve used to update phpBB. The latest package can be found <a href="https://www.phpbb.com/downloads/" title="https://www.phpbb.com/downloads/">on phpBB.com</a>. For previous version, the package can be found <a href="https://download.phpbb.com/pub/release/" title="https://download.phpbb.com/pub/release/">on the phpBB download servers</a>.<br /><br /></li> + <li>Unpack the archive.<br /><br /></li> + <li>Upload the complete uncompressed "install" and "vendor" folders to your phpBB root directory (where your config.php file is).<br /><br /></li> + <li>Once uploaded your board will be offline for normal users due to the install directory you uploaded now present.<br /><br /></li> + <li><strong><a href="%1$s" title="%1$s">Now restart the update process by pointing your browser to the install folder</a>.</strong><br /><br /></li> + </ul> + + <p>If you have updated phpBB using any other method, please <a href="https://www.phpbb.com/downloads/" title="https://www.phpbb.com/downloads/">download the latest package</a>, upload the "install" folder to your phpBB root directory (where your config.php file is) and <a href="%2$s" title="%2$s">run the database update script</a>.</p>', + 'UPDATE_INSTALLATION' => 'Update phpBB installation', 'UPDATE_INSTALLATION_EXPLAIN' => 'With this option, it is possible to update your phpBB installation to the latest version.<br />During the process all of your files will be checked for their integrity. You are able to review all differences and files before the update.<br /><br />The file update itself can be done in two different ways.</p><h2>Manual Update</h2><p>With this update you only download your personal set of changed files to make sure you do not lose your file modifications you may have done. After you downloaded this package you need to manually upload the files to their correct position under your phpBB root directory. Once done, you are able to do the file check stage again to see if you moved the files to their correct location.</p><h2>Automatic Update with FTP</h2><p>This method is similar to the first one but without the need to download the changed files and uploading them on your own. This will be done for you. In order to use this method you need to know your FTP login details since you will be asked for them. Once finished you will be redirected to the file check again to make sure everything got updated correctly.<br /><br />', 'UPDATE_INSTRUCTIONS' => ' |