Added possibility to set backend locale per every admin user (#3087)

OpenMage · Apr 5, 2023 · c20371d · c20371d
1 parent fa2b8c3
commit c20371d
Show file tree

Hide file tree

Showing 6 changed files with 85 additions and 41 deletions.
diff --git a/app/code/core/Mage/Admin/Model/Session.php b/app/code/core/Mage/Admin/Model/Session.php
@@ -161,6 +161,9 @@ public function login($username, $password, $request = null)
                 $this->setIsFirstPageAfterLogin(true);
                 $this->setUser($user);
                 $this->setAcl(Mage::getResourceModel('admin/acl')->loadAcl());
+                if ($backendLocale = $user->getBackendLocale()) {
+                    Mage::getSingleton('adminhtml/session')->setLocale($backendLocale);
+                }
 
                 $alternativeUrl = $this->_getRequestUri($request);
                 $redirectUrl = $this->_urlPolicy->getRedirectUrl($user, $request, $alternativeUrl);

diff --git a/app/code/core/Mage/Admin/etc/config.xml b/app/code/core/Mage/Admin/etc/config.xml
@@ -17,7 +17,7 @@
 <config>
     <modules>
         <Mage_Admin>
-            <version>1.6.1.4</version>
+            <version>1.6.1.5</version>
         </Mage_Admin>
     </modules>
     <global>

diff --git a/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.4-1.6.1.5.php b/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.4-1.6.1.5.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * OpenMage
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to [email protected] so we can send you a copy immediately.
+ *
+ * @category   Mage
+ * @package    Mage_Admin
+ * @copyright  Copyright (c) 2023 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/** @var Mage_Core_Model_Resource_Setup $installer */
+$installer = $this;
+$installer->startSetup();
+
+$installer->getConnection()->addColumn($installer->getTable('admin/user'), 'backend_locale', 'varchar(8) NULL');
+
+$installer->endSetup();
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Account/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Account/Edit/Form.php
@@ -34,59 +34,70 @@ protected function _prepareForm()
         $fieldset = $form->addFieldset('base_fieldset', ['legend' => Mage::helper('adminhtml')->__('Account Information')]);
 
         $fieldset->addField('username', 'text', [
-                'name'  => 'username',
-                'label' => Mage::helper('adminhtml')->__('User Name'),
-                'title' => Mage::helper('adminhtml')->__('User Name'),
-                'required' => true,
-            ]);
+            'name' => 'username',
+            'label' => Mage::helper('adminhtml')->__('User Name'),
+            'title' => Mage::helper('adminhtml')->__('User Name'),
+            'required' => true,
+        ]);
 
         $fieldset->addField('firstname', 'text', [
-                'name'  => 'firstname',
-                'label' => Mage::helper('adminhtml')->__('First Name'),
-                'title' => Mage::helper('adminhtml')->__('First Name'),
-                'required' => true,
-            ]);
+            'name' => 'firstname',
+            'label' => Mage::helper('adminhtml')->__('First Name'),
+            'title' => Mage::helper('adminhtml')->__('First Name'),
+            'required' => true,
+        ]);
 
         $fieldset->addField('lastname', 'text', [
-                'name'  => 'lastname',
-                'label' => Mage::helper('adminhtml')->__('Last Name'),
-                'title' => Mage::helper('adminhtml')->__('Last Name'),
-                'required' => true,
-            ]);
+            'name' => 'lastname',
+            'label' => Mage::helper('adminhtml')->__('Last Name'),
+            'title' => Mage::helper('adminhtml')->__('Last Name'),
+            'required' => true,
+        ]);
 
         $fieldset->addField('user_id', 'hidden', [
-                'name'  => 'user_id',
-            ]);
+            'name' => 'user_id',
+        ]);
 
         $fieldset->addField('email', 'text', [
-                'name'  => 'email',
-                'label' => Mage::helper('adminhtml')->__('Email'),
-                'title' => Mage::helper('adminhtml')->__('User Email'),
-                'required' => true,
-            ]);
+            'name' => 'email',
+            'label' => Mage::helper('adminhtml')->__('Email'),
+            'title' => Mage::helper('adminhtml')->__('User Email'),
+            'required' => true,
+        ]);
 
         $fieldset->addField('current_password', 'obscure', [
-                'name'  => 'current_password',
-                'label' => Mage::helper('adminhtml')->__('Current Admin Password'),
-                'title' => Mage::helper('adminhtml')->__('Current Admin Password'),
-                'required' => true,
-            ]);
+            'name' => 'current_password',
+            'label' => Mage::helper('adminhtml')->__('Current Admin Password'),
+            'title' => Mage::helper('adminhtml')->__('Current Admin Password'),
+            'required' => true,
+        ]);
 
         $minAdminPasswordLength = Mage::getModel('admin/user')->getMinAdminPasswordLength();
         $fieldset->addField('password', 'password', [
-                'name'  => 'new_password',
-                'label' => Mage::helper('adminhtml')->__('New Password'),
-                'title' => Mage::helper('adminhtml')->__('New Password'),
-                'class' => 'input-text validate-admin-password min-admin-pass-length-' . $minAdminPasswordLength,
-                'note' => Mage::helper('adminhtml')
-                    ->__('Password must be at least of %d characters.', $minAdminPasswordLength),
-            ]);
+            'name' => 'new_password',
+            'label' => Mage::helper('adminhtml')->__('New Password'),
+            'title' => Mage::helper('adminhtml')->__('New Password'),
+            'class' => 'input-text validate-admin-password min-admin-pass-length-' . $minAdminPasswordLength,
+            'note' => Mage::helper('adminhtml')
+                ->__('Password must be at least of %d characters.', $minAdminPasswordLength),
+        ]);
 
         $fieldset->addField('confirmation', 'password', [
-                'name'  => 'password_confirmation',
-                'label' => Mage::helper('adminhtml')->__('Password Confirmation'),
-                'class' => 'input-text validate-cpassword',
-            ]);
+            'name' => 'password_confirmation',
+            'label' => Mage::helper('adminhtml')->__('Password Confirmation'),
+            'class' => 'input-text validate-cpassword',
+        ]);
+
+        $locales = Mage::app()->getLocale()->getTranslatedOptionLocales();
+        $locales = array_column($locales, 'label', 'value');
+        array_unshift($locales, '');
+        $fieldset->addField('backend_locale', 'select', [
+            'name' => 'backend_locale',
+            'label' => Mage::helper('adminhtml')->__('Backend Locale'),
+            'class' => 'input-select',
+            'options' => $locales,
+            'required' => false,
+        ]);
 
         $form->setValues($user->getData());
         $form->setAction($this->getUrl('*/system_account/save'));

