[4.0] com_users front end forms

[jgerman-bot]

New language relevant PR in upstream repo: joomla/joomla-cms#29339 Here are the upstream changes:

diff --git a/components/com_users/layouts/joomla/form/renderfield.php b/components/com_users/layouts/joomla/form/renderfield.php
index 7299b9fcbad3..23c3ba463445 100644
--- a/components/com_users/layouts/joomla/form/renderfield.php
+++ b/components/com_users/layouts/joomla/form/renderfield.php
@@ -10,7 +10,6 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\HTML\HTMLHelper;
-use Joomla\CMS\Language\Text;
 
 extract($displayData);
 
@@ -53,9 +52,6 @@
 	<?php if (empty($options['hiddenLabel'])): ?>
 		<div class="control-label">
 			<?php echo $label; ?>
-			<?php if (!$required && !$typeOfSpacer) : ?>
-				<span class="optional"><?php echo Text::_('COM_USERS_OPTIONAL'); ?></span>
-			<?php endif; ?>
 		</div>
 	<?php endif; ?>
 	<div class="controls">
diff --git a/components/com_users/tmpl/profile/edit.php b/components/com_users/tmpl/profile/edit.php
index 3eabb00d9b88..ad224235b5c4 100644
--- a/components/com_users/tmpl/profile/edit.php
+++ b/components/com_users/tmpl/profile/edit.php
@@ -59,11 +59,6 @@
 							<div class="control-group">
 								<div class="control-label">
 									<?php echo $field->label; ?>
-									<?php if (!$field->required && $field->type !== 'Spacer') : ?>
-										<span class="optional">
-											<?php echo Text::_('COM_USERS_OPTIONAL'); ?>
-										</span>
-									<?php endif; ?>
 								</div>
 								<div class="controls">
 									<?php echo $field->input; ?>
diff --git a/language/en-GB/com_users.ini b/language/en-GB/com_users.ini
index 23bdeb24b884..1f34e8c9098c 100644
--- a/language/en-GB/com_users.ini
+++ b/language/en-GB/com_users.ini
@@ -58,7 +58,6 @@ COM_USERS_MSG_NOT_ENOUGH_UPPERCASE_LETTERS_N_1="Password does not have enough up
 COM_USERS_MSG_PASSWORD_TOO_LONG="Password is too long. Passwords must be less than 100 characters."
 COM_USERS_MSG_PASSWORD_TOO_SHORT_N="Password is too short. Passwords must have at least %s characters."
 COM_USERS_MSG_SPACES_IN_PASSWORD="Password must not have spaces."
-COM_USERS_OPTIONAL="(optional)"
 COM_USERS_OR="or"
 COM_USERS_PROFILE="User Profile"
 COM_USERS_PROFILE_BIND_FAILED="Could not bind profile data: %s"