Merge remote-tracking branch 'upstream/4.2-dev' into translation

joomla · Sep 8, 2022 · 95207b8 · 95207b8
2 parents dec91ef + 04bf645
commit 95207b8
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git 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"
 		/>
 	</fieldset>
 

diff --git 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
@@ -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_joomlaupdate.ini b/administrator/language/en-GB/com_joomlaupdate.ini
@@ -136,7 +136,7 @@ COM_JOOMLAUPDATE_VIEW_DEFAULT_NON_CORE_PLUGIN_CONFIRMATION="Acknowledge the warn
 COM_JOOMLAUPDATE_VIEW_DEFAULT_NOUPDATES="No updates available"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_NOUPDATESNOTICE="You already have the latest Joomla version, %s."
 COM_JOOMLAUPDATE_VIEW_DEFAULT_PACKAGE="Update package URL"
-COM_JOOMLAUPDATE_VIEW_DEFAULT_PACKAGE_INFO="You can also download <a href=\"%s\" class=\"alert-link\" target=\"_blank\" rel=\"noopener noreferrer\">the update package</a> and install it manually."
+COM_JOOMLAUPDATE_VIEW_DEFAULT_PACKAGE_INFO="You can also download <a href=\"%s\" class=\"alert-link\" target=\"_blank\" rel=\"noopener noreferrer\">the update package</a> to your computer and then use the fields below to upload and install it."
 COM_JOOMLAUPDATE_VIEW_DEFAULT_PACKAGE_REINSTALL="Reinstall package URL"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_PHP_VERSION_NOT_SUPPORTED="Your PHP version is not supported"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_PHP_VERSION_NOT_SUPPORTED_DESC="An update to Joomla %1$s was found, but your currently installed PHP version does not match <a href=\"https://downloads.joomla.org/technical-requirements\">the minimum requirements for Joomla %1$s</a>."

diff --git 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 <em>any</em> 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 <code>COM_USERS_HEADING_MFA</code> 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 <code>COM_USERS_USER_MULTIFACTOR_AUTH</code> 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.<br><em
 COM_CATEGORIES_CATEGORY_ADD_TITLE="User Notes: New Category" ; Categories overrides
 COM_CATEGORIES_CATEGORY_EDIT_TITLE="User Notes: Edit Category" ; Categories overrides
 
+COM_MODULES_NONE=":: None ::" ; Duplicate, used in MFA settings
+
 ; Obsolete language strings since 4.2.0 -- Remove them in Joomla 5.0
 COM_USERS_CONFIG_FIELD_ENFORCE_2FA_FIELD_ADMIN="Admin (Backend)"
 COM_USERS_CONFIG_FIELD_ENFORCE_2FA_FIELD_BOTH="Both"

diff --git a/administrator/language/en-GB/plg_multifactorauth_email.ini b/administrator/language/en-GB/plg_multifactorauth_email.ini
@@ -21,7 +21,6 @@ PLG_MULTIFACTORAUTH_EMAIL_LBL_LABEL="Authentication Code"
 PLG_MULTIFACTORAUTH_EMAIL_LBL_PRE_MESSAGE="You have received a six digit Multi-factor Authentication code in your email. Please enter it below."
 PLG_MULTIFACTORAUTH_EMAIL_LBL_SETUP_PLACEHOLDER="Six Digit Authentication Code"
 PLG_MULTIFACTORAUTH_EMAIL_LBL_SHORTINFO="Receive six digit codes by email."
-PLG_MULTIFACTORAUTH_EMAIL_MAIL_LBL="Joomla: Authentication Code by Email"
 PLG_MULTIFACTORAUTH_EMAIL_MAIL_MAIL_DESC="Sent to users from the Multi-factor Authentication page when using the “Authentication Code by Email” option."
 PLG_MULTIFACTORAUTH_EMAIL_MAIL_MAIL_TITLE="Code sent by email"
 PLG_MULTIFACTORAUTH_EMAIL_XML_DESCRIPTION="Use time limited, six digit security codes sent to you by email."