Fix edge case on Localized Views

* When the default language is a higher preference user choice, use the non-suff
ixed template version

middleware/i18n/i18n.go

@@ -97,7 +97,7 @@ func (t *Translator) Middleware() buffalo.MiddlewareFunc {
 			if langs := c.Value("languages"); langs == nil {
 				c.Set("languages", t.LanguageFinder(t, c))
 				if t.LocalizedViews {
-					c.Set("templateSuffixes", c.Value("languages"))
+					c.Set("templateSuffixes", normalizeSuffixes(t.DefaultLanguage, c.Value("languages").([]string)))
 				}
 			}
 
@@ -187,3 +187,17 @@ func parseAcceptLanguage(acptLang string) []string {
 	}
 	return lqs
 }
+
+func normalizeSuffixes(defaultLang string, langSuffixes []string) []string {
+	var nSuffixes []string
+
+	for _, lang := range langSuffixes {
+		suffix := strings.ToLower(lang)
+		nSuffixes = append(nSuffixes, suffix)
+		if suffix == defaultLang {
+			// Add empty suffix for the default language
+			nSuffixes = append(nSuffixes, "")
+		}
+	}
+	return nSuffixes
+}

render/template.go

@@ -67,7 +67,12 @@ func (s templateRenderer) exec(name string, data Data) (template.HTML, error) {
 		rawName := strings.TrimSuffix(name, ext)
 
 		for _, suffix := range suffixes {
-			candidateName := rawName + "_" + suffix + ext
+			var candidateName string
+			if suffix == "" {
+				candidateName = name
+			} else {
+				candidateName = rawName + "_" + suffix + ext
+			}
 			if s.TemplatesBox.Has(candidateName) {
 				// Replace name with the existing suffixed version
 				name = candidateName