From 25f9c45261aafd65477ad526e0b6ad3dca80803a Mon Sep 17 00:00:00 2001 From: wei <> Date: Sat, 10 Dec 2005 11:46:10 +0000 Subject: Update exception templates to be XHTML 1.0 transitional compliant. --- framework/Exceptions/TErrorHandler.php | 4 +- framework/Exceptions/templates/error-fr.html | 17 +++---- framework/Exceptions/templates/error-zh.html | 17 ++++--- framework/Exceptions/templates/error.html | 59 ++++++++++++----------- framework/Exceptions/templates/error404-en.html | 61 +++++++++++++----------- framework/Exceptions/templates/error404-fr.html | 17 +++---- framework/Exceptions/templates/error404-zh.html | 17 ++++--- framework/Exceptions/templates/error404.html | 17 ++++--- framework/Exceptions/templates/error500-en.html | 17 ++++--- framework/Exceptions/templates/error500-fr.html | 17 +++---- framework/Exceptions/templates/error500-zh.html | 17 ++++--- framework/Exceptions/templates/error500.html | 17 ++++--- framework/Exceptions/templates/error503-en.html | 17 ++++--- framework/Exceptions/templates/error503-fr.html | 17 +++---- framework/Exceptions/templates/error503-zh.html | 17 ++++--- framework/Exceptions/templates/error503.html | 17 ++++--- framework/Exceptions/templates/exception-en.html | 19 ++++---- framework/Exceptions/templates/exception-fr.html | 18 +++---- framework/Exceptions/templates/exception-zh.html | 17 ++++--- framework/Exceptions/templates/exception.html | 19 ++++---- 20 files changed, 230 insertions(+), 188 deletions(-) (limited to 'framework/Exceptions') diff --git a/framework/Exceptions/TErrorHandler.php b/framework/Exceptions/TErrorHandler.php index ebdaf41c..87d5d342 100644 --- a/framework/Exceptions/TErrorHandler.php +++ b/framework/Exceptions/TErrorHandler.php @@ -178,7 +178,7 @@ class TErrorHandler extends TModule '%%ErrorMessage%%' => htmlspecialchars($exception->getMessage()), '%%ServerAdmin%%' => $serverAdmin, '%%Version%%' => $_SERVER['SERVER_SOFTWARE'].' PRADO/'.Prado::getVersion(), - '%%Time%%' => strftime('%Y-%m-%d %H:%m',time()) + '%%Time%%' => @strftime('%Y-%m-%d %H:%M',time()) ); echo strtr($content,$tokens); } @@ -240,7 +240,7 @@ class TErrorHandler extends TModule '%%SourceCode%%' => $source, '%%StackTrace%%' => htmlspecialchars($exception->getTraceAsString()), '%%Version%%' => $_SERVER['SERVER_SOFTWARE'].' PRADO/'.Prado::getVersion(), - '%%Time%%' => strftime('%Y-%m-%d %H:%m',time()) + '%%Time%%' => @strftime('%Y-%m-%d %H:%M',time()) ); $lang=Prado::getPreferredLanguage(); $exceptionFile=Prado::getFrameworkPath().'/Exceptions/templates/'.self::EXCEPTION_FILE_NAME.'-'.$lang.'.html'; diff --git a/framework/Exceptions/templates/error-fr.html b/framework/Exceptions/templates/error-fr.html index 5546dcdb..47b681de 100644 --- a/framework/Exceptions/templates/error-fr.html +++ b/framework/Exceptions/templates/error-fr.html @@ -1,19 +1,20 @@ - - - - + + %%ErrorMessage%% - - - +

Erreur %%StatusCode%%

%%ErrorMessage%%

diff --git a/framework/Exceptions/templates/error-zh.html b/framework/Exceptions/templates/error-zh.html index 545f057c..f69d0e49 100644 --- a/framework/Exceptions/templates/error-zh.html +++ b/framework/Exceptions/templates/error-zh.html @@ -1,19 +1,22 @@ - + + - - + %%ErrorMessage%% - - - +

错误%%StatusCode%%

%%ErrorMessage%%

