commands, hugolib, source, target, tpl: Get rid of some fmt statements

This commit is contained in:
bogem 2016-11-18 22:38:41 +01:00 committed by Bjørn Erik Pedersen
parent 120f6b0cf2
commit 1f130fd692
4 changed files with 6 additions and 12 deletions

View file

@ -97,7 +97,7 @@ func convertContents(mark rune) (err error) {
} }
if site.Source == nil { if site.Source == nil {
panic(fmt.Sprintf("site.Source not set")) panic("site.Source not set")
} }
if len(site.Source.Files()) < 1 { if len(site.Source.Files()) < 1 {
return fmt.Errorf("No source files found") return fmt.Errorf("No source files found")

View file

@ -13,10 +13,7 @@
package source package source
import ( import "bytes"
"bytes"
"fmt"
)
type ByteSource struct { type ByteSource struct {
Name string Name string
@ -24,7 +21,7 @@ type ByteSource struct {
} }
func (b *ByteSource) String() string { func (b *ByteSource) String() string {
return fmt.Sprintf("%s %s", b.Name, string(b.Content)) return b.Name + " " + string(b.Content)
} }
type InMemorySource struct { type InMemorySource struct {

View file

@ -14,7 +14,6 @@
package target package target
import ( import (
"fmt"
"html/template" "html/template"
"io" "io"
"path/filepath" "path/filepath"
@ -66,10 +65,10 @@ func (pp *PagePub) TranslateRelative(src string) (dest string, err error) {
name := filename(file) name := filename(file)
if pp.UglyURLs || file == "index.html" || (isRoot && file == "404.html") { if pp.UglyURLs || file == "index.html" || (isRoot && file == "404.html") {
return filepath.Join(dir, fmt.Sprintf("%s%s", name, ext)), nil return filepath.Join(dir, name+ext), nil
} }
return filepath.Join(dir, name, fmt.Sprintf("index%s", ext)), nil return filepath.Join(dir, name, "index"+ext), nil
} }
func (pp *PagePub) extension(ext string) string { func (pp *PagePub) extension(ext string) string {

View file

@ -14,8 +14,6 @@
package tpl package tpl
import ( import (
"fmt"
"github.com/nicksnyder/go-i18n/i18n/bundle" "github.com/nicksnyder/go-i18n/i18n/bundle"
"github.com/spf13/hugo/helpers" "github.com/spf13/hugo/helpers"
jww "github.com/spf13/jwalterweatherman" jww "github.com/spf13/jwalterweatherman"
@ -80,7 +78,7 @@ func SetI18nTfuncs(bndl *bundle.Bundle) {
i18nWarningLogger.Printf("i18n|MISSING_TRANSLATION|%s|%s", currentLang, translationID) i18nWarningLogger.Printf("i18n|MISSING_TRANSLATION|%s|%s", currentLang, translationID)
} }
if enableMissingTranslationPlaceholders { if enableMissingTranslationPlaceholders {
return fmt.Sprintf("[i18n] %s", translationID) return "[i18n] " + translationID
} }
if defaultT != nil { if defaultT != nil {
if translated := defaultT(translationID, args...); translated != translationID { if translated := defaultT(translationID, args...); translated != translationID {