DeforaNetworks/corteza
3
0
Fork 0
Code Activity

Fix improper resource translation management for automation buttons

Browse Source
This commit is contained in:
Tomaž Jerman
2022-11-07 14:41:28 +01:00
parent 4c4f1dfd25
commit 04eb3cde92
2 changed files with 61 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compose/service/locale.go
+1 -1
View File
@@ -356,7 +356,7 @@ func (svc resourceTranslationsManager) pageBlockButtons(tag language.Tag, res *t
for j, auxBtn := range bb {
btn := auxBtn.(map[string]interface{})
bContentID := uint64(1)
bContentID := uint64(0)
if aux, ok := btn["buttonID"]; ok {
bContentID = cast.ToUint64(aux)
}
compose/types/page.go
+60 -40
View File
@@ -222,31 +222,40 @@ func (p *Page) decodeTranslations(tt locale.ResourceTranslationIndex) {
switch block.Kind {
case "Automation":
bb, _ := block.Options["buttons"].([]interface{})
for j, auxBtn := range bb {
btn := auxBtn.(map[string]interface{})
p.decodeRecordListButtons(tt, bb, blockID)
buttonID := uint64(0)
if aux, ok := btn["buttonID"]; ok {
buttonID = cast.ToUint64(aux)
}
buttonID = locale.ContentID(buttonID, j)
rpl := strings.NewReplacer(
"{{blockID}}", strconv.FormatUint(blockID, 10),
"{{buttonID}}", strconv.FormatUint(buttonID, 10),
)
if aux = tt.FindByKey(rpl.Replace(LocaleKeyPagePageBlockBlockIDButtonButtonIDLabel.Path)); aux != nil {
btn["label"] = aux.Msg
}
}
case "RecordList":
bb, _ := block.Options["selectionButtons"].([]interface{})
p.decodeRecordListButtons(tt, bb, blockID)
case "Content":
if aux = tt.FindByKey(rpl.Replace(LocaleKeyPagePageBlockBlockIDContentBody.Path)); aux != nil {
block.Options["body"] = aux.Msg
}
}
}
}
func (p *Page) decodeRecordListButtons(tt locale.ResourceTranslationIndex, bb []interface{}, blockID uint64) {
var aux *locale.ResourceTranslation
for j, auxBtn := range bb {
btn := auxBtn.(map[string]interface{})
buttonID := uint64(0)
if aux, ok := btn["buttonID"]; ok {
buttonID = cast.ToUint64(aux)
}
buttonID = locale.ContentID(buttonID, j)
rpl := strings.NewReplacer(
"{{blockID}}", strconv.FormatUint(blockID, 10),
"{{buttonID}}", strconv.FormatUint(buttonID, 10),
)
if aux = tt.FindByKey(rpl.Replace(LocaleKeyPagePageBlockBlockIDButtonButtonIDLabel.Path)); aux != nil {
btn["label"] = aux.Msg
}
}
}
@@ -281,31 +290,12 @@ func (p *Page) encodeTranslations() (out locale.ResourceTranslationSet) {
switch block.Kind {
case "Automation":
bb, _ := block.Options["buttons"].([]interface{})
for j, auxBtn := range bb {
btn := auxBtn.(map[string]interface{})
out = append(out, p.encodeRecordListButtons(bb, blockID)...)
if _, ok := btn["label"]; !ok {
continue
}
case "RecordList":
bb, _ := block.Options["selectionButtons"].([]interface{})
out = append(out, p.encodeRecordListButtons(bb, blockID)...)
buttonID := uint64(0)
if aux, ok := btn["buttonID"]; ok {
buttonID = cast.ToUint64(aux)
}
buttonID = locale.ContentID(buttonID, j)
rpl := strings.NewReplacer(
"{{blockID}}", strconv.FormatUint(blockID, 10),
"{{buttonID}}", strconv.FormatUint(buttonID, 10),
)
out = append(out, &locale.ResourceTranslation{
Resource: p.ResourceTranslation(),
Key: rpl.Replace(LocaleKeyPagePageBlockBlockIDButtonButtonIDLabel.Path),
Msg: btn["label"].(string),
})
}
case "Content":
body, _ := block.Options["body"].(string)
out = append(out, &locale.ResourceTranslation{
@@ -319,6 +309,36 @@ func (p *Page) encodeTranslations() (out locale.ResourceTranslationSet) {
return
}
func (p *Page) encodeRecordListButtons(bb []interface{}, blockID uint64) (out locale.ResourceTranslationSet) {
for j, auxBtn := range bb {
btn := auxBtn.(map[string]interface{})
if _, ok := btn["label"]; !ok {
continue
}
buttonID := uint64(0)
if aux, ok := btn["buttonID"]; ok {
buttonID = cast.ToUint64(aux)
}
buttonID = locale.ContentID(buttonID, j)
rpl := strings.NewReplacer(
"{{blockID}}", strconv.FormatUint(blockID, 10),
"{{buttonID}}", strconv.FormatUint(buttonID, 10),
)
out = append(out, &locale.ResourceTranslation{
Resource: p.ResourceTranslation(),
Key: rpl.Replace(LocaleKeyPagePageBlockBlockIDButtonButtonIDLabel.Path),
Msg: btn["label"].(string),
})
}
return
}
// FindByHandle finds page by it's handle
func (set PageSet) FindByHandle(handle string) *Page {
for i := range set {