Skip to content

Commit

Permalink
translations changes in the Configure folder
Browse files Browse the repository at this point in the history
  • Loading branch information
AD7six committed Mar 12, 2011
1 parent d7f275d commit 5ae9787
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion lib/Cake/Configure/IniReader.php
Expand Up @@ -74,7 +74,7 @@ public function read($file) {
if (!file_exists($filename)) {
$filename .= '.ini';
if (!file_exists($filename)) {
throw new ConfigureException(__('Could not load configuration files: %s or %s', substr($filename, 0, -4), $filename));
throw new ConfigureException(__d('cake', 'Could not load configuration files: %s or %s', substr($filename, 0, -4), $filename));
}
}
$contents = parse_ini_file($filename, true);
Expand Down
6 changes: 3 additions & 3 deletions lib/Cake/Configure/PhpReader.php
Expand Up @@ -55,7 +55,7 @@ public function __construct($path = CONFIGS) {
*/
public function read($key) {
if (strpos($key, '..') !== false) {
throw new ConfigureException(__('Cannot load configuration files with ../ in them.'));
throw new ConfigureException(__d('cake', 'Cannot load configuration files with ../ in them.'));
}
if (substr($key, -4) === '.php') {
$key = substr($key, 0, -4);
Expand All @@ -70,13 +70,13 @@ public function read($key) {
if (!file_exists($file)) {
$file .= '.php';
if (!file_exists($file)) {
throw new ConfigureException(__('Could not load configuration files: %s or %s', substr($file, 0, -4), $file));
throw new ConfigureException(__d('cake', 'Could not load configuration files: %s or %s', substr($file, 0, -4), $file));
}
}
include $file;
if (!isset($config)) {
throw new ConfigureException(
sprintf(__('No variable $config found in %s.php'), $file)
sprintf(__d('cake', 'No variable $config found in %s.php'), $file)
);
}
return $config;
Expand Down

0 comments on commit 5ae9787

Please sign in to comment.