diff --git a/framework/Exceptions/templates/error.html b/framework/Exceptions/templates/error.html index 931f96a3..482da4cd 100644 --- a/framework/Exceptions/templates/error.html +++ b/framework/Exceptions/templates/error.html @@ -1,29 +1,32 @@ - - - - -%%ErrorMessage%% - - - - -

Error %%StatusCode%%

-

%%ErrorMessage%%

-

-The above error happened when the server was processing your request. -

-

-If you think this is a server error, please contact the webmaster. -

-
-%%Time%% %%Version%% -
- + + + + +%%ErrorMessage%% + + + +

Error %%StatusCode%%

+

%%ErrorMessage%%

+

+The above error happened when the server was processing your request. +

+

+If you think this is a server error, please contact the webmaster. +

+
+%%Time%% %%Version%% +
+ \ No newline at end of file diff --git a/framework/Exceptions/templates/error404-en.html b/framework/Exceptions/templates/error404-en.html index 92ac65b1..abbc84a6 100644 --- a/framework/Exceptions/templates/error404-en.html +++ b/framework/Exceptions/templates/error404-en.html @@ -1,30 +1,33 @@ - - - - -Page Not Found - - - - -

%%ErrorMessage%%

-

Error 404

-

-The requested URL was not found on this server. -If you entered the URL manually please check your spelling and try again. -

-

-If you think this is a server error, please contact the webmaster. -

-
-%%Time%% %%Version%% -
- + + + + +Page Not Found + + + +

%%ErrorMessage%%

+

Error 404

+

+The requested URL was not found on this server. +If you entered the URL manually please check your spelling and try again. +

+

+If you think this is a server error, please contact the webmaster. +

+
+%%Time%% %%Version%% +
+ \ No newline at end of file diff --git a/framework/Exceptions/templates/error404-fr.html b/framework/Exceptions/templates/error404-fr.html index 181bd8a7..c353d7c1 100644 --- a/framework/Exceptions/templates/error404-fr.html +++ b/framework/Exceptions/templates/error404-fr.html @@ -1,19 +1,20 @@ - - - - + + Page Introuvable - - - +

%%ErrorMessage%%

Erreur 404

diff --git a/framework/Exceptions/templates/error404-zh.html b/framework/Exceptions/templates/error404-zh.html index ae5d8275..c834f9b1 100644 --- a/framework/Exceptions/templates/error404-zh.html +++ b/framework/Exceptions/templates/error404-zh.html @@ -1,19 +1,22 @@ - + + - - + 无法找到页面 - - - +

%%ErrorMessage%%

错误代码404

diff --git a/framework/Exceptions/templates/error404.html b/framework/Exceptions/templates/error404.html index 92ac65b1..1ad3c0ac 100644 --- a/framework/Exceptions/templates/error404.html +++ b/framework/Exceptions/templates/error404.html @@ -1,19 +1,22 @@ - + + - - + Page Not Found - - - +

%%ErrorMessage%%

Error 404

diff --git a/framework/Exceptions/templates/error500-en.html b/framework/Exceptions/templates/error500-en.html index 25d4ad92..76427f43 100644 --- a/framework/Exceptions/templates/error500-en.html +++ b/framework/Exceptions/templates/error500-en.html @@ -1,19 +1,22 @@ - + + - - + Internal Server Error - - - +

Internal Server Error

%%ErrorMessage%%

diff --git a/framework/Exceptions/templates/error500-fr.html b/framework/Exceptions/templates/error500-fr.html index 804425ef..0454e27d 100644 --- a/framework/Exceptions/templates/error500-fr.html +++ b/framework/Exceptions/templates/error500-fr.html @@ -1,19 +1,20 @@ - - - - + + Erreur Interne du Serveur - - - +

Erreur Interne du Serveur

%%ErrorMessage%%

diff --git a/framework/Exceptions/templates/error500-zh.html b/framework/Exceptions/templates/error500-zh.html index a10dbba4..d655601f 100644 --- a/framework/Exceptions/templates/error500-zh.html +++ b/framework/Exceptions/templates/error500-zh.html @@ -1,19 +1,22 @@ - + + - - + 服务器内部错误 - - - +

