Added custom translation in base translation map

Author: andrey

generators/testdata/expected/newsportal.mfd

@@ -8,30 +8,4 @@
     </Languages>
     <GoPGVer>10</GoPGVer>
     <CustomTypes></CustomTypes>
-    <Dict>
-        <actions>Действия</actions>
-        <add>Добавить</add>
-        <alias>Системное имя</alias>
-        <categories>Категории</categories>
-        <category>Категория</category>
-        <content>Содержание</content>
-        <createdAt>Создано</createdAt>
-        <delete>Удалить</delete>
-        <deletedAt>Удалено</deletedAt>
-        <description>Описание</description>
-        <edit>Редактировать</edit>
-        <email>Email</email>
-        <foreword>Краткое содержание</foreword>
-        <image>Изображение</image>
-        <login>Логин</login>
-        <modifiedAt>Изменено</modifiedAt>
-        <password>Пароль</password>
-        <status>Статус</status>
-        <statusId>Статус</statusId>
-        <tag>Тег</tag>
-        <tags>Теги</tags>
-        <title>Название</title>
-        <user>Пользователь</user>
-        <users>Пользователи</users>
-    </Dict>
 </Project>

generators/xml-lang/generator.go

@@ -89,6 +89,7 @@ func (g *Generator) Generate() error {
 		g.options.Namespaces = project.VTNamespaceNames()
 	}
 
+	mfd.AddedCustomTranslations(project.Dict)
 	langs := mergeLangs(project.Languages, g.options.Languages)
 
 	translations, err := mfd.LoadTranslations(g.options.MFDPath, langs)

mfd/files.go

@@ -52,7 +52,6 @@ func LoadProject(filename string, create bool, goPGVer int) (*Project, error) {
 
 	project.Namespaces = []*Namespace{}
 	project.VTNamespaces = []*VTNamespace{}
-	project.Dict = NewDict()
 
 	dir := filepath.Dir(filename)
 	for _, pf := range project.NamespaceNames {
@@ -274,3 +273,11 @@ func LoadTemplate(path, def string) (string, error) {
 
 	return string(contents), nil
 }
+
+func AddedCustomTranslations(d *Dict) {
+	if d != nil {
+		for _, e := range d.Entries {
+			presetsTranslations[RuLang][e.XMLName.Local] = e.Value
+		}
+	}
+}

mfd/model.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"encoding/xml"
 	"fmt"
-	"sort"
 	"strings"
 
 	"github.com/dizzyfool/genna/model"
@@ -108,38 +107,12 @@ type Entry struct {
 	Value   string `xml:",chardata"`
 }
 
-func NewDict() *Dict {
-	return &Dict{Entries: NewEntries()}
-}
-
-func NewEntries() []Entry {
-	var entries []Entry
-
-	d := presetsTranslations[RuLang]
-	kk := make([]string, 0, len(d))
-	for k := range d {
-		kk = append(kk, k)
-	}
-
-	// так как map не упорядочен в go, будем сортировать ключи по алфавиту
-	sort.Strings(kk)
-	for _, k := range kk {
-		entries = append(entries, Entry{
-			XMLName: xml.Name{Local: k},
-			Value:   d[k],
-		})
-	}
-
-	return entries
-}
-
 func NewProject(name string, goPGVer int) *Project {
 	return &Project{
 		Name:           name,
 		NamespaceNames: []string{},
 
 		GoPGVer:   goPGVer,
-		Dict:      NewDict(),
 		Languages: []string{EnLang},
 
 		XMLxsi: "",