diff options
author | Christopher Speller <crspeller@gmail.com> | 2017-09-29 12:46:30 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-29 12:46:30 -0700 |
commit | b84736e9b6401df0c6eeab9950bef09458a6aefd (patch) | |
tree | d9175208de3236db75a33879750a57b3000ba096 /vendor/github.com/nicksnyder/go-i18n/i18n/translation | |
parent | 8b9dbb86133ff0fd6002a391268383d1593918ca (diff) | |
download | chat-b84736e9b6401df0c6eeab9950bef09458a6aefd.tar.gz chat-b84736e9b6401df0c6eeab9950bef09458a6aefd.tar.bz2 chat-b84736e9b6401df0c6eeab9950bef09458a6aefd.zip |
Updating server dependancies. (#7538)
Diffstat (limited to 'vendor/github.com/nicksnyder/go-i18n/i18n/translation')
-rw-r--r-- | vendor/github.com/nicksnyder/go-i18n/i18n/translation/plural_translation.go | 2 | ||||
-rw-r--r-- | vendor/github.com/nicksnyder/go-i18n/i18n/translation/single_translation.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vendor/github.com/nicksnyder/go-i18n/i18n/translation/plural_translation.go b/vendor/github.com/nicksnyder/go-i18n/i18n/translation/plural_translation.go index 5dd74b2f5..17c32609c 100644 --- a/vendor/github.com/nicksnyder/go-i18n/i18n/translation/plural_translation.go +++ b/vendor/github.com/nicksnyder/go-i18n/i18n/translation/plural_translation.go @@ -50,7 +50,7 @@ func (pt *pluralTranslation) Normalize(l *language.Language) Translation { func (pt *pluralTranslation) Backfill(src Translation) Translation { for pc, t := range pt.templates { - if t == nil || t.src == "" { + if (t == nil || t.src == "") && src != nil { pt.templates[pc] = src.Template(language.Other) } } diff --git a/vendor/github.com/nicksnyder/go-i18n/i18n/translation/single_translation.go b/vendor/github.com/nicksnyder/go-i18n/i18n/translation/single_translation.go index 9fcba5a18..a76c8c941 100644 --- a/vendor/github.com/nicksnyder/go-i18n/i18n/translation/single_translation.go +++ b/vendor/github.com/nicksnyder/go-i18n/i18n/translation/single_translation.go @@ -37,7 +37,7 @@ func (st *singleTranslation) Normalize(language *language.Language) Translation } func (st *singleTranslation) Backfill(src Translation) Translation { - if st.template == nil || st.template.src == "" { + if (st.template == nil || st.template.src == "") && src != nil { st.template = src.Template(language.Other) } return st |