Merge branch 'develop' into 'l29utp0-develop-patch-05423'

# Conflicts:
#   locales/pt-PT.json

CHANGELOG.md

@@ -1,3 +1,6 @@
+### 1.0.2
+  - Translation improvements.
+
 ### 1.0.1
   - Translation improvements.
   - Add a link to board in mod view e.g. /test/ on globalmanage recent posts to give some context.

locales/en-GB.json

@@ -761,6 +761,7 @@
 	"Language": "Language",
 	"Last Active": "Last Active",
 	"Last edited": "Last edited",
+	"Last edited | by %s": " Last edited | by %s",
 	"Latest Activity": "Latest Activity",
 	"Latest News": "Latest News",
 	"Layer": "Layer",

locales/ru-RU.json

@@ -761,6 +761,7 @@
 	"Language": "Язык",
 	"Last Active": "Последнее активное",
 	"Last edited": "Последнее отредактированное",
+	"Last edited | by %s": "Последний раз редактировалось | %s",
 	"Latest Activity": "Последнее действие",
 	"Latest News": "Последние новости",
 	"Layer": "Слой",

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "jschan",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "jschan",
-      "version": "1.0.1",
+      "version": "1.0.2",
       "license": "AGPL-3.0-only",
       "dependencies": {
         "@fatchan/express-fileupload": "^1.4.2",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jschan",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "migrateVersion": "1.0.0",
   "description": "",
   "main": "server.js",

views/mixins/post.pug

@@ -155,9 +155,10 @@ mixin post(post, truncate, manage=false, globalmanage=false, ban=false, overboar
 			if post.edited
 				- const postEditDate = new Date(post.edited.date);
 				small.cb.mt-5.ml-5.edited
-					| #{__('Last edited')} 
+					- lastEdited = __('Last edited | by %s', (post.edited.username || __('Hidden User'))).split('|'); //How do I interpolate a whole tag properly?
+					| #{lastEdited[0]}
 					time.reltime(datetime=postEditDate.toISOString()) #{postEditDate.toLocaleString(pageLanguage, { hourCycle:'h23' })}
-					|  by #{post.edited.username || __('Hidden User')}
+					| #{lastEdited[1]}
 			if post.banmessage
 				p.ban
 					span.message #{__('USER WAS BANNED FOR THIS POST')}