From 3c52f5c10bbf403c327ab6453dfc38d67a85c9f9 Mon Sep 17 00:00:00 2001 From: Leonel Quinteros Date: Tue, 29 May 2018 12:46:11 -0300 Subject: [PATCH] Make golint happy. Fixes #21 --- mo.go | 22 +++++++++++++--------- po.go | 3 +-- translation.go | 2 +- translator.go | 1 + 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/mo.go b/mo.go index b9a5b72..f871f8a 100644 --- a/mo.go +++ b/mo.go @@ -20,11 +20,15 @@ import ( ) const ( - MoMagicLittleEndian = 0x950412de // MoMagicLittleEndian encoding - MoMagicBigEndian = 0xde120495 // MoMagicBigEndian encoding + // MoMagicLittleEndian encoding + MoMagicLittleEndian = 0x950412de + // MoMagicBigEndian encoding + MoMagicBigEndian = 0xde120495 - EotSeparator = "\x04" // msgctxt and msgid separator - NulSeparator = "\x00" // msgid and msgstr separator + // EotSeparator msgctxt and msgid separator + EotSeparator = "\x04" + // NulSeparator msgid and msgstr separator + NulSeparator = "\x00" ) /* @@ -195,8 +199,8 @@ func (mo *Mo) Parse(buf []byte) { return // return fmt.Errorf("gettext: %v", err) } - msgIdData := make([]byte, msgIDLen[i]) - if _, err := r.Read(msgIdData); err != nil { + msgIDData := make([]byte, msgIDLen[i]) + if _, err := r.Read(msgIDData); err != nil { return // return fmt.Errorf("gettext: %v", err) } @@ -211,10 +215,10 @@ func (mo *Mo) Parse(buf []byte) { // return fmt.Errorf("gettext: %v", err) } - if len(msgIdData) == 0 { - mo.addTranslation(msgIdData, msgStrData) + if len(msgIDData) == 0 { + mo.addTranslation(msgIDData, msgStrData) } else { - mo.addTranslation(msgIdData, msgStrData) + mo.addTranslation(msgIDData, msgStrData) } } diff --git a/po.go b/po.go index 12d9892..53caa37 100644 --- a/po.go +++ b/po.go @@ -366,9 +366,8 @@ func (po *Po) pluralForm(n int) int { /* Use the Germanic plural rule. */ if n == 1 { return 0 - } else { - return 1 } + return 1 } return po.pluralforms.Eval(uint32(n)) } diff --git a/translation.go b/translation.go index 99ea60c..bc069d4 100644 --- a/translation.go +++ b/translation.go @@ -33,7 +33,7 @@ func (t *Translation) Get() string { return t.ID } -// Get returns the string of the plural translation +// GetN returns the string of the plural translation func (t *Translation) GetN(n int) string { // Look for Translation index if _, ok := t.Trs[n]; ok { diff --git a/translator.go b/translator.go index 9b2924b..58175b1 100644 --- a/translator.go +++ b/translator.go @@ -5,6 +5,7 @@ package gotext +// Translator interface is used by Locale and Po objects type Translator interface { ParseFile(f string) Parse(buf []byte)