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

[ticket/10272] Renamed l-err-processing-req to l-timeout-processing-req.

Browse source 
PHPBB3-10272
This commit is contained in:
Callum Macrae 2011-11-17 17:32:56 +00:00 • committed by Igor Wiedler
parent 7e88dd0ba6
commit f9ddeacd8e
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/assets/javascript/core.js
View file

@ -30,7 +30,7 @@ phpbb.loading_alert = function() {
setTimeout(function() { setTimeout(function() {
if (loading_alert.is(':visible')) if (loading_alert.is(':visible'))
{ {
phpbb.alert($('body').data('l-err'), $('body').data('l-err-processing-req')); phpbb.alert($('body').data('l-err'), $('body').data('l-timeout-processing-req'));
} }
}, 5000); }, 5000);
}); });

2
phpBB/language/en/common.php
View file

@ -179,7 +179,6 @@ $lang = array_merge($lang, array(
'ERR_CONNECTING_SERVER' => 'Error connecting to the server.', 'ERR_CONNECTING_SERVER' => 'Error connecting to the server.',
'ERR_JAB_AUTH' => 'Could not authorise on Jabber server.', 'ERR_JAB_AUTH' => 'Could not authorise on Jabber server.',
'ERR_JAB_CONNECT' => 'Could not connect to Jabber server.', 'ERR_JAB_CONNECT' => 'Could not connect to Jabber server.',
'ERR_PROCESSING_REQ' => 'There was an error processing your request. Please try again.',
'ERR_UNABLE_TO_LOGIN' => 'The specified username or password is incorrect.', 'ERR_UNABLE_TO_LOGIN' => 'The specified username or password is incorrect.',
'ERR_UNWATCHING' => 'An error occured while trying to unsubscribe.', 'ERR_UNWATCHING' => 'An error occured while trying to unsubscribe.',
'ERR_WATCHING' => 'An error occured while trying to subscribe.', 'ERR_WATCHING' => 'An error occured while trying to subscribe.',
@ -601,6 +600,7 @@ $lang = array_merge($lang, array(
'TEST_CONNECTION' => 'Test connection', 'TEST_CONNECTION' => 'Test connection',
'THE_TEAM' => 'The team', 'THE_TEAM' => 'The team',
'TIME' => 'Time', 'TIME' => 'Time',
'TIMEOUT_PROCESSING_REQ' => 'Request timed out.',
'TOO_LARGE' => 'The value you entered is too large.', 'TOO_LARGE' => 'The value you entered is too large.',
'TOO_LARGE_MAX_RECIPIENTS' => 'The value of <strong>Maximum number of allowed recipients per private message</strong> setting you entered is too large.', 'TOO_LARGE_MAX_RECIPIENTS' => 'The value of <strong>Maximum number of allowed recipients per private message</strong> setting you entered is too large.',

2
phpBB/styles/prosilver/template/overall_header.html
View file

@ -90,7 +90,7 @@
</head> </head>
<body id="phpbb" class="section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}" data-l-err="{L_ERROR}" data-l-err-processing-req="{L_ERR_PROCESSING_REQ}"> <body id="phpbb" class="section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}" data-l-err="{L_ERROR}" data-l-timeout-processing-req="{L_TIMEOUT_PROCESSING_REQ}">
<div id="wrap"> <div id="wrap">
<a id="top" accesskey="t"></a> <a id="top" accesskey="t"></a>