Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

override -> overwrite #2

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
30 changes: 15 additions & 15 deletions languages/languages.go
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
20 changes: 10 additions & 10 deletions transliterator.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
}

Expand All @@ -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
}
Expand Down