@@ -270,8 +270,7 @@ func (loader *TemplateLoader) Refresh() *Error {
270
270
271
271
var fileStr string
272
272
273
- // addTemplate allows the same template to be added multiple
274
- // times with different template names.
273
+ // addTemplate loads a template file into the Go template loader so it can be rendered later
275
274
addTemplate := func (templateName string ) (err error ) {
276
275
TRACE .Println ("adding template: " , templateName )
277
276
// Convert template names to use forward slashes, even on Windows.
@@ -339,11 +338,7 @@ func (loader *TemplateLoader) Refresh() *Error {
339
338
340
339
templateName := path [len (fullSrcDir )+ 1 :]
341
340
342
- // Lower case the file name for case-insensitive matching
343
- lowerCaseTemplateName := strings .ToLower (templateName )
344
-
345
341
err = addTemplate (templateName )
346
- err = addTemplate (lowerCaseTemplateName )
347
342
348
343
// Store / report the first error encountered.
349
344
if err != nil && loader .compileError == nil {
@@ -411,8 +406,13 @@ func parseTemplateError(err error) (templateName string, line int, description s
411
406
// An Error is returned if there was any problem with any of the templates. (In
412
407
// this case, if a template is returned, it may still be usable.)
413
408
func (loader * TemplateLoader ) Template (name string ) (Template , error ) {
414
- // Lower case the file name to support case-insensitive matching
409
+ // Case-insensitive matching of template file name
415
410
name = strings .ToLower (name )
411
+ for k := range loader .templatePaths {
412
+ if name == strings .ToLower (k ) {
413
+ name = k
414
+ }
415
+ }
416
416
// Look up and return the template.
417
417
tmpl := loader .templateSet .Lookup (name )
418
418
0 commit comments