forks/miniflux
1
0
Fork 0
Code Releases Activity

Use a switch-case construct in internal/locale/plural.go instead of an avalanche of if-if-if-if-if

Browse source 
Less lines or code and marginally greater readability, yay!
Oh and also preallocate a map in LoadCatalogMessages just because we can.
This commit is contained in:
jvoisin 2024-02-28 16:08:20 +01:00 • committed by Frédéric Guillot
parent f274394f0e
commit 48fa64f8ec
2 changed files with 17 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal/locale/catalog.go
View file

@ -20,7 +20,7 @@ var translationFiles embed.FS
// LoadCatalogMessages loads and parses all translations encoded in JSON. // LoadCatalogMessages loads and parses all translations encoded in JSON.
func LoadCatalogMessages() error { func LoadCatalogMessages() error {
var err error var err error
defaultCatalog = make(catalog) defaultCatalog = make(catalog, len(AvailableLanguages()))
for language := range AvailableLanguages() { for language := range AvailableLanguages() {
defaultCatalog[language], err = loadTranslationFile(language) defaultCatalog[language], err = loadTranslationFile(language)

49
internal/locale/plural.go
View file

@ -3,53 +3,40 @@
package locale // import "miniflux.app/v2/internal/locale" package locale // import "miniflux.app/v2/internal/locale"
type pluralFormFunc func(n int) int
// See https://localization-guide.readthedocs.io/en/latest/l10n/pluralforms.html // See https://localization-guide.readthedocs.io/en/latest/l10n/pluralforms.html
// And http://www.unicode.org/cldr/charts/29/supplemental/language_plural_rules.html // And http://www.unicode.org/cldr/charts/29/supplemental/language_plural_rules.html
var pluralForms = map[string]pluralFormFunc{ var pluralForms = map[string](func(n int) int){
// nplurals=2; plural=(n != 1); // nplurals=2; plural=(n != 1);
"default": func(n int) int { "default": func(n int) int {
if n != 1 { if n != 1 {
return 1 return 1
} }
return 0 return 0
}, },
// nplurals=6; plural=(n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5); // nplurals=6; plural=(n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5);
"ar_AR": func(n int) int { "ar_AR": func(n int) int {
if n == 0 { switch {
case n == 0:
return 0 return 0
} case n == 1:
if n == 1 {
return 1 return 1
} case n == 2:
if n == 2 {
return 2 return 2
} case n%100 >= 3 && n%100 <= 10:
if n%100 >= 3 && n%100 <= 10 {
return 3 return 3
} case n%100 >= 11:
if n%100 >= 11 {
return 4 return 4
} }
return 5 return 5
}, },
// nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2; // nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;
"cs_CZ": func(n int) int { "cs_CZ": func(n int) int {
if n == 1 { switch {
case n == 1:
return 0 return 0
} case n >= 2 && n <= 4:
if n >= 2 && n <= 4 {
return 1 return 1
} }
return 2 return 2
}, },
// nplurals=1; plural=0; // nplurals=1; plural=0;
@ -58,14 +45,12 @@ var pluralForms = map[string]pluralFormFunc{
}, },
// nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2); // nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);
"pl_PL": func(n int) int { "pl_PL": func(n int) int {
if n == 1 { switch {
case n == 1:
return 0 return 0
} case n%10 >= 2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20):
if n%10 >= 2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20) {
return 1 return 1
} }
return 2 return 2
}, },
// nplurals=2; plural=(n > 1); // nplurals=2; plural=(n > 1);
@ -86,13 +71,11 @@ var pluralForms = map[string]pluralFormFunc{
// nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2); // nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);
func pluralFormRuSrUa(n int) int { func pluralFormRuSrUa(n int) int {
if n%10 == 1 && n%100 != 11 { switch {
case n%10 == 1 && n%100 != 11:
return 0 return 0
} case n%10 >= 2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20):
if n%10 >= 2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20) {
return 1 return 1
} }
return 2 return 2
} }