Merge branch 'master' of https://github.com/alenbhclynpblc/gophish

config.json

@@ -1,10 +1,10 @@
 {
 	"admin_server" : {
-		"listen_url" : "0.0.0.0:3333",
+		"listen_url" : "127.0.0.1:3333",
 		"use_tls" : false,
 		"cert_path" : "gophish_admin.crt",
 		"key_path" : "gophish_admin.key",
-		"languge": "tr-TR"
+		"languge": "en-US"
 	},
 	"phish_server" : {
 		"listen_url" : "0.0.0.0:80",

controllers/route.go

@@ -313,7 +313,7 @@ func Register(w http.ResponseWriter, r *http.Request) {
 		if succ {
 			session.AddFlash(models.Flash{
 				Type:    "success",
-				Message: "Registration successful!.",
+				Message: util.T("Registration successful!."),
 			})
 			session.Save(r, w)
 			http.Redirect(w, r, "/login", 302)
@@ -431,7 +431,7 @@ func Settings(w http.ResponseWriter, r *http.Request) {
 		err := auth.ChangePassword(r)
 		msg := models.Response{Success: true, Message: util.T("Settings Updated Successfully")}
 		if err == auth.ErrInvalidPassword {
-			msg.Message = "Invalid Password"
+			msg.Message = util.T("Invalid Password")
 			msg.Success = false
 			JSONResponse(w, msg, http.StatusBadRequest)
 			return

gophish.go

@@ -40,7 +40,6 @@ import (
 	"github.com/gophish/gophish/models"
 	"./util"
 	"github.com/gorilla/handlers"
-//        "github.com/nicksnyder/go-i18n/i18n"
 )
 
 var Logger = log.New(os.Stdout, " ", log.Ldate|log.Ltime|log.Lshortfile)

translations/tr-tr.all.json

@@ -1058,5 +1058,13 @@
 	{
 		"id": "Template not found",
 		"translation": "Tema bulunamadı"
+	},
+	{
+		"id": "Invalid Password",
+		"translation": "Hatalı Şifre"
+	},
+	{
+		"id": "Registration successful!.",
+		"translation": "Kayıt başarıyla tamamlandı!"
 	}
 ]