mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-21 20:46:30 -05:00
langs/i18n: Add workaround for known language, but missing plural rule error
Closes #7798
This commit is contained in:
parent
fc6abc39c7
commit
33e9d79b78
2 changed files with 23 additions and 1 deletions
|
@ -199,6 +199,19 @@ other = "{{ .Count }} minuttar lesing"`),
|
||||||
expected: "3 minuttar lesing",
|
expected: "3 minuttar lesing",
|
||||||
expectedFlag: "3 minuttar lesing",
|
expectedFlag: "3 minuttar lesing",
|
||||||
},
|
},
|
||||||
|
// https://github.com/gohugoio/hugo/issues/7798
|
||||||
|
{
|
||||||
|
name: "known-language-missing-plural",
|
||||||
|
data: map[string][]byte{
|
||||||
|
"oc.toml": []byte(`[oc]
|
||||||
|
one = "abc"`),
|
||||||
|
},
|
||||||
|
args: 1,
|
||||||
|
lang: "oc",
|
||||||
|
id: "oc",
|
||||||
|
expected: "abc",
|
||||||
|
expectedFlag: "abc",
|
||||||
|
},
|
||||||
// https://github.com/gohugoio/hugo/issues/7794
|
// https://github.com/gohugoio/hugo/issues/7794
|
||||||
{
|
{
|
||||||
name: "dotted-bare-key",
|
name: "dotted-bare-key",
|
||||||
|
@ -292,7 +305,7 @@ func TestI18nTranslate(t *testing.T) {
|
||||||
} else {
|
} else {
|
||||||
expected = test.expected
|
expected = test.expected
|
||||||
}
|
}
|
||||||
actual = doTestI18nTranslate(t, test, v)
|
actual = doTestI18nTranslate(c, test, v)
|
||||||
c.Assert(actual, qt.Equals, expected)
|
c.Assert(actual, qt.Equals, expected)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,6 +15,7 @@ package i18n
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"strings"
|
||||||
|
|
||||||
"github.com/gohugoio/hugo/common/herrors"
|
"github.com/gohugoio/hugo/common/herrors"
|
||||||
"golang.org/x/text/language"
|
"golang.org/x/text/language"
|
||||||
|
@ -95,6 +96,14 @@ func addTranslationFile(bundle *i18n.Bundle, r source.File) error {
|
||||||
|
|
||||||
_, err = bundle.ParseMessageFileBytes(b, name)
|
_, err = bundle.ParseMessageFileBytes(b, name)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
if strings.Contains(err.Error(), "no plural rule") {
|
||||||
|
// https://github.com/gohugoio/hugo/issues/7798
|
||||||
|
name = artificialLangTagPrefix + name
|
||||||
|
_, err = bundle.ParseMessageFileBytes(b, name)
|
||||||
|
if err == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
return errWithFileContext(_errors.Wrapf(err, "failed to load translations"), r)
|
return errWithFileContext(_errors.Wrapf(err, "failed to load translations"), r)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue