From 70f1a43fd80ed3f65e9f9161db292b5b8ecd5bb1 Mon Sep 17 00:00:00 2001 From: Arthur Barr Date: Thu, 30 Nov 2017 15:20:00 +0000 Subject: [PATCH] More license tweaks --- cmd/runmqserver/license.go | 5 +++-- cmd/runmqserver/license_test.go | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cmd/runmqserver/license.go b/cmd/runmqserver/license.go index 1bd6824..308ffe1 100644 --- a/cmd/runmqserver/license.go +++ b/cmd/runmqserver/license.go @@ -36,7 +36,8 @@ func resolveLicenseFile() string { return "Chinese_TW.txt" case strings.HasPrefix(lang, "zh"): return "Chinese.txt" - case strings.HasPrefix(lang, "cs"): + // Differentiate Czech (cs) and Kashubian (csb) + case strings.HasPrefix(lang, "cs") && !strings.HasPrefix(lang, "csb"): return "Czech.txt" case strings.HasPrefix(lang, "fr"): return "French.txt" @@ -50,7 +51,7 @@ func resolveLicenseFile() string { return "Italian.txt" case strings.HasPrefix(lang, "ja"): return "Japanese.txt" - // Need to differentiate Korean (ko) from Konkani (kok) + // Differentiate Korean (ko) from Konkani (kok) case strings.HasPrefix(lang, "ko") && !strings.HasPrefix(lang, "kok"): return "Korean.txt" case strings.HasPrefix(lang, "lt"): diff --git a/cmd/runmqserver/license_test.go b/cmd/runmqserver/license_test.go index aa36a28..7f1817d 100644 --- a/cmd/runmqserver/license_test.go +++ b/cmd/runmqserver/license_test.go @@ -25,6 +25,7 @@ var licenseTests = []struct { out string }{ {"en_US.UTF_8", "English.txt"}, + {"en_US.ISO-8859-15", "English.txt"}, {"es_GB", "Spanish.txt"}, {"el_ES.UTF_8", "Greek.txt"}, // Cover a wide variety of valid values @@ -59,6 +60,7 @@ var licenseTests = []struct { {"ca_ES", "English.txt"}, {"cs", "Czech.txt"}, {"cs_CZ", "Czech.txt"}, + {"csb_PL", "English.txt"}, {"cy", "English.txt"}, {"cy_GB", "English.txt"}, {"da", "English.txt"},