makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 12:28:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/14462] Make timeout error translateable

Browse source 
PHPBB3-14462
This commit is contained in:
Oliver Schramm 2016-02-13 23:10:40 +01:00 • committed by Mate Bartus
parent b9f5c03099
commit 2084404d2a
3 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
phpBB/adm/style/installer_footer.html
View file

@ -11,6 +11,15 @@
</div> </div>
</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> <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 --> <!-- 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> <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>

4
phpBB/assets/javascript/installer.js
View file

@ -374,8 +374,8 @@
if (timeoutDetected) { if (timeoutDetected) {
addMessage('error', addMessage('error',
[{ [{
title:'The installer detected a timeout.', title: installLang.title,
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.' description: installLang.msg
}] }]
); );
} }

6
phpBB/language/en/install.php
View file

@ -120,7 +120,11 @@ $lang = array_merge($lang, array(
// General error messages // General error messages
$lang = array_merge($lang, array( $lang = array_merge($lang, array(
'INST_ERR_MISSING_DATA' => 'You must fill out all fields in this block.', '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 // Data obtaining translations