diff --git a/README.md b/README.md index 6a3e9bc..99bcc41 100644 --- a/README.md +++ b/README.md @@ -61,15 +61,15 @@ import ( ) func main() { - customLanguageOverrites := make(map[string]map[rune]string) + customLanguageOverwrites := make(map[string]map[rune]string) - customLanguageOverrites["myLangcode"] = map[rune]string{ + customLanguageOverwrites["myLangcode"] = map[rune]string{ // Ї 0x407: "CU", // и 0x438: "y", } - trans := transliterator.NewTransliterator(&customLanguageOverrites) + trans := transliterator.NewTransliterator(&customLanguageOverwrites) text := "КиЇв" fmt.Println(trans.Transliterate(text, "myLangcode")) // Result: KyCUv diff --git a/languages/languages.go b/languages/languages.go index 982ec8c..5eaf445 100644 --- a/languages/languages.go +++ b/languages/languages.go @@ -1,31 +1,31 @@ package languages -// LanguageOverrides structure. -type LanguageOverrides struct { - Overrides map[string]map[rune]string +// LanguageOverwrites structure. +type LanguageOverwrites struct { + Overwrites map[string]map[rune]string } -// NewLanguageOverrides creates new LanguageOverrides object. -func NewLanguageOverrides() *LanguageOverrides { - return &LanguageOverrides{ - Overrides: initOverrides(), +// NewLanguageOverwrites creates new LanguageOverwrites object. +func NewLanguageOverwrites() *LanguageOverwrites { + return &LanguageOverwrites{ + Overwrites: initOverwrites(), } } -// AddLanguageOverrides adds custom transliterations overrides. -func (lo *LanguageOverrides) AddLanguageOverrides(overrides *map[string]map[rune]string) { - for langcode, override := range *overrides { +// AddLanguageOverwrites adds custom transliterations overwrites. +func (lo *LanguageOverwrites) AddLanguageOverwrites(overwrites *map[string]map[rune]string) { + for langcode, override := range *overwrites { lo.AddLanguageOverride(langcode, override) } } -// AddLanguageOverride adds custom transliteration overrides for specific language. -func (lo *LanguageOverrides) AddLanguageOverride(langcode string, override map[rune]string) { - lo.Overrides[langcode] = override +// AddLanguageOverride adds custom transliteration overwrites for specific language. +func (lo *LanguageOverwrites) AddLanguageOverride(langcode string, override map[rune]string) { + lo.Overwrites[langcode] = override } -// initOverrides adds some general language specific overrides. -func initOverrides() map[string]map[rune]string { +// initOverwrites adds some general language specific overwrites. +func initOverwrites() map[string]map[rune]string { // Language codes in ISO 639-1 format. return map[string]map[rune]string{ "de": DE, diff --git a/transliterator.go b/transliterator.go index 6e84f13..1905488 100644 --- a/transliterator.go +++ b/transliterator.go @@ -10,20 +10,20 @@ import ( // Transliterator structure. type Transliterator struct { - LanguageOverrides *languages.LanguageOverrides - Data map[rune][]string + LanguageOverwrites *languages.LanguageOverwrites + Data map[rune][]string } // NewTransliterator creates Transliterator object. -func NewTransliterator(customLanguageOverrides *map[string]map[rune]string) *Transliterator { - languageOverrides := languages.NewLanguageOverrides() - if customLanguageOverrides != nil { - languageOverrides.AddLanguageOverrides(customLanguageOverrides) +func NewTransliterator(customLanguageOverwrites *map[string]map[rune]string) *Transliterator { + languageOverwrites := languages.NewLanguageOverwrites() + if customLanguageOverwrites != nil { + languageOverwrites.AddLanguageOverwrites(customLanguageOverwrites) } return &Transliterator{ - LanguageOverrides: languageOverrides, - Data: data.NewTransliterationData().Data, + LanguageOverwrites: languageOverwrites, + Data: data.NewTransliterationData().Data, } } @@ -33,8 +33,8 @@ func (t *Transliterator) Transliterate(text, langcode string) string { var replacement strings.Builder runes := []rune(text) for _, rune := range runes { - if overrides, ok := t.LanguageOverrides.Overrides[langcode]; ok { - if val, ok := overrides[rune]; ok { + if overwrites, ok := t.LanguageOverwrites.Overwrites[langcode]; ok { + if val, ok := overwrites[rune]; ok { replacement.WriteString(val) continue }