服务器内部错误

%%ErrorMessage%%

diff --git a/framework/Exceptions/templates/error500.html b/framework/Exceptions/templates/error500.html index 25d4ad92..76427f43 100644 --- a/framework/Exceptions/templates/error500.html +++ b/framework/Exceptions/templates/error500.html @@ -1,19 +1,22 @@ - + + - - + Internal Server Error - - - +

Internal Server Error

%%ErrorMessage%%

diff --git a/framework/Exceptions/templates/error503-en.html b/framework/Exceptions/templates/error503-en.html index 718dd4ea..3a5390de 100644 --- a/framework/Exceptions/templates/error503-en.html +++ b/framework/Exceptions/templates/error503-en.html @@ -1,19 +1,22 @@ - + + - - + Service Unavailable - - - +

Service Unavailable

Our system is currently under maintenance. Please come back later. diff --git a/framework/Exceptions/templates/error503-fr.html b/framework/Exceptions/templates/error503-fr.html index 699114de..ddc7d537 100644 --- a/framework/Exceptions/templates/error503-fr.html +++ b/framework/Exceptions/templates/error503-fr.html @@ -1,19 +1,20 @@ - - - - + + Service Indisponible - - - +

Service Indisponible

Le service est actuellement en maintenance et indisponible. Merci de réessayer prochainement. diff --git a/framework/Exceptions/templates/error503-zh.html b/framework/Exceptions/templates/error503-zh.html index 5babac19..b7457d68 100644 --- a/framework/Exceptions/templates/error503-zh.html +++ b/framework/Exceptions/templates/error503-zh.html @@ -1,19 +1,22 @@ - + + - - + 系统无法提供服务 - - - +

系统无法提供服务

系统维护中，请稍后再来访问。 diff --git a/framework/Exceptions/templates/error503.html b/framework/Exceptions/templates/error503.html index 718dd4ea..3a5390de 100644 --- a/framework/Exceptions/templates/error503.html +++ b/framework/Exceptions/templates/error503.html @@ -1,19 +1,22 @@ - + + - - + Service Unavailable - - - +

Service Unavailable

Our system is currently under maintenance. Please come back later. diff --git a/framework/Exceptions/templates/exception-en.html b/framework/Exceptions/templates/exception-en.html index 45fc264c..2de7f5f1 100644 --- a/framework/Exceptions/templates/exception-en.html +++ b/framework/Exceptions/templates/exception-en.html @@ -1,10 +1,13 @@ - + + - - + %%ErrorType%% - - - +

%%ErrorType%%

Description

%%ErrorMessage%%

-

Source File

%%SourceFile%%

diff --git a/framework/Exceptions/templates/exception-fr.html b/framework/Exceptions/templates/exception-fr.html index b6f1369b..002a4583 100644 --- a/framework/Exceptions/templates/exception-fr.html +++ b/framework/Exceptions/templates/exception-fr.html @@ -1,10 +1,11 @@ - - - - + + %%ErrorType%% - - - +

%%ErrorType%%

Description

%%ErrorMessage%%

-

Fichier Source

%%SourceFile%%

diff --git a/framework/Exceptions/templates/exception-zh.html b/framework/Exceptions/templates/exception-zh.html index 8568dde1..e4c8cbcc 100644 --- a/framework/Exceptions/templates/exception-zh.html +++ b/framework/Exceptions/templates/exception-zh.html @@ -1,10 +1,13 @@ - + + - - + %%ErrorType%% - - - +

%%ErrorType%%

错误信息

%%ErrorMessage%%

diff --git a/framework/Exceptions/templates/exception.html b/framework/Exceptions/templates/exception.html index 45fc264c..2de7f5f1 100644 --- a/framework/Exceptions/templates/exception.html +++ b/framework/Exceptions/templates/exception.html @@ -1,10 +1,13 @@ - + + - - + %%ErrorType%% - - - +

%%ErrorType%%

Description

%%ErrorMessage%%

-

Source File

%%SourceFile%%

-- cgit v1.2.3