DeforaNetworks/corteza
DeforaNetworks/corteza
3
0
Fork 0
Code

Default resource translation to key value if missing

Browse Source
This commit is contained in:
Tomaž Jerman 2021-09-15 11:53:52 +02:00
parent 04c6b7f1ac
commit 10d4152ad6
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
compose/types/locale.gen.go generated
View File

@ -124,6 +124,8 @@ func (r *ModuleField) DecodeTranslations(tt locale.ResourceTranslationIndex) {
var aux *locale.ResourceTranslation
if aux = tt.FindByKey(LocaleKeyModuleFieldLabel.Path); aux != nil {
r.Label = aux.Msg
} else {
r.Label = LocaleKeyModuleFieldLabel.Path
}
r.decodeTranslationsValidatorError(tt)
}
@ -172,6 +174,8 @@ func (r *Module) DecodeTranslations(tt locale.ResourceTranslationIndex) {
var aux *locale.ResourceTranslation
if aux = tt.FindByKey(LocaleKeyModuleName.Path); aux != nil {
r.Name = aux.Msg
} else {
r.Name = LocaleKeyModuleName.Path
}
r.decodeTranslations(tt)
@ -221,12 +225,18 @@ func (r *Namespace) DecodeTranslations(tt locale.ResourceTranslationIndex) {
var aux *locale.ResourceTranslation
if aux = tt.FindByKey(LocaleKeyNamespaceName.Path); aux != nil {
r.Name = aux.Msg
} else {
r.Name = LocaleKeyNamespaceName.Path
}
if aux = tt.FindByKey(LocaleKeyNamespaceSubtitle.Path); aux != nil {
r.Meta.Subtitle = aux.Msg
} else {
r.Meta.Subtitle = LocaleKeyNamespaceSubtitle.Path
}
if aux = tt.FindByKey(LocaleKeyNamespaceDescription.Path); aux != nil {
r.Meta.Description = aux.Msg
} else {
r.Meta.Description = LocaleKeyNamespaceDescription.Path
}
}
@ -282,9 +292,13 @@ func (r *Page) DecodeTranslations(tt locale.ResourceTranslationIndex) {
var aux *locale.ResourceTranslation
if aux = tt.FindByKey(LocaleKeyPageTitle.Path); aux != nil {
r.Title = aux.Msg
} else {
r.Title = LocaleKeyPageTitle.Path
}
if aux = tt.FindByKey(LocaleKeyPageDescription.Path); aux != nil {
r.Description = aux.Msg
} else {
r.Description = LocaleKeyPageDescription.Path
}
r.decodeTranslations(tt)

2
pkg/codegen-v3/assets/templates/gocode/locale/types.go.tpl
View File

@ -88,6 +88,8 @@ func (r *{{ .Resource }}) DecodeTranslations(tt locale.ResourceTranslationIndex)
{{- if not .Custom }}
if aux = tt.FindByKey(LocaleKey{{ $Resource }}{{coalesce (export .Name) (export .Path) }}.Path); aux != nil {
r.{{ .Field }} = aux.Msg
} else {
r.{{ .Field }} = LocaleKey{{ $Resource }}{{coalesce (export .Name) (export .Path) }}.Path
}
{{- end}}
{{- end}}

2
pkg/locale/locale.go
View File

@ -99,7 +99,7 @@ func (l *Language) tResource(ns, key string, rr ...string) string {
return l.extends.tResource(ns, key, rr...)
}
return ""
return key
}
// resourceTranslations returns all resource translations for the specified resource