adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix multibyte test case

Browse source 
put the mb_internal_encoding call in a file which is _always_ loaded
This commit is contained in:
AD7six 2011-05-17 18:41:35 +02:00
parent d3772fc605
commit 83e7028ecd
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/Cake/I18n/I18n.php
View file

@ -24,6 +24,13 @@ App::uses('CakePlugin', 'Core');
App::uses('L10n', 'I18n'); App::uses('L10n', 'I18n');
App::uses('Multibyte', '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. * 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) { public static function translate($singular, $plural = null, $domain = null, $category = 6, $count = null) {
$_this = I18n::getInstance(); $_this = I18n::getInstance();
if (strpos($singular, "\r\n") !== false) { if (strpos($singular, "\r\n") !== false) {
$singular = str_replace("\r\n", "\n", $singular); $singular = str_replace("\r\n", "\n", $singular);
} }
@ -320,10 +327,10 @@ class I18n {
$this->__domains[$domain][$this->__lang][$this->category] = array(); $this->__domains[$domain][$this->__lang][$this->category] = array();
return $domain; return $domain;
} }
if (isset($this->__domains[$domain][$this->__lang][$this->category][""])) { if (isset($this->__domains[$domain][$this->__lang][$this->category][""])) {
$head = $this->__domains[$domain][$this->__lang][$this->category][""]; $head = $this->__domains[$domain][$this->__lang][$this->category][""];
foreach (explode("\n", $head) as $line) { foreach (explode("\n", $head) as $line) {
$header = strtok($line,":"); $header = strtok($line,":");
$line = trim(strtok("\n")); $line = trim(strtok("\n"));

6
lib/Cake/I18n/Multibyte.php
View file

@ -17,12 +17,6 @@
* @since CakePHP(tm) v 1.2.0.6833 * @since CakePHP(tm) v 1.2.0.6833
* @license MIT License (http://www.opensource.org/licenses/mit-license.php) * @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. * Find position of first occurrence of a case-insensitive string.