Merge pull request #2550 from wking/language-dot-split

libpod/container_internal: Split locale at the first dot, etc.

libpod/container_internal.go

@@ -34,8 +34,8 @@ const (
 )
 
 var (
-	// localeToLanguage maps from locale values to language tags.
+	// localeToLanguageMap maps from locale values to language tags.
-	localeToLanguage = map[string]string{
+	localeToLanguageMap = map[string]string{
 		"":      "und-u-va-posix",
 		"c":     "und-u-va-posix",
 		"posix": "und-u-va-posix",
@@ -1281,6 +1281,16 @@ func (c *Container) saveSpec(spec *spec.Spec) error {
 	return nil
 }
 
+// localeToLanguage translates POSIX locale strings to BCP 47 language tags.
+func localeToLanguage(locale string) string {
+	locale = strings.Replace(strings.SplitN(locale, ".", 2)[0], "_", "-", 1)
+	langString, ok := localeToLanguageMap[strings.ToLower(locale)]
+	if !ok {
+		langString = locale
+	}
+	return langString
+}
+
 // Warning: precreate hooks may alter 'config' in place.
 func (c *Container) setupOCIHooks(ctx context.Context, config *spec.Spec) (extensionStageHooks map[string][]spec.Hook, err error) {
 	var locale string
@@ -1296,11 +1306,7 @@ func (c *Container) setupOCIHooks(ctx context.Context, config *spec.Spec) (exten
 		}
 	}
 
-	langString, ok := localeToLanguage[strings.ToLower(locale)]
+	langString := localeToLanguage(locale)
-	if !ok {
-		langString = locale
-	}
-
 	lang, err := language.Parse(langString)
 	if err != nil {
 		logrus.Warnf("failed to parse language %q: %s", langString, err)

libpod/container_internal_test.go

@@ -17,6 +17,54 @@ import (
 // hookPath is the path to an example hook executable.
 var hookPath string
 
+func TestLocaleToLanguage(t *testing.T) {
+	for _, testCase := range []struct {
+		locale   string
+		language string
+	}{
+		{
+			locale:   "",
+			language: "und-u-va-posix",
+		},
+		{
+			locale:   "C",
+			language: "und-u-va-posix",
+		},
+		{
+			locale:   "POSIX",
+			language: "und-u-va-posix",
+		},
+		{
+			locale:   "c",
+			language: "und-u-va-posix",
+		},
+		{
+			locale:   "en",
+			language: "en",
+		},
+		{
+			locale:   "en_US",
+			language: "en-US",
+		},
+		{
+			locale:   "en.UTF-8",
+			language: "en",
+		},
+		{
+			locale:   "en_US.UTF-8",
+			language: "en-US",
+		},
+		{
+			locale:   "does-not-exist",
+			language: "does-not-exist",
+		},
+	} {
+		t.Run(testCase.locale, func(t *testing.T) {
+			assert.Equal(t, testCase.language, localeToLanguage(testCase.locale))
+		})
+	}
+}
+
 func TestPostDeleteHooks(t *testing.T) {
 	ctx := context.Background()
 	dir, err := ioutil.TempDir("", "libpod_test_")