Merge pull request #602 from MMP0/patch-19

Small changes and Fix errors

model/dumps.go

@@ -4,7 +4,7 @@ import (
 	"time"
 	"html/template"
 
-	"github.com/ewhal/nyaa/util"
+	"github.com/NyaaPantsu/nyaa/util"
 )
 
 type DatabaseDump struct {

public/js/main.js

@@ -18,13 +18,14 @@ function toggleLayer(elem) {
 
 // Date formatting
 var lang = $("html").attr("lang");
-var shortOpt = { year: "numeric", month: "short", day: "numeric" };
+var ymdOpt = { year: "numeric", month: "short", day: "numeric" };
+var hmOpt  = { hour: "numeric", minute: "numeric" };
 
 var list = document.getElementsByClassName("date-short");
 for(var i in list) {
 	var e = list[i];
 	e.title = e.innerText;
-	e.innerText = new Date(e.innerText).toLocaleString(lang, shortOpt);
+	e.innerText = new Date(e.innerText).toLocaleString(lang, ymdOpt);
 }
 
 var list = document.getElementsByClassName("date-full");
@@ -33,11 +34,10 @@ for(var i in list) {
 	e.title = e.innerText;
 	e.innerText = new Date(e.innerText).toLocaleString(lang);
 }
-
 $(".date-comments").each(function(index, el) {
 	$(this).attr("title", el.innerText);
-	$(this).text(new Date($(this).attr("title")).toLocaleDateString(lang, { year: "numeric", month: "short", day: "numeric"}) + " ");
-	$(this).append($('<span class="hidden-xs"></span>').text(new Date($(this).attr("title")).toLocaleTimeString(lang, { hour:"numeric", minute:"numeric" })))
+	$(this).text(new Date($(this).attr("title")).toLocaleDateString(lang, ymdOpt) + " ");
+	$(this).append($('<span class="hidden-xs"></span>').text(new Date($(this).attr("title")).toLocaleTimeString(lang, hmOpt)))
 });
 /*Fixed-Navbar offset fix*/
 window.onload = function() {

router/databaseDumpHandler.go

@@ -7,10 +7,10 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/ewhal/nyaa/model"
-	"github.com/ewhal/nyaa/util/languages"
-	"github.com/ewhal/nyaa/util/log"
-	"github.com/ewhal/nyaa/util/metainfo"
+	"github.com/NyaaPantsu/nyaa/model"
+	"github.com/NyaaPantsu/nyaa/util/languages"
+	"github.com/NyaaPantsu/nyaa/util/log"
+	"github.com/NyaaPantsu/nyaa/util/metainfo"
 	"github.com/gorilla/mux"
 )
 
@@ -49,7 +49,7 @@ func DatabaseDumpHandler(w http.ResponseWriter, r *http.Request) {
 
 	// TODO Remove ?
 	navigationTorrents := Navigation{0, 0, 0, "search_page"}
-	languages.SetTranslationFromRequest(databaseDumpTemplate, r, "en-us")
+	languages.SetTranslationFromRequest(databaseDumpTemplate, r)
 	dtv := DatabaseDumpTemplateVariables{dumpsJson, "/gpg/gpg.pub", NewSearchForm(), navigationTorrents, GetUser(r), r.URL, mux.CurrentRoute(r)}
 	err = databaseDumpTemplate.ExecuteTemplate(w, "index.html", dtv)
 	if err != nil {