Click to expand the diff!
```diff
diff --git a/administrator/components/com_users/config.xml b/administrator/components/com_users/config.xml
index e331ef997f96..4b3314b7cb44 100644
--- a/administrator/components/com_users/config.xml
+++ b/administrator/components/com_users/config.xml
@@ -327,7 +327,7 @@
label="COM_USERS_CONFIG_REDIRECTURL_LABEL"
description="COM_USERS_CONFIG_REDIRECTURL_DESC"
default=""
- showon="redirectonlogin:1"
+ showon="mfaredirectonlogin:1"
/>
diff --git a/administrator/components/com_users/src/Model/BackupcodesModel.php b/administrator/components/com_users/src/Model/BackupcodesModel.php
index 7fb7834dbefe..ca7d38e82529 100644
--- a/administrator/components/com_users/src/Model/BackupcodesModel.php
+++ b/administrator/components/com_users/src/Model/BackupcodesModel.php
@@ -131,7 +131,7 @@ public function saveBackupCodes(array $codes, ?User $user = null): bool
$newData = [
'user_id' => $user->id,
- 'title' => Text::_('COM_USERS_PROFILE_OTEPS'),
+ 'title' => Text::_('COM_USERS_USER_BACKUPCODES'),
'method' => 'backupcodes',
'default' => 0,
'created_on' => $jNow->toSql(),
diff --git a/administrator/components/com_users/src/View/Captive/HtmlView.php b/administrator/components/com_users/src/View/Captive/HtmlView.php
index 3a24ac90eceb..be8d5fc33286 100644
--- a/administrator/components/com_users/src/View/Captive/HtmlView.php
+++ b/administrator/components/com_users/src/View/Captive/HtmlView.php
@@ -191,7 +191,7 @@ public function display($tpl = null)
// Back-end: always show a title in the 'title' module position, not in the page body
if ($this->isAdmin) {
- ToolbarHelper::title(Text::_('COM_USERS_HEADING_MFA'), 'users user-lock');
+ ToolbarHelper::title(Text::_('COM_USERS_USER_MULTIFACTOR_AUTH'), 'users user-lock');
$this->title = '';
}
diff --git a/administrator/language/en-GB/com_users.ini b/administrator/language/en-GB/com_users.ini
index 5869726da20a..25f13ac9d704 100644
--- a/administrator/language/en-GB/com_users.ini
+++ b/administrator/language/en-GB/com_users.ini
@@ -61,7 +61,7 @@ COM_USERS_CONFIG_FORCEMFAUSERGROUPS_DESC="Any user who belongs in any o
COM_USERS_CONFIG_FORCEMFAUSERGROUPS_LABEL="Enforce Multi-factor Authentication"
COM_USERS_CONFIG_FRONTEND_CAPTIVE_TEMPLATE_DESC="Choose the frontend template style to use in the Multi-factor Authentication page. Select “- Use Default -” to use the default site template style."
COM_USERS_CONFIG_FRONTEND_CAPTIVE_TEMPLATE_LABEL="Frontend template style"
-COM_USERS_CONFIG_FRONTEND_SHOW_TITLE_DESC="Should I display a title in the frontend Multi-factor Authentication verification page? Please note that the title is always displayed in the backend. If you need to change the title please override the language key COM_USERS_HEADING_MFA using the System, Manage, Language Overrides page of the site's backend."
+COM_USERS_CONFIG_FRONTEND_SHOW_TITLE_DESC="Should I display a title in the frontend Multi-factor Authentication verification page? Please note that the title is always displayed in the backend. If you need to change the title please override the language key COM_USERS_USER_MULTIFACTOR_AUTH using the System, Manage, Language Overrides page of the site's backend."
COM_USERS_CONFIG_FRONTEND_SHOW_TITLE_LABEL="Show title in frontend"
COM_USERS_CONFIG_IMPORT_FAILED="An error was encountered while importing the configuration: %s."
COM_USERS_CONFIG_INTEGRATION_SETTINGS_DESC="These settings determine how the Users Component will integrate with other extensions."
@@ -444,6 +444,8 @@ JLIB_RULES_SETTING_NOTES_COM_USERS="Changes apply to this component only.
PR w związku ze zmianą oryginału https://github.com/joomla/joomla-cms/pull/38208 Poniżej zmiany w oryginale:
Click to expand the diff!
```diff diff --git a/administrator/components/com_users/config.xml b/administrator/components/com_users/config.xml index e331ef997f96..4b3314b7cb44 100644 --- a/administrator/components/com_users/config.xml +++ b/administrator/components/com_users/config.xml @@ -327,7 +327,7 @@ label="COM_USERS_CONFIG_REDIRECTURL_LABEL" description="COM_USERS_CONFIG_REDIRECTURL_DESC" default="" - showon="redirectonlogin:1" + showon="mfaredirectonlogin:1" /> diff --git a/administrator/components/com_users/src/Model/BackupcodesModel.php b/administrator/components/com_users/src/Model/BackupcodesModel.php index 7fb7834dbefe..ca7d38e82529 100644 --- a/administrator/components/com_users/src/Model/BackupcodesModel.php +++ b/administrator/components/com_users/src/Model/BackupcodesModel.php @@ -131,7 +131,7 @@ public function saveBackupCodes(array $codes, ?User $user = null): bool $newData = [ 'user_id' => $user->id, - 'title' => Text::_('COM_USERS_PROFILE_OTEPS'), + 'title' => Text::_('COM_USERS_USER_BACKUPCODES'), 'method' => 'backupcodes', 'default' => 0, 'created_on' => $jNow->toSql(), diff --git a/administrator/components/com_users/src/View/Captive/HtmlView.php b/administrator/components/com_users/src/View/Captive/HtmlView.php index 3a24ac90eceb..be8d5fc33286 100644 --- a/administrator/components/com_users/src/View/Captive/HtmlView.php +++ b/administrator/components/com_users/src/View/Captive/HtmlView.php @@ -191,7 +191,7 @@ public function display($tpl = null) // Back-end: always show a title in the 'title' module position, not in the page body if ($this->isAdmin) { - ToolbarHelper::title(Text::_('COM_USERS_HEADING_MFA'), 'users user-lock'); + ToolbarHelper::title(Text::_('COM_USERS_USER_MULTIFACTOR_AUTH'), 'users user-lock'); $this->title = ''; } diff --git a/administrator/language/en-GB/com_users.ini b/administrator/language/en-GB/com_users.ini index 5869726da20a..25f13ac9d704 100644 --- a/administrator/language/en-GB/com_users.ini +++ b/administrator/language/en-GB/com_users.ini @@ -61,7 +61,7 @@ COM_USERS_CONFIG_FORCEMFAUSERGROUPS_DESC="Any user who belongs in any o COM_USERS_CONFIG_FORCEMFAUSERGROUPS_LABEL="Enforce Multi-factor Authentication" COM_USERS_CONFIG_FRONTEND_CAPTIVE_TEMPLATE_DESC="Choose the frontend template style to use in the Multi-factor Authentication page. Select “- Use Default -” to use the default site template style." COM_USERS_CONFIG_FRONTEND_CAPTIVE_TEMPLATE_LABEL="Frontend template style" -COM_USERS_CONFIG_FRONTEND_SHOW_TITLE_DESC="Should I display a title in the frontend Multi-factor Authentication verification page? Please note that the title is always displayed in the backend. If you need to change the title please override the language keyCOM_USERS_HEADING_MFA
using the System, Manage, Language Overrides page of the site's backend." +COM_USERS_CONFIG_FRONTEND_SHOW_TITLE_DESC="Should I display a title in the frontend Multi-factor Authentication verification page? Please note that the title is always displayed in the backend. If you need to change the title please override the language keyCOM_USERS_USER_MULTIFACTOR_AUTH
using the System, Manage, Language Overrides page of the site's backend." COM_USERS_CONFIG_FRONTEND_SHOW_TITLE_LABEL="Show title in frontend" COM_USERS_CONFIG_IMPORT_FAILED="An error was encountered while importing the configuration: %s." COM_USERS_CONFIG_INTEGRATION_SETTINGS_DESC="These settings determine how the Users Component will integrate with other extensions." @@ -444,6 +444,8 @@ JLIB_RULES_SETTING_NOTES_COM_USERS="Changes apply to this component only.