From 01299338915a7702f9a82fe101aadd02cc3cb8e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Schplurtz=20le=20D=C3=A9boulonn=C3=A9?=
 <Schplurtz@laposte.net>
Date: Mon, 28 Aug 2017 02:53:23 +0200
Subject: [PATCH] use only language code, no language name

---
 inc/code2lang.php    | 64 --------------------------------------------
 inc/init.php         |  3 +--
 inc/media.php        |  4 +--
 inc/parser/xhtml.php |  9 ++-----
 4 files changed, 4 insertions(+), 76 deletions(-)
 delete mode 100644 inc/code2lang.php

diff --git a/inc/code2lang.php b/inc/code2lang.php
deleted file mode 100644
index cf00e2ed1..000000000
--- 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 f8b7f6e0e..4e4cd6450 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 7bf00cfc2..8b3abcf7e 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 b976cec23..b4ca85b67 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;
         }