From 4a59e8990c509e481df9fca44f0a9a25d5ad6ebc Mon Sep 17 00:00:00 2001 From: l29utp0 Date: Sat, 8 Apr 2023 14:08:13 +0000 Subject: [PATCH 1/4] postform translation New Thread instead of New Reply --- views/includes/postform.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/includes/postform.pug b/views/includes/postform.pug index 1136344f..3923b51f 100644 --- a/views/includes/postform.pug +++ b/views/includes/postform.pug @@ -89,4 +89,4 @@ section.form-wrapper.flex-center else include ./captchaexpand.pug input#submitpost(type='submit', value=(isThread ? __('New Reply') : __('New Thread'))) - a.collapse.no-decoration.post-button(href='#postform') [#{isThread ? __('New Reply') : __('New Reply')}] + a.collapse.no-decoration.post-button(href='#postform') [#{isThread ? __('New Reply') : __('New Thread')}] From b118ee9b244d02c4777b90defb6f74787cc4e043 Mon Sep 17 00:00:00 2001 From: Thomas Lynch Date: Sun, 9 Apr 2023 19:02:13 +1000 Subject: [PATCH 2/4] "Fix" last edited by issue with translation --- locales/en-GB.json | 1 + locales/pt-PT.json | 1 + locales/ru-RU.json | 1 + views/mixins/post.pug | 5 +++-- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/locales/en-GB.json b/locales/en-GB.json index ecb92453..df29e3d6 100644 --- a/locales/en-GB.json +++ b/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", diff --git a/locales/pt-PT.json b/locales/pt-PT.json index d8487987..6785c816 100644 --- a/locales/pt-PT.json +++ b/locales/pt-PT.json @@ -761,6 +761,7 @@ "Language": "Língua", "Last Active": "Ultima vez ativo", "Last edited": "Ultima vez editado", + "Last edited | by %s": "Ultima vez editado | por %s", "Latest Activity": "Última Atividade", "Latest News": "Últimas Notícias", "Layer": "Camada", diff --git a/locales/ru-RU.json b/locales/ru-RU.json index 85e77cbc..8211eea5 100644 --- a/locales/ru-RU.json +++ b/locales/ru-RU.json @@ -761,6 +761,7 @@ "Language": "Язык", "Last Active": "Последнее активное", "Last edited": "Последнее отредактированное", + "Last edited | by %s": "Последний раз редактировалось | %s", "Latest Activity": "Последнее действие", "Latest News": "Последние новости", "Layer": "Слой", diff --git a/views/mixins/post.pug b/views/mixins/post.pug index d4f50efb..1d8769bd 100644 --- a/views/mixins/post.pug +++ b/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')} From a2c4d21c11c479b4c94ca4196ece53f5f5191d75 Mon Sep 17 00:00:00 2001 From: Thomas Lynch Date: Sun, 9 Apr 2023 19:16:51 +1000 Subject: [PATCH 3/4] update package*.json and CHANGELOG for v1.0.2 --- CHANGELOG.md | 3 +++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 51ee3c51..98011b68 100644 --- a/CHANGELOG.md +++ b/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. diff --git a/package-lock.json b/package-lock.json index 4f0cd61f..7164ee1f 100644 --- a/package-lock.json +++ b/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", diff --git a/package.json b/package.json index 52f16da5..f2dcbf2c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jschan", - "version": "1.0.1", + "version": "1.0.2", "migrateVersion": "1.0.0", "description": "", "main": "server.js", From dcffaadc3bde415c969d3d3727b25f181488b7cd Mon Sep 17 00:00:00 2001 From: l29utp0 Date: Sun, 9 Apr 2023 12:51:43 +0000 Subject: [PATCH 4/4] Update pt-PT.json --- locales/pt-PT.json | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/locales/pt-PT.json b/locales/pt-PT.json index d8487987..53b582bb 100644 --- a/locales/pt-PT.json +++ b/locales/pt-PT.json @@ -759,8 +759,9 @@ "Issuer": "Autor", "Italic": "Itálico", "Language": "Língua", - "Last Active": "Ultima vez ativo", - "Last edited": "Ultima vez editado", + "Last Active": "Última vez ativo", + "Last edited": "Última vez editado", + "Last edited | by %s": "Última vez editado | por %s", "Latest Activity": "Última Atividade", "Latest News": "Últimas Notícias", "Layer": "Camada", @@ -876,10 +877,10 @@ "Move up": "Mover para cima", "Moved": "Movida", "Moved posts": "Publicações movidas", - "Multi input anon limit must be a number": "Limite de ações multiplas de utilizador tem que ser um número", - "Multi Input Form Anon": "Limite de Ações Multiplas de Utilizador", - "Multi Input Form Staff": "Limite de Ações Multiplas de Staff", - "Multi input staff limit must be a number": "Limite de ações multiplas de staff tem que ser um número", + "Multi input anon limit must be a number": "Limite de ações múltiplas de utilizador tem que ser um número", + "Multi Input Form Anon": "Limite de Ações Múltiplas de Utilizador", + "Multi Input Form Staff": "Limite de Ações Múltiplas de Staff", + "Multi input staff limit must be a number": "Limite de ações múltiplas de staff tem que ser um número", "Must check parent post if checking reports for report action": "Tens que selecionar publicação parente se selecionares denúncias para ação", "Must input destinaton thread number or board to move posts": "Tens que escrever o número do fio ou tábua para mover", "Must not select >%s posts per request": "Não podes selecionar >%s publicações por pedido",