Skip to content
Permalink
Browse files

Merge branch 'w36_MDL-35189_m24_typo3' of git://github.com/skodak/moodle

  • Loading branch information...
stronk7 committed Sep 3, 2012
2 parents 8619c88 + 1290a9e commit 5b38b6be70c0554d1102059a773348ace9801965
@@ -186,7 +186,7 @@
<location>typo3</location>
<name>Typo3</name>
<license>GPL</license>
<version>4.6.8</version>
<version>4.7.4</version>
<licenseversion>2.0+</licenseversion>
</library>
<library>
@@ -194,6 +194,7 @@ class t3lib_cs {
// mapping of iso-639-1 language codes to script names
var $lang_to_script = array(
// iso-639-1 language codes, see http://www.loc.gov/standards/iso639-2/php/code_list.php
'af' => 'west_european', //Afrikaans
'ar' => 'arabic',
'bg' => 'cyrillic', // Bulgarian
'bs' => 'east_european', // Bosnian
@@ -244,6 +245,7 @@ class t3lib_cs {
'zh' => 'chinese',
// MS language codes, see http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_crt_language_strings.asp
// http://msdn.microsoft.com/library/default.asp?url=/library/en-us/wceinternational5/html/wce50conLanguageIdentifiersandLocales.asp
'afk'=> 'west_european', // Afrikaans
'ara' => 'arabic',
'bgr' => 'cyrillic', // Bulgarian
'cat' => 'west_european', // Catalan
@@ -304,6 +306,7 @@ class t3lib_cs {
'trk' => 'turkish',
'ukr' => 'cyrillic', // Ukrainian
// English language names
'afrikaans' => 'west_european',
'albanian' => 'albanian',
'arabic' => 'arabic',
'basque' => 'west_european',
@@ -412,6 +415,7 @@ class t3lib_cs {
// TYPO3 specific: Array with the system charsets used for each system language in TYPO3:
// Empty values means "iso-8859-1"
var $charSetArray = array(
'af' => '',
'ar' => 'iso-8859-6',
'ba' => 'iso-8859-2',
'bg' => 'windows-1251',
@@ -481,7 +485,7 @@ class t3lib_cs {
// TYPO3 specific: Array with the iso names used for each system language in TYPO3:
// Missing keys means: same as TYPO3
// @deprecated since TYPO3 4.6, will be removed in TYPO3 4.8 - use t3lib_l10n_Locales::getIsoMapping()
// @deprecated since TYPO3 4.6, will be removed in TYPO3 6.0 - use t3lib_l10n_Locales::getIsoMapping()
var $isoArray = array(
'ba' => 'bs',
'br' => 'pt_BR',
@@ -568,7 +572,7 @@ function get_locale_charset($locale) {
if (TYPO3_OS == 'WIN') {
$cs = $this->script_to_charset_windows[$script] ? $this->script_to_charset_windows[$script] : 'windows-1252';
} else {
$cs = $this->script_to_charset_unix[$script] ? $this->script_to_charset_unix[$script] : 'iso-8859-1';
$cs = $this->script_to_charset_unix[$script] ? $this->script_to_charset_unix[$script] : 'utf-8';
}
return $cs;
@@ -810,26 +814,32 @@ function utf8_to_entities($str) {
* @param boolean If set, then all string-HTML entities (like &amp; or &pound; will be converted as well)
* @return string Output string
*/
function entities_to_utf8($str, $alsoStdHtmlEnt = 0) {
function entities_to_utf8($str, $alsoStdHtmlEnt = FALSE) {
if ($alsoStdHtmlEnt) {
$trans_tbl = array_flip(get_html_translation_table(HTML_ENTITIES)); // Getting them in iso-8859-1 - but thats ok since this is observed below.
$trans_tbl = array_flip(get_html_translation_table(HTML_ENTITIES, ENT_COMPAT, 'UTF-8'));
}
$token = md5(microtime());
$parts = explode($token, preg_replace('/(&([#[:alnum:]]*);)/', $token . '${2}' . $token, $str));
foreach ($parts as $k => $v) {
if ($k % 2) {
if (substr($v, 0, 1) == '#') { // Dec or hex entities:
if (substr($v, 1, 1) == 'x') {
$parts[$k] = $this->UnumberToChar(hexdec(substr($v, 2)));
} else {
$parts[$k] = $this->UnumberToChar(substr($v, 1));
}
} elseif ($alsoStdHtmlEnt && $trans_tbl['&' . $v . ';']) { // Other entities:
$parts[$k] = $this->utf8_encode($trans_tbl['&' . $v . ';'], 'iso-8859-1');
} else { // No conversion:
$parts[$k] = '&' . $v . ';';
// only take every second element
if ($k % 2 === 0) {
continue;
}
$position = 0;
if (substr($v, $position, 1) == '#') { // Dec or hex entities:
$position++;
if (substr($v, $position, 1) == 'x') {
$v = hexdec(substr($v, ++$position));
} else {
$v = substr($v, $position);
}
$parts[$k] = $this->UnumberToChar($v);
} elseif ($alsoStdHtmlEnt && isset($trans_tbl['&' . $v . ';'])) { // Other entities:
$parts[$k] = $trans_tbl['&' . $v . ';'];
} else { // No conversion:
$parts[$k] = '&' . $v . ';';
}
}
@@ -1696,9 +1706,9 @@ public function convCaseFirst($charset, $string, $case) {
/**
* Converts special chars (like æøåÆØÅ, umlauts etc) to ascii equivalents (usually double-bytes, like æ => ae etc.)
*
* @param string Character set of string
* @param string Input string to convert
* @return string The converted string
* @param string $charset Character set of string
* @param string $string Input string to convert
* @return string The converted string
*/
function specCharsToASCII($charset, $string) {
if ($charset == 'utf-8') {
@@ -2342,4 +2352,4 @@ function euc_char_mapping($str, $charset, $mode, $opt = '') {
include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_cs.php']);
}
?>
?>

0 comments on commit 5b38b6b

Please sign in to comment.
You can’t perform that action at this time.