From 506820435cacb39ce7bb1835f46a15e913b95828 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Fri, 9 Oct 2020 10:00:50 +0200 Subject: lang/i18n: Fix for language code case issue with pt-br etc. Fixes #7804 --- langs/config.go | 2 +- langs/i18n/i18n.go | 5 ++--- langs/i18n/i18n_test.go | 12 ++++++++++++ 3 files changed, 15 insertions(+), 4 deletions(-) (limited to 'langs') diff --git a/langs/config.go b/langs/config.go index 08cd15009..3afd15df0 100644 --- a/langs/config.go +++ b/langs/config.go @@ -36,7 +36,7 @@ type LanguagesConfig struct { func LoadLanguageSettings(cfg config.Provider, oldLangs Languages) (c LanguagesConfig, err error) { - defaultLang := cfg.GetString("defaultContentLanguage") + defaultLang := strings.ToLower(cfg.GetString("defaultContentLanguage")) if defaultLang == "" { defaultLang = "en" cfg.Set("defaultContentLanguage", defaultLang) diff --git a/langs/i18n/i18n.go b/langs/i18n/i18n.go index 83144b89c..c0eac5837 100644 --- a/langs/i18n/i18n.go +++ b/langs/i18n/i18n.go @@ -66,12 +66,11 @@ func (t Translator) Func(lang string) translateFunc { func (t Translator) initFuncs(bndl *i18n.Bundle) { enableMissingTranslationPlaceholders := t.cfg.GetBool("enableMissingTranslationPlaceholders") for _, lang := range bndl.LanguageTags() { - currentLang := lang currentLangStr := currentLang.String() - currentLangKey := strings.TrimPrefix(currentLangStr, artificialLangTagPrefix) + // This may be pt-BR; make it case insensitive. + currentLangKey := strings.ToLower(strings.TrimPrefix(currentLangStr, artificialLangTagPrefix)) localizer := i18n.NewLocalizer(bndl, currentLangStr) - t.translateFuncs[currentLangKey] = func(translationID string, templateData interface{}) string { var pluralCount interface{} diff --git a/langs/i18n/i18n_test.go b/langs/i18n/i18n_test.go index 10570a4e3..fa78f708c 100644 --- a/langs/i18n/i18n_test.go +++ b/langs/i18n/i18n_test.go @@ -226,6 +226,18 @@ one = "abc"`), expected: "Show Me The Money", expectedFlag: "Show Me The Money", }, + // https: //github.com/gohugoio/hugo/issues/7804 + { + name: "lang-with-hyphen", + data: map[string][]byte{ + "pt-br.toml": []byte(`foo.one = "abc"`), + }, + args: 1, + lang: "pt-br", + id: "foo", + expected: "abc", + expectedFlag: "abc", + }, } func doTestI18nTranslate(t testing.TB, test i18nTest, cfg config.Provider) string { -- cgit v1.2.3 value='ml-docs-refresh'>ml-docs-refresh Mirror of https://github.com/netdata/netdatamatthias
summaryrefslogtreecommitdiffstats
path: root/exporting/exporting_engine.c
blob: 0a38d66bbe2ab017a4c6518f6c337e7f5e7ff9c4 (plain) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71