diff --git a/core_service.go b/core_service.go index 99aad51..77de04b 100644 --- a/core_service.go +++ b/core_service.go @@ -347,3 +347,8 @@ func (s *CoreService) PluralCategory(n int) PluralCategory { func (s *CoreService) CurrentPluralCategory(n int) PluralCategory { return s.PluralCategory(n) } + +// PluralCategoryOf is a short alias for CurrentPluralCategory. +func (s *CoreService) PluralCategoryOf(n int) PluralCategory { + return s.CurrentPluralCategory(n) +} diff --git a/hooks_test.go b/hooks_test.go index 5f8b143..16d171a 100644 --- a/hooks_test.go +++ b/hooks_test.go @@ -359,6 +359,7 @@ func TestCoreService_DelegatesToWrappedService(t *testing.T) { assert.Equal(t, svc.IsRTL(), coreSvc.CurrentRTL()) assert.Equal(t, svc.PluralCategory(2), coreSvc.PluralCategory(2)) assert.Equal(t, svc.PluralCategory(2), coreSvc.CurrentPluralCategory(2)) + assert.Equal(t, svc.PluralCategory(2), coreSvc.PluralCategoryOf(2)) assert.Equal(t, svc.Mode(), coreSvc.CurrentMode()) assert.Equal(t, svc.Language(), coreSvc.CurrentLanguage()) assert.Equal(t, svc.Language(), coreSvc.CurrentLang()) diff --git a/localise.go b/localise.go index e323c58..3d96cdc 100644 --- a/localise.go +++ b/localise.go @@ -164,7 +164,7 @@ func CurrentRTL() bool { // // cat := i18n.CurrentPluralCategory(2) func CurrentPluralCategory(n int) PluralCategory { - return PluralCategoryOf(n) + return defaultServiceValue(PluralOther, func(svc *Service) PluralCategory { return svc.PluralCategory(n) }) } // PluralCategoryOf returns the plural category for the current default language. @@ -173,7 +173,7 @@ func CurrentPluralCategory(n int) PluralCategory { // // cat := i18n.PluralCategoryOf(2) func PluralCategoryOf(n int) PluralCategory { - return defaultServiceValue(PluralOther, func(svc *Service) PluralCategory { return svc.PluralCategory(n) }) + return CurrentPluralCategory(n) } func detectLanguage(supported []language.Tag) string { diff --git a/service.go b/service.go index 95b9bf6..ad312f7 100644 --- a/service.go +++ b/service.go @@ -455,6 +455,11 @@ func (s *Service) CurrentPluralCategory(n int) PluralCategory { return s.PluralCategory(n) } +// PluralCategoryOf is a short alias for CurrentPluralCategory. +func (s *Service) PluralCategoryOf(n int) PluralCategory { + return s.CurrentPluralCategory(n) +} + func joinAvailableLanguagesLocked(tags []language.Tag) string { if len(tags) == 0 { return "" diff --git a/service_test.go b/service_test.go index 5581d6b..ec3d01e 100644 --- a/service_test.go +++ b/service_test.go @@ -172,6 +172,9 @@ func TestServiceCurrentStateAliases(t *testing.T) { if got, want := svc.CurrentPluralCategory(2), svc.PluralCategory(2); got != want { t.Fatalf("CurrentPluralCategory() = %v, want %v", got, want) } + if got, want := svc.PluralCategoryOf(2), svc.PluralCategory(2); got != want { + t.Fatalf("PluralCategoryOf() = %v, want %v", got, want) + } if got, want := svc.CurrentDebug(), svc.Debug(); got != want { t.Fatalf("CurrentDebug() = %v, want %v", got, want) }