summaryrefslogtreecommitdiffstats
path: root/utils/html.go
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2017-05-23 11:06:25 -0400
committerGitHub <noreply@github.com>2017-05-23 11:06:25 -0400
commit5c1049054eace710abd3418bbad141fbb7dd5d7f (patch)
tree24d75c14ce2aae2c6f1a8d5bc7392e958e416666 /utils/html.go
parent69f3f2fdce4ae21a037ca61d753279efcc70f0ec (diff)
downloadchat-5c1049054eace710abd3418bbad141fbb7dd5d7f.tar.gz
chat-5c1049054eace710abd3418bbad141fbb7dd5d7f.tar.bz2
chat-5c1049054eace710abd3418bbad141fbb7dd5d7f.zip
PLT-6471 Properly panic when translations can't be loaded (#6414)
* PLT-6471 Properly panic when translations can't be loaded * Print usage messages when errors occur during CLI initialization * Reverted behaviour of FindDir and added second return value to it * Fixed merge conflict
Diffstat (limited to 'utils/html.go')
-rw-r--r--utils/html.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/utils/html.go b/utils/html.go
index c902030d8..e6050f62a 100644
--- a/utils/html.go
+++ b/utils/html.go
@@ -33,7 +33,7 @@ func InitHTMLWithDir(dir string) {
return
}
- templatesDir := FindDir(dir)
+ templatesDir, _ := FindDir(dir)
l4g.Debug(T("api.api.init.parsing_templates.debug"), templatesDir)
var err error
if htmlTemplates, err = template.ParseGlob(templatesDir + "*.html"); err != nil {