diff options
| author | Oliver Schramm <oliver.schramm97@gmail.com> | 2016-02-13 23:10:40 +0100 |
|---|---|---|
| committer | Mate Bartus <mate.bartus@gmail.com> | 2016-02-14 16:16:33 +0100 |
| commit | 2084404d2a0648d406749d67e44f1ba3ba44d7df (patch) | |
| tree | 92b5b52deb179167dc92b699638fb9ed421b6e79 | |
| parent | b9f5c030991b363d639aaf4d1781db6acd845860 (diff) | |
| download | forums-2084404d2a0648d406749d67e44f1ba3ba44d7df.tar forums-2084404d2a0648d406749d67e44f1ba3ba44d7df.tar.gz forums-2084404d2a0648d406749d67e44f1ba3ba44d7df.tar.bz2 forums-2084404d2a0648d406749d67e44f1ba3ba44d7df.tar.xz forums-2084404d2a0648d406749d67e44f1ba3ba44d7df.zip | |
[ticket/14462] Make timeout error translateable
PHPBB3-14462
| -rw-r--r-- | phpBB/adm/style/installer_footer.html | 9 | ||||
| -rw-r--r-- | phpBB/assets/javascript/installer.js | 4 | ||||
| -rw-r--r-- | phpBB/language/en/install.php | 6 |
3 files changed, 16 insertions, 3 deletions
diff --git a/phpBB/adm/style/installer_footer.html b/phpBB/adm/style/installer_footer.html index 63aebec993..fefa8f6d3f 100644 --- a/phpBB/adm/style/installer_footer.html +++ b/phpBB/adm/style/installer_footer.html @@ -11,6 +11,15 @@ </div> </div> +<script type="text/javascript"> +<!-- +installLang = { + title: '{LA_TIMEOUT_DETECTED_TITLE}', + msg: '{LA_TIMEOUT_DETECTED_MESSAGE}' +}; +//--> +</script> + <script type="text/javascript" src="{T_JQUERY_LINK}"></script> <!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js">\x3C/script>');</script><!-- ENDIF --> <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script> diff --git a/phpBB/assets/javascript/installer.js b/phpBB/assets/javascript/installer.js index 0e54654ff1..d9f446a28d 100644 --- a/phpBB/assets/javascript/installer.js +++ b/phpBB/assets/javascript/installer.js @@ -374,8 +374,8 @@ if (timeoutDetected) { addMessage('error', [{ - title:'The installer detected a timeout.', - description: 'The installer has detected a timeout, you may try to refresh the page, that may lead to data corruption. We suggest that you either increase your timeout settings or try to use the CLI.' + title: installLang.title, + description: installLang.msg }] ); } diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 3ce034e590..41eef61c50 100644 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -120,7 +120,11 @@ $lang = array_merge($lang, array( // General error messages $lang = array_merge($lang, array( 'INST_ERR_MISSING_DATA' => 'You must fill out all fields in this block.', - 'PHPBB_ALREADY_INSTALLED' => 'phpBB is already installed.' + + 'PHPBB_ALREADY_INSTALLED' => 'phpBB is already installed.', + + 'TIMEOUT_DETECTED_TITLE' => 'The installer detected a timeout', + 'TIMEOUT_DETECTED_MESSAGE' => 'The installer has detected a timeout, you may try to refresh the page, which may lead to data corruption. We suggest that you either increase your timeout settings or try to use the CLI.', )); // Data obtaining translations |