From 249a631c2f166774c0be74dd258c3bacaea66b05 Mon Sep 17 00:00:00 2001 From: Simon Lehn <48837958+srlehn@users.noreply.github.com> Date: Mon, 20 Apr 2020 14:32:05 +0200 Subject: [PATCH 1/6] de: add eszett --- languages/de.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/languages/de.go b/languages/de.go index 40ba85a..818c46e 100644 --- a/languages/de.go +++ b/languages/de.go @@ -5,7 +5,9 @@ var DE = map[rune]string{ 0xC4: "Ae", 0xD6: "Oe", 0xDC: "Ue", + 0xDF: "ss", 0xE4: "ae", 0xF6: "oe", 0xFC: "ue", + 0x1E9E: "SS", } From 3deec07931e4e7a6140f36964456b845d50c85b8 Mon Sep 17 00:00:00 2001 From: Simon Lehn <48837958+srlehn@users.noreply.github.com> Date: Mon, 20 Apr 2020 14:42:44 +0200 Subject: [PATCH 2/6] override -> overwrite - languages.go --- languages/languages.go | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) 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, From 52f7d81dd56d96d3cc67d0b28051cf788553b72a Mon Sep 17 00:00:00 2001 From: Simon Lehn <48837958+srlehn@users.noreply.github.com> Date: Mon, 20 Apr 2020 14:44:57 +0200 Subject: [PATCH 3/6] Overrites -> Overwrites - README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 From 50f7129967f5b0919ed93bc77cb9d38acf9423d4 Mon Sep 17 00:00:00 2001 From: Simon Lehn <48837958+srlehn@users.noreply.github.com> Date: Mon, 20 Apr 2020 14:47:39 +0200 Subject: [PATCH 4/6] overrides -> overwrites - transliterator.go --- transliterator.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/transliterator.go b/transliterator.go index 6e84f13..d7eea55 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 custoLanguageOverwrites != 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.Overrides[langcode]; ok { + if val, ok := overwrites[rune]; ok { replacement.WriteString(val) continue } From 8516da9be01f16f70d7b63ad8687a141bb944ec2 Mon Sep 17 00:00:00 2001 From: Simon Lehn <48837958+srlehn@users.noreply.github.com> Date: Mon, 20 Apr 2020 14:53:21 +0200 Subject: [PATCH 5/6] undo unrelated commit --- languages/de.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/languages/de.go b/languages/de.go index 818c46e..40ba85a 100644 --- a/languages/de.go +++ b/languages/de.go @@ -5,9 +5,7 @@ var DE = map[rune]string{ 0xC4: "Ae", 0xD6: "Oe", 0xDC: "Ue", - 0xDF: "ss", 0xE4: "ae", 0xF6: "oe", 0xFC: "ue", - 0x1E9E: "SS", } From ae85e158e0372c9d8d185ad956aa555ec576d337 Mon Sep 17 00:00:00 2001 From: Simon Lehn <48837958+srlehn@users.noreply.github.com> Date: Mon, 20 Apr 2020 15:45:08 +0200 Subject: [PATCH 6/6] fix remaining "Override" + fix variable name --- transliterator.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/transliterator.go b/transliterator.go index d7eea55..1905488 100644 --- a/transliterator.go +++ b/transliterator.go @@ -17,7 +17,7 @@ type Transliterator struct { // NewTransliterator creates Transliterator object. func NewTransliterator(customLanguageOverwrites *map[string]map[rune]string) *Transliterator { languageOverwrites := languages.NewLanguageOverwrites() - if custoLanguageOverwrites != nil { + if customLanguageOverwrites != nil { languageOverwrites.AddLanguageOverwrites(customLanguageOverwrites) } @@ -33,7 +33,7 @@ func (t *Transliterator) Transliterate(text, langcode string) string { var replacement strings.Builder runes := []rune(text) for _, rune := range runes { - if overwrites, ok := t.LanguageOverwrites.Overrides[langcode]; ok { + if overwrites, ok := t.LanguageOverwrites.Overwrites[langcode]; ok { if val, ok := overwrites[rune]; ok { replacement.WriteString(val) continue