Merge pull request kaltura#6766 from kaltura/Mercury-13.13.0-PLAT-845…

…0-revert Mercury 13.13.0 plat 8450 revert
guoyu07 · Feb 7, 2018 · 147ca7f · 147ca7f
2 parents eda989d + 260b365
commit 147ca7f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/api_v3/lib/types/enums/KalturaLanguage.php b/api_v3/lib/types/enums/KalturaLanguage.php
@@ -28,8 +28,6 @@ class KalturaLanguage extends KalturaStringEnum
 	const KM = 'Cambodian';
 	const CA = 'Catalan';
 	const ZH = 'Chinese';
-	const ZH_HANT = 'Chinese (Traditional)';
-	const ZH_HANS = 'Chinese (Simplified)';
 	const CO = 'Corsican';
 	const HR = 'Croatian';
 	const CS = 'Czech';

diff --git a/api_v3/lib/types/enums/KalturaLanguageCode.php b/api_v3/lib/types/enums/KalturaLanguageCode.php
@@ -28,15 +28,13 @@ class KalturaLanguageCode extends KalturaStringEnum
 	const KM = 'km';
 	const CA = 'ca';
 	const ZH = 'zh';
-	const ZH_HANT = 'zh_t';
-	const ZH_HANS = 'zh_s';
 	const CO = 'co';
 	const HR = 'hr';
 	const CS = 'cs';
 	const DA = 'da';
 	const NL = 'nl';
 	const EN = 'en';
-	const EN_GB = 'en_gb';
+	const EN_GB = 'en_gb';
 	const EN_US = 'en_us';
 	const EO = 'eo';
 	const ET = 'et';

diff --git a/infra/general/languageCodeManager.php b/infra/general/languageCodeManager.php
@@ -743,8 +743,6 @@ private static function generateCacheFile()
         self::addLanguageToArrays($tmpArrKeyCode,$tmpArrThreeCodeT,$tmpArrKalturaName,"TEO","teo","teo","teo","Teo Chew","Teo Chew","Teo Chew");
         self::addLanguageToArrays($tmpArrKeyCode,$tmpArrThreeCodeT,$tmpArrKalturaName,"HNN","hnn","hnn","hnn","Hainanese","Hainanese","Hainanese");
         self::addLanguageToArrays($tmpArrKeyCode,$tmpArrThreeCodeT,$tmpArrKalturaName,"HAK","hak","hak","hak","Hakka","Hakka","Hakka");
-        self::addLanguageToArrays($tmpArrKeyCode,$tmpArrThreeCodeT,$tmpArrKalturaName,'ZH-HANT', "zh-hant", "zh-t", "zh-t", "Chinese (Traditional)",'Chinese (Traditional)');
-        self::addLanguageToArrays($tmpArrKeyCode,$tmpArrThreeCodeT,$tmpArrKalturaName,'ZH-HANS', "zh-hans", "zh-s", "zh-s", "Chinese (Simplified)",'Chinese (Simplified)');
 
         $result = "<?php\n\n".self::assignArrayToVar($tmpArrKeyCode ,'arrayISO639');
         $result .= self::assignArrayToVar($tmpArrThreeCodeT, 'arrayISO639_T');
@@ -758,4 +756,4 @@ private static function assignArrayToVar(&$array ,$varName )
         return "self::\$$varName"." = ".$strArr.";\n\n";
     }
 
-}
+}