diff --git a/go.mod b/go.mod index 3875dd4bf..44f75f98f 100644 --- a/go.mod +++ b/go.mod @@ -55,7 +55,7 @@ require ( github.com/casbin/casbin/v2 v2.103.0 // indirect github.com/casbin/govaluate v1.3.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect - github.com/chai2010/gettext-go v1.0.2 // indirect + github.com/chai2010/gettext-go v1.0.3 // indirect github.com/cloudflare/circl v1.6.1 // indirect github.com/cyphar/filepath-securejoin v0.4.1 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect diff --git a/go.sum b/go.sum index 215decb5a..a469417dd 100644 --- a/go.sum +++ b/go.sum @@ -78,8 +78,8 @@ github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/chai2010/gettext-go v1.0.2 h1:1Lwwip6Q2QGsAdl/ZKPCwTe9fe0CjlUbqj5bFNSjIRk= -github.com/chai2010/gettext-go v1.0.2/go.mod h1:y+wnP2cHYaVj19NZhYKAwEMH2CI1gNHeQQ+5AjwawxA= +github.com/chai2010/gettext-go v1.0.3 h1:9liNh8t+u26xl5ddmWLmsOsdNLwkdRTg5AG+JnTiM80= +github.com/chai2010/gettext-go v1.0.3/go.mod h1:y+wnP2cHYaVj19NZhYKAwEMH2CI1gNHeQQ+5AjwawxA= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= diff --git a/vendor/github.com/chai2010/gettext-go/README.md b/vendor/github.com/chai2010/gettext-go/README.md index 9381bd152..d766fab4d 100644 --- a/vendor/github.com/chai2010/gettext-go/README.md +++ b/vendor/github.com/chai2010/gettext-go/README.md @@ -1,6 +1,5 @@ -- *赞助 BTC: 1Cbd6oGAUUyBi7X7MaR4np4nTmQZXVgkCW* -- *赞助 ETH: 0x623A3C3a72186A6336C79b18Ac1eD36e1c71A8a6* -- *Go语言付费QQ群: 1055927514* +- *Go语言QQ群: 102319854, 1055927514* +- *凹语言(凹读音“Wa”)(The Wa Programming Language): https://github.com/wa-lang/wa* ---- diff --git a/vendor/github.com/chai2010/gettext-go/plural/formula.go b/vendor/github.com/chai2010/gettext-go/plural/formula.go index 679a1cd50..c92dc19ea 100644 --- a/vendor/github.com/chai2010/gettext-go/plural/formula.go +++ b/vendor/github.com/chai2010/gettext-go/plural/formula.go @@ -47,7 +47,7 @@ var formulaTable = map[string]func(n int) int{ return 0 }, fmtForms("nplurals=2; plural=(n != 1);"): func(n int) int { - if n <= 1 { + if n == 1 { return 0 } return 1 diff --git a/vendor/github.com/chai2010/gettext-go/po/util.go b/vendor/github.com/chai2010/gettext-go/po/util.go index d8b3b0e25..1a0928b11 100644 --- a/vendor/github.com/chai2010/gettext-go/po/util.go +++ b/vendor/github.com/chai2010/gettext-go/po/util.go @@ -29,6 +29,9 @@ func decodePoString(text string) string { break } switch line[i+1] { + case 'r': // \\r -> \r + data = append(data, '\r') + i++ case 'n': // \\n -> \n data = append(data, '\n') i++ @@ -62,6 +65,8 @@ func encodePoString(text string) string { buf.WriteString(`\\`) case '"': buf.WriteString(`\"`) + case '\r': + buf.WriteString(`\r`) case '\n': buf.WriteString(`\n`) case '\t': @@ -96,6 +101,8 @@ func encodeCommentPoString(text string) string { buf.WriteString(`\\`) case '"': buf.WriteString(`\"`) + case '\r': + buf.WriteString(`\r`) case '\n': buf.WriteString(`\n`) case '\t': diff --git a/vendor/modules.txt b/vendor/modules.txt index cfcc69d47..ec10587b8 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -215,7 +215,7 @@ github.com/casbin/govaluate # github.com/cespare/xxhash/v2 v2.3.0 ## explicit; go 1.11 github.com/cespare/xxhash/v2 -# github.com/chai2010/gettext-go v1.0.2 +# github.com/chai2010/gettext-go v1.0.3 ## explicit; go 1.14 github.com/chai2010/gettext-go github.com/chai2010/gettext-go/mo