TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Translate french named variabled "origine" and "prefixe"

Browse Source 
modifié:         core/lib/Thelia/Log/Tlog.php
This commit is contained in:
Benjamin Perche
2014-06-26 09:28:51 +02:00
parent feabfc4f07
commit 33862b39b5
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
core/lib/Thelia/Log/Tlog.php
View File

@@ -78,7 +78,7 @@ class Tlog Implements LoggerInterface
protected $mode_back_office = false; protected $mode_back_office = false;
protected $level = self::MUET; protected $level = self::MUET;
protected $prefixe = ""; protected $prefix = "";
protected $files = array(); protected $files = array();
protected $all_files = false; protected $all_files = false;
protected $show_redirect = false; protected $show_redirect = false;
@@ -194,9 +194,9 @@ class Tlog Implements LoggerInterface
return $this; return $this;
} }
public function setPrefix($prefixe) public function setPrefix($prefix)
{ {
$this->prefixe = $prefixe; $this->prefix = $prefix;
return $this; return $this;
} }
@@ -609,7 +609,7 @@ class Tlog Implements LoggerInterface
private function findOrigin() private function findOrigin()
{ {
$origine = array(); $origin = array();
if (function_exists('debug_backtrace')) { if (function_exists('debug_backtrace')) {
@@ -624,8 +624,8 @@ class Tlog Implements LoggerInterface
$className = $hop['class']; $className = $hop['class'];
if (! empty($className) && ($className == ltrim(__CLASS__,'\\') || strtolower(get_parent_class($className)) == ltrim(__CLASS__,'\\'))) { if (! empty($className) && ($className == ltrim(__CLASS__,'\\') || strtolower(get_parent_class($className)) == ltrim(__CLASS__,'\\'))) {
$origine['line'] = $hop['line']; $origin['line'] = $hop['line'];
$origine['file'] = $hop['file']; $origin['file'] = $hop['file'];
break; break;
} }
} }
@@ -633,7 +633,7 @@ class Tlog Implements LoggerInterface
$hop = array_pop($trace); $hop = array_pop($trace);
} }
$origine['class'] = isset($prevHop['class']) ? $prevHop['class'] : 'main'; $origin['class'] = isset($prevHop['class']) ? $prevHop['class'] : 'main';
if(isset($prevHop['function']) && if(isset($prevHop['function']) &&
$prevHop['function'] !== 'include' && $prevHop['function'] !== 'include' &&
@@ -641,13 +641,13 @@ class Tlog Implements LoggerInterface
$prevHop['function'] !== 'require' && $prevHop['function'] !== 'require' &&
$prevHop['function'] !== 'require_once') { $prevHop['function'] !== 'require_once') {
$origine['function'] = $prevHop['function']; $origin['function'] = $prevHop['function'];
} else { } else {
$origine['function'] = 'main'; $origin['function'] = 'main';
} }
} }
return $origine; return $origin;
} }
protected function interpolate($message, array $context = array()) protected function interpolate($message, array $context = array())
@@ -676,22 +676,22 @@ class Tlog Implements LoggerInterface
$text = $this->interpolate($text, $context); $text = $this->interpolate($text, $context);
$origine = $this->findOrigin(); $origin = $this->findOrigin();
$file = basename($origine['file']); $file = basename($origin['file']);
if ($this->isActivedFile($file)) { if ($this->isActivedFile($file)) {
$function = $origine['function']; $function = $origin['function'];
$line = $origine['line']; $line = $origin['line'];
$prefixe = str_replace( $prefix = str_replace(
array("#INDEX", "#LEVEL", "#FILE", "#FUNCTION", "#LINE", "#DATE", "#HOUR"), array("#INDEX", "#LEVEL", "#FILE", "#FUNCTION", "#LINE", "#DATE", "#HOUR"),
array(1+$this->linecount, $level, $file, $function, $line, date("Y-m-d"), date("G:i:s")), array(1+$this->linecount, $level, $file, $function, $line, date("Y-m-d"), date("G:i:s")),
$this->prefixe $this->prefix
); );
$trace = $prefixe . $text; $trace = $prefix . $text;
foreach ($this->destinations as $dest) { foreach ($this->destinations as $dest) {
$dest->add($trace); $dest->add($trace);