Merge branch 'pr/76' into beta

This commit is contained in:
marmei
2020-01-04 17:01:32 +01:00
3 changed files with 4 additions and 2 deletions

View File

@@ -24,7 +24,7 @@
<div id="content"> <div id="content">
<form id="authentication" action="/web/" method="post"> <form id="authentication" action="" method="post">
<h5>{{.account.username.title}}:</h5> <h5>{{.account.username.title}}:</h5>
<input id="username" type="text" name="username" placeholder="Username" value=""> <input id="username" type="text" name="username" placeholder="Username" value="">

View File

@@ -24,7 +24,7 @@
<div id="content"> <div id="content">
<form id="authentication" action="/web/" method="post"> <form id="authentication" action="" method="post">
<h5>{{.login.username.title}}:</h5> <h5>{{.login.username.title}}:</h5>
<input id="username" type="text" name="username" placeholder="Username" value=""> <input id="username" type="text" name="username" placeholder="Username" value="">

View File

@@ -591,6 +591,8 @@ func Web(w http.ResponseWriter, r *http.Request) {
var language LanguageUI var language LanguageUI
setGlobalDomain(r.Host)
if System.Dev == true { if System.Dev == true {
lang, err = loadJSONFileToMap(fmt.Sprintf("html/lang/%s.json", Settings.Language)) lang, err = loadJSONFileToMap(fmt.Sprintf("html/lang/%s.json", Settings.Language))