diff --git a/app/code/core/Mage/Adminhtml/controllers/System/AccountController.php b/app/code/core/Mage/Adminhtml/controllers/System/AccountController.php
@@ -44,8 +44,6 @@ public function indexAction()
     public function saveAction()
     {
         $userId = Mage::getSingleton('admin/session')->getUser()->getId();
-        $pwd    = null;
-
         $user = Mage::getModel("admin/user")->load($userId);
 
         $user->setId($userId)
@@ -61,6 +59,10 @@ public function saveAction()
             $user->setPasswordConfirmation($this->getRequest()->getParam('password_confirmation', false));
         }
 
+        $backendLocale = $this->getRequest()->getParam('backend_locale', false);
+        $backendLocale = $backendLocale == 0 ? null : $backendLocale;
+        $user->setBackendLocale($backendLocale);
+
         //Validate current admin password
         $currentPassword = $this->getRequest()->getParam('current_password', null);
         $this->getRequest()->setParam('current_password', null);

diff --git a/app/locale/en_US/Mage_Adminhtml.csv b/app/locale/en_US/Mage_Adminhtml.csv
@@ -165,6 +165,7 @@
 "BINARY","BINARY"
 "Back","Back"
 "Back to Login","Back to Login"
+"Backend Locale","Backend Locale"
 "Backup","Backup"
 "Backup Name","Backup Name"
 "Backup options","Backup options"