Skip to content

Node.js based forum software built for the modern web

fix: client-side re-parsing translate bug, tests fix

Julian Lamd3c2327d31a4
diff --git a/public/src/admin/federation/rules.js b/public/src/admin/federation/rules.js
index 7007b6a50f..307235c766 100644
--- a/public/src/admin/federation/rules.js
+++ b/public/src/admin/federation/rules.js
@@ -30,10 +30,10 @@ function setupRules() {
case 'rules.delete': {
const rid = subselector.closest('tr').getAttribute('data-rid');
del(`/admin/activitypub/rules/${rid}`, {}).then(async (data) => {
- const html = await render('admin/federation/rules', { rules: data }, 'rules');
+ const html = await app.parseAndTranslate('admin/federation/rules', 'rules', { rules: data });
const tbodyEl = document.querySelector('#rules tbody');
if (tbodyEl) {
- tbodyEl.innerHTML = html;
+ $(tbodyEl).html(html);
}
}).catch(error);
}
@@ -76,10 +76,10 @@ function throwModal() {
const payload = Object.fromEntries(new FormData(formEl));
payload.action = parseInt(payload.action, 10);
post('/admin/activitypub/rules', payload).then(async (data) => {
- const html = await render('admin/federation/rules', { rules: data }, 'rules');
+ const html = await app.parseAndTranslate('admin/federation/rules', 'rules', { rules: data });
const tbodyEl = document.querySelector('#rules tbody');
if (tbodyEl) {
- tbodyEl.innerHTML = html;
+ $(tbodyEl).html(html);
}
modal.modal('hide');
}).catch(error);
diff --git a/src/views/admin/federation/rules.tpl b/src/views/admin/federation/rules.tpl
index 95de4544d7..fe4edf7e1f 100644
--- a/src/views/admin/federation/rules.tpl
+++ b/src/views/admin/federation/rules.tpl
@@ -11,13 +11,13 @@
{{{ end }}}
<div id="cutoff" class="mb-4">
- <h5 class="fw-bold tracking-tight settings-header">[[admin/settings/activitypub:rules.cutoff.title]]</h5>
+ <h5 class="fw-bold tracking-tight settings-header">{{tx("admin/settings/activitypub:rules.cutoff.title")}}</h5>
<form>
<div class="mb-3">
- <label class="form-label" for="activitypubRulesCutoffDays">[[admin/settings/activitypub:rules.cutoff.label]]</label>
+ <label class="form-label" for="activitypubRulesCutoffDays">{{tx("admin/settings/activitypub:rules.cutoff.label")}}</label>
<input type="number" id="activitypubRulesCutoffDays" name="activitypubRulesCutoffDays" data-field="activitypubRulesCutoffDays" title="[[admin/settings/activitypub:rules.cutoff.label]]" class="form-control" value="{activitypubRulesCutoffDays}" min="0" />
<div class="form-text">
- [[admin/settings/activitypub:rules.cutoff.help]]
+ {{tx("admin/settings/activitypub:rules.cutoff.help")}}
</div>
</div>
</form>
@@ -42,9 +42,9 @@
<td>{./type}</td>
<td>{./value}</td>
<td>
- {{{ if (./action == "2") }}}[[admin/settings/activitypub:rules.reject]]{{{ else }}}
- {{{ if (./action == "1") }}}[[admin/settings/activitypub:rules.filter]]{{{ else }}}
- [[admin/settings/activitypub:rules.categorize]]
+ {{{ if (./action == "2") }}}{{tx("admin/settings/activitypub:rules.reject")}}{{{ else }}}
+ {{{ if (./action == "1") }}}{{tx("admin/settings/activitypub:rules.filter")}}{{{ else }}}
+ {{tx("admin/settings/activitypub:rules.categorize")}}
{{{ end }}}
{{{ end }}}
</td>
diff --git a/test/activitypub/notes.js b/test/activitypub/notes.js
index 5e5a8e33bf..02ca6288a8 100644
--- a/test/activitypub/notes.js
+++ b/test/activitypub/notes.js
@@ -775,7 +775,7 @@ describe('Notes', () => {
// Create a local target category
({ cid: targetCid } = await categories.create({ name: utils.generateUUID().slice(0, 8) }));
// Add a hashtag-type auto-categorization rule with filter (queue) enabled
- rid = await activitypub.rules.upsert('hashtag', tagName, targetCid, true);
+ rid = await activitypub.rules.upsert('hashtag', tagName, targetCid, 1);
meta.config.postQueue = 1;
});
@@ -834,7 +834,7 @@ describe('Notes', () => {
// Create a local target category
({ cid: targetCid } = await categories.create({ name: utils.generateUUID().slice(0, 8) }));
// Add a hashtag-type auto-categorization rule with filter (queue=true)
- rid = await activitypub.rules.upsert('hashtag', tagName, targetCid, true);
+ rid = await activitypub.rules.upsert('hashtag', tagName, targetCid, 1);
meta.config.postQueue = 1;
});