mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-07 20:30:36 -05:00
4576c82ed4
The isolated benchmark for the function is obviously much faster: ```bash name old time/op new time/op delta GetMethodByName-10 1.21µs ± 7% 0.23µs ± 5% -81.42% (p=0.029 n=4+4) name old alloc/op new alloc/op delta GetMethodByName-10 680B ± 0% 0B -100.00% (p=0.029 n=4+4) name old allocs/op new allocs/op delta GetMethodByName-10 20.0 ± 0% 0.0 -100.00% (p=0.029 n=4+4) ``` But more pleasing is the overall performance looking at the site benchmarks: ```bash name old time/op new time/op delta SiteNew/Regular_Bundle_with_image-10 6.25ms ± 2% 6.10ms ± 2% ~ (p=0.057 n=4+4) SiteNew/Regular_Bundle_with_JSON_file-10 6.30ms ± 2% 5.66ms ±11% ~ (p=0.057 n=4+4) SiteNew/Regular_Tags_and_categories-10 22.2ms ± 2% 17.4ms ± 1% -21.88% (p=0.029 n=4+4) SiteNew/Regular_Canonify_URLs-10 108ms ± 0% 107ms ± 0% -1.20% (p=0.029 n=4+4) SiteNew/Regular_Deep_content_tree-10 36.1ms ± 1% 33.8ms ± 1% -6.44% (p=0.029 n=4+4) SiteNew/Regular_TOML_front_matter-10 24.9ms ± 1% 22.6ms ± 1% -9.30% (p=0.029 n=4+4) SiteNew/Regular_Many_HTML_templates-10 17.9ms ± 1% 16.7ms ± 1% -6.43% (p=0.029 n=4+4) SiteNew/Regular_Page_collections-10 23.3ms ± 1% 22.0ms ± 0% -5.58% (p=0.029 n=4+4) SiteNew/Regular_List_terms-10 8.00ms ± 1% 7.63ms ± 0% -4.62% (p=0.029 n=4+4) name old alloc/op new alloc/op delta SiteNew/Regular_Bundle_with_image-10 2.10MB ± 0% 2.07MB ± 0% -1.46% (p=0.029 n=4+4) SiteNew/Regular_Bundle_with_JSON_file-10 1.88MB ± 0% 1.85MB ± 0% -1.76% (p=0.029 n=4+4) SiteNew/Regular_Tags_and_categories-10 13.5MB ± 0% 11.6MB ± 0% -13.99% (p=0.029 n=4+4) SiteNew/Regular_Canonify_URLs-10 96.1MB ± 0% 95.8MB ± 0% -0.40% (p=0.029 n=4+4) SiteNew/Regular_Deep_content_tree-10 28.4MB ± 0% 27.3MB ± 0% -3.83% (p=0.029 n=4+4) SiteNew/Regular_TOML_front_matter-10 16.9MB ± 0% 15.1MB ± 0% -10.58% (p=0.029 n=4+4) SiteNew/Regular_Many_HTML_templates-10 8.98MB ± 0% 8.44MB ± 0% -6.04% (p=0.029 n=4+4) SiteNew/Regular_Page_collections-10 17.1MB ± 0% 16.5MB ± 0% -3.91% (p=0.029 n=4+4) SiteNew/Regular_List_terms-10 3.92MB ± 0% 3.72MB ± 0% -5.03% (p=0.029 n=4+4) name old allocs/op new allocs/op delta SiteNew/Regular_Bundle_with_image-10 25.8k ± 0% 24.9k ± 0% -3.49% (p=0.029 n=4+4) SiteNew/Regular_Bundle_with_JSON_file-10 25.8k ± 0% 24.9k ± 0% -3.49% (p=0.029 n=4+4) SiteNew/Regular_Tags_and_categories-10 288k ± 0% 233k ± 0% -18.90% (p=0.029 n=4+4) SiteNew/Regular_Canonify_URLs-10 375k ± 0% 364k ± 0% -2.80% (p=0.029 n=4+4) SiteNew/Regular_Deep_content_tree-10 314k ± 0% 283k ± 0% -9.77% (p=0.029 n=4+4) SiteNew/Regular_TOML_front_matter-10 302k ± 0% 252k ± 0% -16.55% (p=0.029 n=4+4) SiteNew/Regular_Many_HTML_templates-10 133k ± 0% 117k ± 0% -11.81% (p=0.029 n=4+4) SiteNew/Regular_Page_collections-10 202k ± 0% 183k ± 0% -9.55% (p=0.029 n=4+4) SiteNew/Regular_List_terms-10 55.6k ± 0% 49.8k ± 0% -10.40% (p=0.029 n=4+4) ``` Thanks to @quasilyte for the suggestion. Fixes 9386
196 lines
5.6 KiB
Go
196 lines
5.6 KiB
Go
// Copyright 2017 The Hugo Authors. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package i18n
|
|
|
|
import (
|
|
"fmt"
|
|
"reflect"
|
|
"strings"
|
|
|
|
"github.com/spf13/cast"
|
|
|
|
"github.com/gohugoio/hugo/common/hreflect"
|
|
"github.com/gohugoio/hugo/common/loggers"
|
|
"github.com/gohugoio/hugo/config"
|
|
"github.com/gohugoio/hugo/helpers"
|
|
|
|
"github.com/gohugoio/go-i18n/v2/i18n"
|
|
)
|
|
|
|
type translateFunc func(translationID string, templateData interface{}) string
|
|
|
|
var i18nWarningLogger = helpers.NewDistinctErrorLogger()
|
|
|
|
// Translator handles i18n translations.
|
|
type Translator struct {
|
|
translateFuncs map[string]translateFunc
|
|
cfg config.Provider
|
|
logger loggers.Logger
|
|
}
|
|
|
|
// NewTranslator creates a new Translator for the given language bundle and configuration.
|
|
func NewTranslator(b *i18n.Bundle, cfg config.Provider, logger loggers.Logger) Translator {
|
|
t := Translator{cfg: cfg, logger: logger, translateFuncs: make(map[string]translateFunc)}
|
|
t.initFuncs(b)
|
|
return t
|
|
}
|
|
|
|
// Func gets the translate func for the given language, or for the default
|
|
// configured language if not found.
|
|
func (t Translator) Func(lang string) translateFunc {
|
|
if f, ok := t.translateFuncs[lang]; ok {
|
|
return f
|
|
}
|
|
t.logger.Infof("Translation func for language %v not found, use default.", lang)
|
|
if f, ok := t.translateFuncs[t.cfg.GetString("defaultContentLanguage")]; ok {
|
|
return f
|
|
}
|
|
|
|
t.logger.Infoln("i18n not initialized; if you need string translations, check that you have a bundle in /i18n that matches the site language or the default language.")
|
|
return func(translationID string, args interface{}) string {
|
|
return ""
|
|
}
|
|
}
|
|
|
|
func (t Translator) initFuncs(bndl *i18n.Bundle) {
|
|
enableMissingTranslationPlaceholders := t.cfg.GetBool("enableMissingTranslationPlaceholders")
|
|
for _, lang := range bndl.LanguageTags() {
|
|
currentLang := lang
|
|
currentLangStr := currentLang.String()
|
|
// 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 {
|
|
pluralCount := getPluralCount(templateData)
|
|
|
|
if templateData != nil {
|
|
tp := reflect.TypeOf(templateData)
|
|
if hreflect.IsInt(tp.Kind()) {
|
|
// This was how go-i18n worked in v1,
|
|
// and we keep it like this to avoid breaking
|
|
// lots of sites in the wild.
|
|
templateData = intCount(cast.ToInt(templateData))
|
|
}
|
|
}
|
|
|
|
translated, translatedLang, err := localizer.LocalizeWithTag(&i18n.LocalizeConfig{
|
|
MessageID: translationID,
|
|
TemplateData: templateData,
|
|
PluralCount: pluralCount,
|
|
})
|
|
|
|
sameLang := currentLang == translatedLang
|
|
|
|
if err == nil && sameLang {
|
|
return translated
|
|
}
|
|
|
|
if err != nil && sameLang && translated != "" {
|
|
// See #8492
|
|
// TODO(bep) this needs to be improved/fixed upstream,
|
|
// but currently we get an error even if the fallback to
|
|
// "other" succeeds.
|
|
if fmt.Sprintf("%T", err) == "i18n.pluralFormNotFoundError" {
|
|
return translated
|
|
}
|
|
}
|
|
|
|
if _, ok := err.(*i18n.MessageNotFoundErr); !ok {
|
|
t.logger.Warnf("Failed to get translated string for language %q and ID %q: %s", currentLangStr, translationID, err)
|
|
}
|
|
|
|
if t.cfg.GetBool("logI18nWarnings") {
|
|
i18nWarningLogger.Printf("i18n|MISSING_TRANSLATION|%s|%s", currentLangStr, translationID)
|
|
}
|
|
|
|
if enableMissingTranslationPlaceholders {
|
|
return "[i18n] " + translationID
|
|
}
|
|
|
|
return translated
|
|
}
|
|
}
|
|
}
|
|
|
|
// intCount wraps the Count method.
|
|
type intCount int
|
|
|
|
func (c intCount) Count() int {
|
|
return int(c)
|
|
}
|
|
|
|
const countFieldName = "Count"
|
|
|
|
// getPluralCount gets the plural count as a string (floats) or an integer.
|
|
// If v is nil, nil is returned.
|
|
func getPluralCount(v interface{}) interface{} {
|
|
if v == nil {
|
|
// i18n called without any argument, make sure it does not
|
|
// get any plural count.
|
|
return nil
|
|
}
|
|
|
|
switch v := v.(type) {
|
|
case map[string]interface{}:
|
|
for k, vv := range v {
|
|
if strings.EqualFold(k, countFieldName) {
|
|
return toPluralCountValue(vv)
|
|
}
|
|
}
|
|
default:
|
|
vv := reflect.Indirect(reflect.ValueOf(v))
|
|
if vv.Kind() == reflect.Interface && !vv.IsNil() {
|
|
vv = vv.Elem()
|
|
}
|
|
tp := vv.Type()
|
|
|
|
if tp.Kind() == reflect.Struct {
|
|
f := vv.FieldByName(countFieldName)
|
|
if f.IsValid() {
|
|
return toPluralCountValue(f.Interface())
|
|
}
|
|
m := hreflect.GetMethodByName(vv, countFieldName)
|
|
if m.IsValid() && m.Type().NumIn() == 0 && m.Type().NumOut() == 1 {
|
|
c := m.Call(nil)
|
|
return toPluralCountValue(c[0].Interface())
|
|
}
|
|
}
|
|
}
|
|
|
|
return toPluralCountValue(v)
|
|
}
|
|
|
|
// go-i18n expects floats to be represented by string.
|
|
func toPluralCountValue(in interface{}) interface{} {
|
|
k := reflect.TypeOf(in).Kind()
|
|
switch {
|
|
case hreflect.IsFloat(k):
|
|
f := cast.ToString(in)
|
|
if !strings.Contains(f, ".") {
|
|
f += ".0"
|
|
}
|
|
return f
|
|
case k == reflect.String:
|
|
if _, err := cast.ToFloat64E(in); err == nil {
|
|
return in
|
|
}
|
|
// A non-numeric value.
|
|
return nil
|
|
default:
|
|
if i, err := cast.ToIntE(in); err == nil {
|
|
return i
|
|
}
|
|
return nil
|
|
}
|
|
}
|