diff options
| -rw-r--r-- | .gitattributes | 6 | ||||
| -rw-r--r-- | framework/Exceptions/TException.php | 4 | ||||
| -rw-r--r-- | framework/Exceptions/messages/messages-id.txt (renamed from framework/Exceptions/messages-id.txt) | 0 | ||||
| -rw-r--r-- | framework/Exceptions/messages/messages-zh.txt (renamed from framework/Exceptions/messages-zh.txt) | 0 | ||||
| -rw-r--r-- | framework/Exceptions/messages/messages.txt (renamed from framework/Exceptions/messages.txt) | 0 |
5 files changed, 5 insertions, 5 deletions
diff --git a/.gitattributes b/.gitattributes index 48835320..b501c970 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1952,9 +1952,9 @@ framework/Data/TDbDataReader.php -text framework/Data/TDbTransaction.php -text framework/Exceptions/TErrorHandler.php -text framework/Exceptions/TException.php -text -framework/Exceptions/messages-id.txt -text -framework/Exceptions/messages-zh.txt -text -framework/Exceptions/messages.txt -text +framework/Exceptions/messages/messages-id.txt -text +framework/Exceptions/messages/messages-zh.txt -text +framework/Exceptions/messages/messages.txt -text framework/Exceptions/templates/error-fr.html -text framework/Exceptions/templates/error-id.html -text framework/Exceptions/templates/error-zh.html -text diff --git a/framework/Exceptions/TException.php b/framework/Exceptions/TException.php index 6f9a8a3f..a74b76e4 100644 --- a/framework/Exceptions/TException.php +++ b/framework/Exceptions/TException.php @@ -84,9 +84,9 @@ class TException extends Exception protected function getErrorMessageFile()
{
$lang=Prado::getPreferredLanguage();
- $msgFile=Prado::getFrameworkPath().'/Exceptions/messages-'.$lang.'.txt';
+ $msgFile=Prado::getFrameworkPath().'/Exceptions/messages/messages-'.$lang.'.txt';
if(!is_file($msgFile))
- $msgFile=Prado::getFrameworkPath().'/Exceptions/messages.txt';
+ $msgFile=Prado::getFrameworkPath().'/Exceptions/messages/messages.txt';
return $msgFile;
}
diff --git a/framework/Exceptions/messages-id.txt b/framework/Exceptions/messages/messages-id.txt index c0cae947..c0cae947 100644 --- a/framework/Exceptions/messages-id.txt +++ b/framework/Exceptions/messages/messages-id.txt diff --git a/framework/Exceptions/messages-zh.txt b/framework/Exceptions/messages/messages-zh.txt index ca6fdd02..ca6fdd02 100644 --- a/framework/Exceptions/messages-zh.txt +++ b/framework/Exceptions/messages/messages-zh.txt diff --git a/framework/Exceptions/messages.txt b/framework/Exceptions/messages/messages.txt index 4ed84093..4ed84093 100644 --- a/framework/Exceptions/messages.txt +++ b/framework/Exceptions/messages/messages.txt |