Merge pull request #1 from cyx/optimize-no-substitution-case

Optimize no substitution case
m1 · Apr 11, 2021 · 07d5b91 · 07d5b91
2 parents f004b52 + 40c39e5
commit 07d5b91
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/examples/localizations/localizations.go b/examples/localizations/localizations.go
diff --git a/go.sum b/go.sum
@@ -1,5 +1,6 @@
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo=
 gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/template.go b/template.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"html/template"
+	"text/template"
 )
 
 var packageTemplate = template.Must(template.New("").Parse(`// Code generated by go-localize; DO NOT EDIT.
@@ -13,6 +13,7 @@ package {{ .Package }}
 import (
 	"bytes"
 	"fmt"
+	"strings"
 	"text/template"
 )
 
@@ -25,7 +26,7 @@ var localizations = map[string]string{
 type Replacements map[string]interface{}
 
 type Localizer struct {
-	Locale         string
+	Locale	 string
 	FallbackLocale string
 	Localizations  map[string]string
 }
@@ -60,6 +61,13 @@ func (t Localizer) GetWithLocale(locale, key string, replacements ...*Replacemen
 			return key
 		}
 	}
+
+        // If the str doesn't have any substitutions, no need to
+        // template.Execute.
+	if strings.Index(str, "}}") == -1 {
+                return str
+        }
+
 	return t.replace(str, replacements...)
 }