Add translation code to handlers, fix wrong key in .json translations

router/searchHandler.go

@@ -3,6 +3,7 @@ package router
 import (
 	"github.com/ewhal/nyaa/model"
 	"github.com/ewhal/nyaa/util/search"
+	"github.com/ewhal/nyaa/util/languages"
 	"github.com/gorilla/mux"
 	"html"
 	"net/http"
@@ -39,6 +40,7 @@ func SearchHandler(w http.ResponseWriter, r *http.Request) {
 	}
 	htv := HomeTemplateVariables{b, searchForm, navigationTorrents, GetUser(r), r.URL, mux.CurrentRoute(r)}
 
+	languages.SetTranslationFromRequest(searchTemplate, r, "en-us")
 	err := searchTemplate.ExecuteTemplate(w, "index.html", htv)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)

router/uploadHandler.go

@@ -10,6 +10,7 @@ import (
 	"github.com/ewhal/nyaa/db"
 	"github.com/ewhal/nyaa/model"
 	"github.com/ewhal/nyaa/service/captcha"
+	"github.com/ewhal/nyaa/util/languages"
 	"github.com/gorilla/mux"
 )
 
@@ -46,6 +47,7 @@ func UploadHandler(w http.ResponseWriter, r *http.Request) {
 	} else if r.Method == "GET" {
 		uploadForm.CaptchaID = captcha.GetID()
 		htv := UploadTemplateVariables{uploadForm, NewSearchForm(), Navigation{}, GetUser(r), r.URL, mux.CurrentRoute(r)}
+		languages.SetTranslationFromRequest(uploadTemplate, r, "en-us")
 		err = uploadTemplate.ExecuteTemplate(w, "index.html", htv)
 	} else {
 		w.WriteHeader(http.StatusMethodNotAllowed)

router/viewTorrentHandler.go

@@ -8,6 +8,7 @@ import (
 	"github.com/ewhal/nyaa/model"
 	"github.com/ewhal/nyaa/service/captcha"
 	"github.com/ewhal/nyaa/service/torrent"
+	"github.com/ewhal/nyaa/util/languages"
 	"github.com/ewhal/nyaa/util/log"
 	"github.com/gorilla/mux"
 )
@@ -24,6 +25,7 @@ func ViewHandler(w http.ResponseWriter, r *http.Request) {
 	b := torrent.ToJson()
 	htv := ViewTemplateVariables{b, captcha.Captcha{CaptchaID: captcha.GetID()}, NewSearchForm(), Navigation{}, GetUser(r), r.URL, mux.CurrentRoute(r)}
 
+	languages.SetTranslationFromRequest(viewTemplate, r, "en-us")
 	err = viewTemplate.ExecuteTemplate(w, "index.html", htv)
 	if err != nil {
 		log.Errorf("ViewHandler(): %s", err)

service/user/locale/en-us.all.json

@@ -349,146 +349,146 @@
   },
   {
     "id": "anime_non_english_translated",
-    "translated": "Anime - Non-English-translated"
+    "translation": "Anime - Non-English-translated"
   },
   {
     "id": "anime_raw",
-    "translated": "Anime - Raw"
+    "translation": "Anime - Raw"
   },
   {
     "id": "audio",
-    "translated": "Audio"
+    "translation": "Audio"
   },
   {
     "id": "audio_lossless",
-    "translated": "Audio - Lossless"
+    "translation": "Audio - Lossless"
   },
   {
     "id": "audio_lossy",
-    "translated": "Audio - Lossy"
+    "translation": "Audio - Lossy"
   },
   {
     "id": "literature",
-    "translated": "Literature"
+    "translation": "Literature"
   },
   {
     "id": "literature_english_translated",
-    "translated": "Literature - English-translated"
+    "translation": "Literature - English-translated"
   },
   {
     "id": "literature_raw",
-    "translated": "Literature - Raw"
+    "translation": "Literature - Raw"
   },
   {
     "id": "literature_non_english_translated",
-    "translated": "Literature - Non-English-translated"
+    "translation": "Literature - Non-English-translated"
   },
   {
     "id": "live_action",
-    "translated": "Live Action"
+    "translation": "Live Action"
   },
   {
     "id": "live_action_english_translated",
-    "translated": "Live Action - English-translated"
+    "translation": "Live Action - English-translated"
   },
   {
     "id": "live_action_idol_pv",
-    "translated": "Live Action - Idol/Promotional Video"
+    "translation": "Live Action - Idol/Promotional Video"
   },
   {
     "id": "live_action_non_english_translated",
-    "translated": "Live Action - Non-English-translated"
+    "translation": "Live Action - Non-English-translated"
   },
   {
     "id": "live_action_raw",
-    "translated": "Live Action - Raw"
+    "translation": "Live Action - Raw"
   },
   {
     "id": "pictures",
-    "translated": "Pictures"
+    "translation": "Pictures"
   },
   {
     "id": "pictures_graphics",
-    "translated": "Pictures - Graphics"
+    "translation": "Pictures - Graphics"
   },
   {
     "id": "pictures_photos",
-    "translated": "Pictures - Photos"
+    "translation": "Pictures - Photos"
   },
   {
     "id": "software",
-    "translated": "Software"
+    "translation": "Software"
   },
   {
     "id": "software_applications",
-    "translated": "Software - Applications"
+    "translation": "Software - Applications"
   },
   {
     "id": "software_games",
-    "translated": "Software - Games"
+    "translation": "Software - Games"
   },
   {
     "id": "torrent_description",
-    "translated": "Torrent Description"
+    "translation": "Torrent Description"
   },
   {
     "id": "limited_html_set_is_allowed_use",
-    "translated": "A limited set of HTML is allowed in the description, make sure to use"
+    "translation": "A limited set of HTML is allowed in the description, make sure to use"
   },
   {
     "id": "show_all",
-    "translated": "Show all"
+    "translation": "Show all"
   },
   {
     "id": "filter_remakes",
-    "translated": "Filter Remakes"
+    "translation": "Filter Remakes"
   },
   {
     "id": "trusted",
-    "translated": "Trusted"
+    "translation": "Trusted"
   },
   {
     "id": "id",
-    "translated": "ID"
+    "translation": "ID"
   },
   {
     "id": "downloads",
-    "translated": "Downloads"
+    "translation": "Downloads"
   },
   {
     "id": "descending",
-    "translated": "Descending"
+    "translation": "Descending"
   },
   {
     "id": "ascending",
-    "translated": "Ascending"
+    "translation": "Ascending"
   },
   {
     "id": "search",
-    "translated": "Search"
+    "translation": "Search"
   },
   {
     "id": "hash",
-    "translated": "Hash"
+    "translation": "Hash"
   },
   {
     "id": "description",
-    "translated": "Description"
+    "translation": "Description"
   },
   {
     "id": "comments",
-    "translated": "Comments"
+    "translation": "Comments"
   },
   {
     "id": "submit_a_comment_as_username",
-    "translated": "Submit a comment as %s"
+    "translation": "Submit a comment as %s"
   },
   {
     "id": "submit_a_comment_as_anonymous",
-    "translated": "Submit a comment as Anonymous"
+    "translation": "Submit a comment as Anonymous"
   },
   {
     "id": "submit",
-    "translated": "Submit"
+    "translation": "Submit"
   }
 ]