From b637244fed45b6636f2a4ae27404b17100585d4d Mon Sep 17 00:00:00 2001 From: phunkyfish Date: Thu, 16 Apr 2020 22:57:16 +0100 Subject: [PATCH] Merge pull request #17669 from howie-f/v19-disable-clang [clang-format] disable for all arrays in LangCodeExpander.cpp --- xbmc/utils/LangCodeExpander.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/xbmc/utils/LangCodeExpander.cpp b/xbmc/utils/LangCodeExpander.cpp index 014e9be820c37..f0b21ed32fe6d 100644 --- a/xbmc/utils/LangCodeExpander.cpp +++ b/xbmc/utils/LangCodeExpander.cpp @@ -547,6 +547,7 @@ std::string CLangCodeExpander::ConvertToISO6392T(const std::string& lang) return lang; } +// clang-format off const std::array g_iso639_1 = {{ {MAKECODE('\0', '\0', 'a', 'a'), "Afar"}, {MAKECODE('\0', '\0', 'a', 'b'), "Abkhazian"}, @@ -734,7 +735,9 @@ const std::array g_iso639_1 = {{ {MAKECODE('\0', '\0', 'z', 'h'), "Chinese"}, {MAKECODE('\0', '\0', 'z', 'u'), "Zulu"}, }}; +// clang-format on +// clang-format off const std::array g_iso639_2 = {{ {MAKECODE('\0', 'a', 'b', 'k'), "Abkhaz"}, {MAKECODE('\0', 'a', 'b', 'k'), "Abkhazian"}, @@ -1279,8 +1282,9 @@ const std::array g_iso639_2 = {{ {MAKECODE('\0', 'z', 'u', 'l'), "Zulu"}, {MAKECODE('\0', 'z', 'u', 'n'), "Zuni"}, }}; +// clang-format on - +// clang-format off const std::array LanguageCodes = {{ {"aa", "aar", NULL, NULL}, {"ab", "abk", NULL, NULL}, @@ -1474,6 +1478,7 @@ const std::array LanguageCodes = {{ NULL}, // Kodi intern mapping for missing "Miscellaneous languages" iso639-1 code {"zz", "mul", NULL, NULL} // Kodi intern mapping for missing "Multiple languages" iso639-1 code }}; +// clang-format on // Based on ISO 3166 // clang-format off