diff --git a/inc/code2lang.php b/inc/code2lang.php deleted file mode 100644 index cf00e2ed1bce8d49f1555fa2126fb12fa5858f3b..0000000000000000000000000000000000000000 --- a/inc/code2lang.php +++ /dev/null @@ -1,64 +0,0 @@ -<?php -/* - * Code to language name in the language corresponding to the code. - * - * @author Schplurtz le Déboulonné <Schplurtz@laposte.net> - */ -$code2lang['af']='Afghani'; -$code2lang['ar']='Arabic'; -$code2lang['be']='БеларуÑкаÑ'; -$code2lang['bg']='БългарÑки'; -$code2lang['bn']='Bengali'; -$code2lang['ca']='Català '; -$code2lang['cs']='ÄŒeÅ¡tina'; -$code2lang['da']='Dansk'; -$code2lang['de']='Deutsch'; -$code2lang['de-informal']='Deutsch informal'; -$code2lang['el']='Ελληνικά'; -$code2lang['en']='English'; -$code2lang['eo']='Esperanto'; -$code2lang['es']='Español'; -$code2lang['et']='Eesti'; -$code2lang['eu']='Euskara'; -$code2lang['fa']='ÙØ§Ø±Ø³ÛŒ'; -$code2lang['fi']='Suomi'; -$code2lang['fr']='Français'; -$code2lang['gl']='Galego'; -$code2lang['he']='תירבע'; -$code2lang['hi']='Hindi'; -$code2lang['hr']='Hrvatski'; -$code2lang['hu']='Magyar'; -$code2lang['hu-formal']='Magyar (formal)'; -$code2lang['id']='Bahasa Indonesia'; -$code2lang['is']='Ãslenska'; -$code2lang['it']='Italiano'; -$code2lang['ja']='日本語'; -$code2lang['ka']='ქáƒáƒ თული'; -$code2lang['kk']='Қазақ'; -$code2lang['km']='Khmer'; -$code2lang['ko']='한êµì–´'; -$code2lang['ku']='Kurdî'; -$code2lang['lt']='LietuviÅ¡kai'; -$code2lang['lv']='Latviski'; -$code2lang['mk']='МакедонÑки'; -$code2lang['ml']='Malayalam'; -$code2lang['mr']='Marathi'; -$code2lang['ne']='Nepali'; -$code2lang['nl']='Nederlands'; -$code2lang['pl']='Polski'; -$code2lang['pt']='Português'; -$code2lang['pt-br']='Português do Brasil'; -$code2lang['ro']='Română'; -$code2lang['ru']='РуÑÑкий'; -$code2lang['sk']='SlovenÄina'; -$code2lang['sl']='SlovenÅ¡Äina'; -$code2lang['sq']='Shqip'; -$code2lang['sr']='СрпÑки'; -$code2lang['sv']='Svenska'; -$code2lang['ta']='Tamil'; -$code2lang['th']='Thai'; -$code2lang['tr']='Türkçe'; -$code2lang['uk']='УкраїнÑька'; -$code2lang['vi']='Tiếng Việt'; -$code2lang['zh']='䏿–‡(简体)'; -$code2lang['zh-tw']='䏿–‡(ç¹é«”)'; diff --git a/inc/init.php b/inc/init.php index f8b7f6e0e6ccaaf5e853af61bf6bb0fd6cb1eee3..4e4cd6450f6f158ac633aa060bf8242a59b3a9ca 100644 --- a/inc/init.php +++ b/inc/init.php @@ -278,7 +278,7 @@ function init_paths(){ */ function init_lang($langCode) { //prepare language array - global $lang, $code2lang, $config_cascade; + global $lang, $config_cascade; $lang = array(); //load the language files @@ -299,7 +299,6 @@ function init_lang($langCode) { } } } - require(DOKU_INC.'inc/code2lang.php'); } /** diff --git a/inc/media.php b/inc/media.php index 7bf00cfc296f28522f1b15425e367215f2295dd7..8b3abcf7ea062600230f458fd841114fc7211c37 100644 --- a/inc/media.php +++ b/inc/media.php @@ -2459,12 +2459,11 @@ function media_supportedav($mime, $type=NULL){ * ie for foo.webm search foo.sub.lang.vtt, foo.cap.lang.vtt... * * @param string $src - ID of media file - * @return array - array(mediaID => array( kind, srclang, lang )) + * @return array - array(mediaID => array( kind, srclang )) * * @author Schplurtz le Déboulonné <Schplurtz@laposte.net> */ function media_trackfiles($src){ - global $code2lang; $kinds=array( 'sub' => 'subtitles', 'cap' => 'captions', @@ -2483,7 +2482,6 @@ function media_trackfiles($src){ $files[$baseid.'.'.$matches[1].'.'.$matches[2].'.vtt']=array( $kinds[$matches[1]], $matches[2], - $code2lang[$matches[2]] ); } } diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php index b976cec23f05f0fbfb74046b20dcd95934b85482..b4ca85b6793cfeca73dba5edd0fc6ec7e7e604e6 100644 --- a/inc/parser/xhtml.php +++ b/inc/parser/xhtml.php @@ -1838,14 +1838,9 @@ class Doku_Renderer_xhtml extends Doku_Renderer { // output each track if any foreach( $tracks as $trackid => $info ) { - list( $kind, $srclang, $labellang ) = $info; + list( $kind, $srclang ) = $info; $out .= "<track kind=$kind srclang=$srclang "; - if( $labellang ) { - $out .= "lang=$srclang label=\"".hsc($labellang).'" '; - } - else { - $out .= "label=$srclang "; - } + $out .= "label=$srclang "; $out .= 'src="'.ml($trackid, '', true).'">'.NL; }