From c88b4764e39a0ee3b84acef67ea80fadd5788cb9 Mon Sep 17 00:00:00 2001 From: EldersJavas <55266266+EldersJavas@users.noreply.github.com> Date: Thu, 5 Aug 2021 10:20:31 +0800 Subject: [PATCH 1/2] Push --- language.go | 2 ++ stl.go | 14 ++++++++++---- ttml.go | 7 ++++++- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/language.go b/language.go index 7eb4714..37d403d 100644 --- a/language.go +++ b/language.go @@ -5,4 +5,6 @@ const ( LanguageEnglish = "english" LanguageFrench = "french" LanguageNorwegian = "norwegian" + LanguageChinese = "chinese" + LanguageJapanese = "japanese" ) diff --git a/stl.go b/stl.go index c0b5929..e02fcb9 100644 --- a/stl.go +++ b/stl.go @@ -108,8 +108,10 @@ const ( // STL country codes const ( - stlCountryCodeFrance = "FRA" - stlCountryCodeNorway = "NOR" + stlCountryCodeFrance = "FRA" + stlCountryCodeNorway = "NOR" + stlCountryCodeChinese = "CHN" + stlCountryCodeJapan = "JPN" ) // STL cumulative status @@ -145,15 +147,19 @@ const ( stlLanguageCodeEnglish = "09" stlLanguageCodeFrench = "0F" stlLanguageCodeNorwegian = "1E" + stlLanguageCodeChinese = "75" + stllanguageCodeJapanese = "69" ) // STL language mapping var stlLanguageMapping = astikit.NewBiMap(). Set(stlLanguageCodeEnglish, LanguageEnglish). Set(stlLanguageCodeFrench, LanguageFrench). - Set(stlLanguageCodeNorwegian, LanguageNorwegian) + Set(stlLanguageCodeNorwegian, LanguageNorwegian). + Set(stlLanguageCodeChinese, LanguageChinese). + Set(stllanguageCodeJapanese, LanguageJapanese) -// STL timecode status + // STL timecode status const ( stlTimecodeStatusNotIntendedForUse = "0" stlTimecodeStatusIntendedForUse = "1" diff --git a/ttml.go b/ttml.go index 9dd0521..f21df87 100644 --- a/ttml.go +++ b/ttml.go @@ -22,13 +22,18 @@ const ( ttmlLanguageEnglish = "en" ttmlLanguageFrench = "fr" ttmlLanguageNorwegian = "no" + ttmlLanguageChinese = "zh" + ttmlLanguageJapanese = "ja" + ) // TTML language mapping var ttmlLanguageMapping = astikit.NewBiMap(). Set(ttmlLanguageEnglish, LanguageEnglish). Set(ttmlLanguageFrench, LanguageFrench). - Set(ttmlLanguageNorwegian, LanguageNorwegian) + Set(ttmlLanguageNorwegian, LanguageNorwegian). + Set(ttmlLanguageChinese, LanguageChinese). + Set(ttmlLanguageJapanese, LanguageJapanese) // TTML Clock Time Frames and Offset Time var ( From 435b5ce8a3098d38670b06e1769ae58779fcaf17 Mon Sep 17 00:00:00 2001 From: EldersJavas <55266266+EldersJavas@users.noreply.github.com> Date: Tue, 10 Aug 2021 20:04:13 +0800 Subject: [PATCH 2/2] slove --- language.go | 4 ++-- stl.go | 14 +++++++------- ttml.go | 11 +++++------ 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/language.go b/language.go index 37d403d..a7c762a 100644 --- a/language.go +++ b/language.go @@ -2,9 +2,9 @@ package astisub // Languages const ( + LanguageChinese = "chinese" LanguageEnglish = "english" LanguageFrench = "french" + LanguageJapanese = "japanese" LanguageNorwegian = "norwegian" - LanguageChinese = "chinese" - LanguageJapanese = "japanese" ) diff --git a/stl.go b/stl.go index e02fcb9..2d0ea1b 100644 --- a/stl.go +++ b/stl.go @@ -108,10 +108,10 @@ const ( // STL country codes const ( - stlCountryCodeFrance = "FRA" - stlCountryCodeNorway = "NOR" stlCountryCodeChinese = "CHN" + stlCountryCodeFrance = "FRA" stlCountryCodeJapan = "JPN" + stlCountryCodeNorway = "NOR" ) // STL cumulative status @@ -144,20 +144,20 @@ const ( // STL language codes const ( + stlLanguageCodeChinese = "75" stlLanguageCodeEnglish = "09" stlLanguageCodeFrench = "0F" - stlLanguageCodeNorwegian = "1E" - stlLanguageCodeChinese = "75" stllanguageCodeJapanese = "69" + stlLanguageCodeNorwegian = "1E" ) // STL language mapping var stlLanguageMapping = astikit.NewBiMap(). + Set(stlLanguageCodeChinese, LanguageChinese). Set(stlLanguageCodeEnglish, LanguageEnglish). Set(stlLanguageCodeFrench, LanguageFrench). - Set(stlLanguageCodeNorwegian, LanguageNorwegian). - Set(stlLanguageCodeChinese, LanguageChinese). - Set(stllanguageCodeJapanese, LanguageJapanese) + Set(stllanguageCodeJapanese, LanguageJapanese). + Set(stlLanguageCodeNorwegian, LanguageNorwegian) // STL timecode status const ( diff --git a/ttml.go b/ttml.go index f21df87..2e8046b 100644 --- a/ttml.go +++ b/ttml.go @@ -19,21 +19,20 @@ import ( // TTML languages const ( + ttmlLanguageChinese = "zh" ttmlLanguageEnglish = "en" + ttmlLanguageJapanese = "ja" ttmlLanguageFrench = "fr" ttmlLanguageNorwegian = "no" - ttmlLanguageChinese = "zh" - ttmlLanguageJapanese = "ja" - ) // TTML language mapping var ttmlLanguageMapping = astikit.NewBiMap(). + Set(ttmlLanguageChinese, LanguageChinese). Set(ttmlLanguageEnglish, LanguageEnglish). Set(ttmlLanguageFrench, LanguageFrench). - Set(ttmlLanguageNorwegian, LanguageNorwegian). - Set(ttmlLanguageChinese, LanguageChinese). - Set(ttmlLanguageJapanese, LanguageJapanese) + Set(ttmlLanguageJapanese, LanguageJapanese). + Set(ttmlLanguageNorwegian, LanguageNorwegian) // TTML Clock Time Frames and Offset Time var (