Browse Source

fix multibyte test case

put the mb_internal_encoding call in a file which is _always_ loaded
AD7six 15 years ago
parent
commit
83e7028ecd
2 changed files with 10 additions and 9 deletions
  1. 10 3
      lib/Cake/I18n/I18n.php
  2. 0 6
      lib/Cake/I18n/Multibyte.php

+ 10 - 3
lib/Cake/I18n/I18n.php

@@ -24,6 +24,13 @@ App::uses('CakePlugin', 'Core');
 App::uses('L10n', 'I18n');
 App::uses('Multibyte', 'I18n');
 
+if (function_exists('mb_internal_encoding')) {
+	$encoding = Configure::read('App.encoding');
+	if (!empty($encoding)) {
+		mb_internal_encoding($encoding);
+	}
+}
+
 /**
  * I18n handles translation of Text and time format strings.
  *
@@ -111,7 +118,7 @@ class I18n {
  */
 	public static function translate($singular, $plural = null, $domain = null, $category = 6, $count = null) {
 		$_this = I18n::getInstance();
-		
+
 		if (strpos($singular, "\r\n") !== false) {
 			$singular = str_replace("\r\n", "\n", $singular);
 		}
@@ -320,10 +327,10 @@ class I18n {
 			$this->__domains[$domain][$this->__lang][$this->category] = array();
 			return $domain;
 		}
-		
+
 		if (isset($this->__domains[$domain][$this->__lang][$this->category][""])) {
 			$head = $this->__domains[$domain][$this->__lang][$this->category][""];
-			
+
 			foreach (explode("\n", $head) as $line) {
 				$header = strtok($line,":");
 				$line = trim(strtok("\n"));

+ 0 - 6
lib/Cake/I18n/Multibyte.php

@@ -17,12 +17,6 @@
  * @since         CakePHP(tm) v 1.2.0.6833
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-if (function_exists('mb_internal_encoding')) {
-	$encoding = Configure::read('App.encoding');
-	if (!empty($encoding)) {
-		mb_internal_encoding($encoding);
-	}
-}
 
 /**
  * Find position of first occurrence of a case-insensitive string.