Ticket #368

modules/boonex/english/data/langs/system/en.xml

@@ -1284,7 +1284,7 @@
 	<string name="_adm_txt_form_view_iu_preview_empty"><![CDATA[No image uploaded.]]></string>
 	<string name="_adm_txt_form_view_missing"><![CDATA[missing]]></string>
 	<string name="_adm_txt_login_password"><![CDATA[password]]></string>
-	<string name="_adm_txt_login_username"><![CDATA[username]]></string>
+	<string name="_adm_txt_login_email"><![CDATA[email]]></string>
 	<string name="_adm_txt_module_custom"><![CDATA[Custom]]></string>
 	<string name="_adm_txt_module_skeletons"><![CDATA[Skeletons]]></string>
 	<string name="_adm_txt_module_system"><![CDATA[System]]></string>

modules/boonex/russian/data/langs/system/ru.xml

@@ -1284,7 +1284,7 @@
 	<string name="_adm_txt_form_view_iu_preview_empty"><![CDATA[Ни одно изображение не было загружено.]]></string>
 	<string name="_adm_txt_form_view_missing"><![CDATA[отсутствует]]></string>
 	<string name="_adm_txt_login_password"><![CDATA[пароль]]></string>
-	<string name="_adm_txt_login_username"><![CDATA[имя пользователя]]></string>
+	<string name="_adm_txt_login_email"><![CDATA[эл. адрес]]></string>
 	<string name="_adm_txt_module_custom"><![CDATA[Индивидуальный]]></string>
 	<string name="_adm_txt_module_skeletons"><![CDATA[Скелеты]]></string>
 	<string name="_adm_txt_module_system"><![CDATA[Система]]></string>

studio/template/login_form.html

@@ -4,7 +4,7 @@
         <input type="hidden" name="csrf_token" value="__csrf_token__" />
         <input type="hidden" name="relocate" value="__relocate_url__" />
         <div class="bx-std-lf-input">
-            <input class="bx-def-font-inputs bx-form-input-text bx-def-color-ft-grayed-i" id="admin_username" type="text" name="ID" value="" placeholder="<bx_text_attribute:_adm_txt_login_username />" tabindex="1" />
+            <input class="bx-def-font-inputs bx-form-input-text bx-def-color-ft-grayed-i" id="admin_email" type="text" name="ID" value="" placeholder="<bx_text_attribute:_adm_txt_login_email />" tabindex="1" />
             <div class="bx-def-padding-sec-top">
                 <input class="form_input_checkbox" type="checkbox" name="rememberMe" id="login_box_form_input_rememberMe" tabindex="3"  /> <label for="login_box_form_input_rememberMe"><bx_text:_adm_txt_remember_me /></label>
             </div>

studio/template/scripts/BxBaseStudioFunctions.php

@@ -90,7 +90,6 @@ class BxBaseStudioFunctions extends BxBaseFunctions implements iBxDolSingleton
         if (empty($sUrlRelocate) || basename($sUrlRelocate) == 'index.php')
             $sUrlRelocate = '';
 
-        $oTemplate->addJsTranslation(array('_adm_txt_login_username', '_adm_txt_login_password'));
         $sHtml = $oTemplate->parseHtmlByName('login_form.html', array (
             'role' => BX_DOL_ROLE_ADMIN,
             'csrf_token' => BxDolForm::genCsrfToken(true),