Merge branch '5.1-dev' into fix-43344

.drone.yml

@@ -272,7 +272,7 @@ volumes:
 
 services:
   - name: mysql
-    image: mysql:8
+    image: mysql:8.0
     command: ["--default-authentication-plugin=mysql_native_password"]
     environment:
       MYSQL_USER: joomla_ut
@@ -415,6 +415,6 @@ trigger:
 
 ---
 kind: signature
-hmac: 070b8d44a6bad66956066cf2f6587f8d4726a7d1a5c78a823664458001d90454
+hmac: 1dd372065e6179c1afc6c4da95e1bf89b3524489488dd2b0ff228f870f111685
 
 ...

administrator/language/en-GB/mod_user.ini

@@ -5,9 +5,12 @@
 
 MOD_USER="User Menu"
 MOD_USER_ACCESSIBILITY_SETTINGS="Accessibility Settings"
-MOD_USER_DARK_MODE="Dark Mode"
 MOD_USER_EDIT_ACCOUNT="Edit Account"
-MOD_USER_LIGHT_MODE="Light Mode"
+MOD_USER_LIGHTDARK_MODE="Light/Dark Mode"
 MOD_USER_MENU="User Menu"
 MOD_USER_TITLE="Signed in as %s"
 MOD_USER_XML_DESCRIPTION="This module shows the User Menu and is intended to be displayed in the 'status' position."
+
+; Deprecated, will be removed with 6.0
+MOD_USER_LIGHT_MODE="Light Mode"
+MOD_USER_DARK_MODE="Dark Mode"

administrator/modules/mod_user/tmpl/default.php

@@ -54,10 +54,10 @@
         <?php if ($colorSchemeSwitch) : ?>
             <button type="button" class="dropdown-item" data-color-scheme-switch>
                 <span class="d-dark-scheme-none">
-                    <span class="fa fa-sun icon-fw me-1" aria-hidden="true"></span> <?php echo Text::_('MOD_USER_LIGHT_MODE'); ?>
+                    <span class="fa fa-sun icon-fw me-1" aria-hidden="true"></span> <?php echo Text::_('MOD_USER_LIGHTDARK_MODE'); ?>
                 </span>
                 <span class="d-light-scheme-none">
-                    <span class="fa fa-moon icon-fw me-1" aria-hidden="true"></span> <?php echo Text::_('MOD_USER_DARK_MODE'); ?>
+                    <span class="fa fa-moon icon-fw me-1" aria-hidden="true"></span> <?php echo Text::_('MOD_USER_LIGHTDARK_MODE'); ?>
                 </span>
             </button>
         <?php endif; ?>