Merge branch '12300' into 12400

core/class/layout.class.php

@@ -1016,7 +1016,10 @@ class layout extends common
                 }
             }
             if ($this->getUser('group') >= self::GROUP_MODERATOR) {
-                $rightItems .= '<li><a href="' . helper::baseUrl() . 'user/edit/' . $this->getUser('id') . '/' . $_SESSION['csrf'] . '" data-tippy-content="Configurer mon compte">' . template::ico('user', ['margin' => 'right']) . '<span id="displayUsername">' . $this->getUser('firstname') . ' ' . $this->getUser('lastname') . '</span></a></li>';
+                $rightItems .= '<li><a href="' . helper::baseUrl() . 'user/edit/' . $this->getUser('id') . '/' . $_SESSION['csrf'] . 
+                                '" data-tippy-content="'. helper::translate('Configurer mon compte') . '">' . 
+                                template::ico('user', ['margin' => 'right']) . '<span id="displayUsername">' . $this->getUser('firstname') . ' ' . $this->getUser('lastname') . 
+                                '</span></a></li>';
             }
             $rightItems .= '<li>' . template::ico('logout', [
                 'help' => 'Déconnecter',

core/module/page/view/edit/edit.php

@@ -148,7 +148,7 @@
 						</div>
 						<div class="col4">
 							<?php echo template::select('pageEditExtraPosition', $module::$extraPosition, [
-								'label' => 'Emplacement :',
+								'label' => 'Emplacement',
 								'selected' => $this->getData(['page', $this->getUrl(2), 'extraPosition']),
 								'help' => 'Le menu accessoire est aligné à droite de la barre de menu, c\'est un emplacement réservé aux drapeaux et au bouton de connexion.'
 							]); ?>

core/module/plugin/view/item/item.php

@@ -35,7 +35,7 @@
     <div class="row">
         <div class="col12 textAlignCenter">
             <span>
-                <?php echo helper::translate('Licence :'); ?>
+                <?php echo helper::translate('Licence'); ?>
                 &nbsp;
                 <?php echo $module::$storeItem['fileLicense']; ?>
             </span>

core/module/theme/view/header/header.php

@@ -167,7 +167,7 @@
                         -
                         <?php echo helper::translate('Largeur de l\'image :'); ?> <span id="themeHeaderImageHeight"></span>
                         -
-                        <?php echo helper::translate('Ratio :'); ?> <span id="themeHeaderImageRatio"></span>
+                        <?php echo helper::translate('Ratio'); ?> <span id="themeHeaderImageRatio"></span>
                     </span>
                 </div>
             </div>