diff --git a/extensions/package-manager/js/src/admin/extend.tsx b/extensions/package-manager/js/src/admin/extend.tsx
index cb9d2c3900..e77e3bfdd3 100644
--- a/extensions/package-manager/js/src/admin/extend.tsx
+++ b/extensions/package-manager/js/src/admin/extend.tsx
@@ -14,16 +14,12 @@ export default [
.setting(() => ({
setting: 'flarum-extension-manager.queue_jobs',
label: app.translator.trans('flarum-extension-manager.admin.settings.queue_jobs'),
- help: m.trust(
- extractText(
- app.translator.trans('flarum-extension-manager.admin.settings.queue_jobs_help', {
- basic_impl_link: 'https://discuss.flarum.org/d/28151-database-queue-the-simplest-queue-even-for-shared-hosting',
- adv_impl_link: 'https://discuss.flarum.org/d/21873-redis-sessions-cache-queues',
- php_version: `${app.data.phpVersion}`,
- folder_perms_link: 'https://docs.flarum.org/install#folder-ownership',
- })
- )
- ),
+ help: app.translator.trans('flarum-extension-manager.admin.settings.queue_jobs_help', {
+ basic_impl_link: ,
+ adv_impl_link: ,
+ php_version: {app.data.phpVersion},
+ folder_perms_link: ,
+ }),
type: 'boolean',
disabled: app.data['flarum-extension-manager.using_sync_queue'],
}))
diff --git a/extensions/package-manager/locale/en.yml b/extensions/package-manager/locale/en.yml
index 694a2dde2f..ee7949a6cd 100755
--- a/extensions/package-manager/locale/en.yml
+++ b/extensions/package-manager/locale/en.yml
@@ -128,6 +128,7 @@ flarum-extension-manager:
party_filter:
all: All
premium: Premium
+ toggle_dropdown_accessible_label: Toggle party filter
queue:
columns:
details: Details
@@ -169,8 +170,8 @@ flarum-extension-manager:
debug_mode_warning: You are running in debug mode, the extension manager cannot properly install and update local development packages. Please use the command line interface instead for such purposes.
queue_jobs: Run operations in the background queue
queue_jobs_help: >
- You can read about a basic queue implementation or a more advanced one.
- Make sure the PHP version used for the queue is {php_version}. Make sure folder permissions are correctly configured.
+ You can read about a basic queue implementation or a more advanced one.
+ Make sure the PHP version used for the queue is {php_version}. Make sure folder permissions are correctly configured.
task_retention_days: Task retention days
task_retention_days_help: >
The number of days to keep completed tasks in the database. Tasks older than this will be deleted.
diff --git a/framework/core/js/src/common/Translator.tsx b/framework/core/js/src/common/Translator.tsx
index 60cea4a59e..9f6d624772 100644
--- a/framework/core/js/src/common/Translator.tsx
+++ b/framework/core/js/src/common/Translator.tsx
@@ -84,15 +84,10 @@ export default class Translator {
const elements = translation.match(/<(\w+)[^>]*>.*?<\/\1>/g);
const tags = elements?.map((element) => element.match(/^<(\w+)/)![1]) || [];
- for (const tag of tags) {
- if (!parameters[tag]) {
- fireDebugWarning(
- `Any HTML tags used within translations must have corresponding mithril component parameters.\nCaught in translation: \n\n"""\n${translation}\n"""`,
- '',
- 'v2.0',
- 'flarum/framework'
- );
+ const autoProvidedTags = this.autoProvidedTags();
+ for (const tag of tags) {
+ if (!parameters[tag] && autoProvidedTags.includes(tag)) {
parameters[tag] = ({ children }: any) => m(tag, children);
}
}
@@ -186,4 +181,8 @@ export default class Translator {
return translation;
}
+
+ autoProvidedTags(): string[] {
+ return ['strong', 'code', 'i', 's', 'em', 'sup', 'sub'];
+ }
}
diff --git a/framework/core/js/src/common/components/Pagination.tsx b/framework/core/js/src/common/components/Pagination.tsx
index 1ce146df4a..5a21d439a8 100644
--- a/framework/core/js/src/common/components/Pagination.tsx
+++ b/framework/core/js/src/common/components/Pagination.tsx
@@ -22,20 +22,20 @@ export default class Pagination