diff --git a/docs/updating.md b/docs/updating.md index a6d3f0e1..c2e61bbe 100644 --- a/docs/updating.md +++ b/docs/updating.md @@ -62,6 +62,6 @@ Once you've done that, you just need to run `./Patcher` to apply the latest patc Dependencies are third party scripts and programs which Gosora relies on to function. The instructions here do not cover updating MySQL / MariaDB or Go. -You can update themn by running `update-deps.bat` on Windows or `./update-deps-linux` on Linux. +You can update them by running the `go get` command. You'll need to restart the server after you change a template or update Gosora, e.g. with `run.bat` or killing the process and running `./run-linux` or via `./pre-run-linux` followed by `service gosora restart`. diff --git a/langs/english.json b/langs/english.json index 940355bc..886ebf2e 100644 --- a/langs/english.json +++ b/langs/english.json @@ -599,6 +599,13 @@ "topic.reply_add_poll_button":"Add Poll", "topic.reply_add_file_button":"Add File", + "topic.action_topic_lock":"This topic was locked by %s", + "topic.action_topic_unlock":"This topic was reopened by %s", + "topic.action_topic_stick":"This topic was pinned by %s", + "topic.action_topic_unstick":"This topic was unpinned by %s", + "topic.action_topic_move":"This topic was moved by %s", + "topic.action_topic_default":"%s has happened", + "topic.your_information":"Your information", "paginator_less_than":"<", diff --git a/routes/topic.go b/routes/topic.go index aa17e2ce..b17ec148 100644 --- a/routes/topic.go +++ b/routes/topic.go @@ -162,21 +162,22 @@ func ViewTopic(w http.ResponseWriter, r *http.Request, user common.User, urlBit if replyItem.ActionType != "" { switch replyItem.ActionType { case "lock": - replyItem.ActionType = "This topic was locked by " + replyItem.CreatedByName + "" + replyItem.ActionType = common.GetTmplPhrasef("topic.action_topic_lock",replyItem.UserLink,replyItem.CreatedByName) replyItem.ActionIcon = "🔒︎" case "unlock": - replyItem.ActionType = "This topic was reopened by " + replyItem.CreatedByName + "" + replyItem.ActionType = common.GetTmplPhrasef("topic.action_topic_unlock",replyItem.UserLink,replyItem.CreatedByName) replyItem.ActionIcon = "🔓︎" case "stick": - replyItem.ActionType = "This topic was pinned by " + replyItem.CreatedByName + "" + replyItem.ActionType = common.GetTmplPhrasef("topic.action_topic_stick",replyItem.UserLink,replyItem.CreatedByName) replyItem.ActionIcon = "📌︎" case "unstick": - replyItem.ActionType = "This topic was unpinned by " + replyItem.CreatedByName + "" + replyItem.ActionType = common.GetTmplPhrasef("topic.action_topic_unstick",replyItem.UserLink,replyItem.CreatedByName) replyItem.ActionIcon = "📌︎" case "move": - replyItem.ActionType = "This topic was moved by " + replyItem.CreatedByName + "" + replyItem.ActionType = common.GetTmplPhrasef("topic.action_topic_move",replyItem.UserLink,replyItem.CreatedByName) + // TODO: Only fire this off if a corresponding phrase for the ActionType doesn't exist? Or maybe have some sort of action registry? default: - replyItem.ActionType = replyItem.ActionType + " has happened" + replyItem.ActionType = common.GetTmplPhrasef("topic.action_topic_default",replyItem.ActionType) replyItem.ActionIcon = "" } }