*: use "Username" in login and account creation dialogs

Other login related dialogs ( PasswordTool_viewEmailPassword , ERP5Site_viewCredentialRecoveryLoginDialog , PasswordTool_viewResetPassword ) all use Username. Login_view/my_reference uses "User Login", but that's maybe OK, because the context is different and there's also "User Password" on the same form.

*: use "Username" in login and account creation dialogs
Other login related dialogs ( PasswordTool_viewEmailPassword , ERP5Site_viewCredentialRecoveryLoginDialog , PasswordTool_viewResetPassword ) all use Username. Login_view/my_reference uses "User Login", but that's maybe OK, because the context is different and there's also "User Password" on the same form.
cf3dccbe · Jérome Perrin · 1fba1fb6 · cf3dccbe · cf3dccbe · cf3dccbe
Commit cf3dccbe authored Jun 19, 2020 by Jérome Perrin
14 changed files
--- a/bt5/erp5_advanced_ecommerce/SkinTemplateItem/portal_skins/erp5_advanced_ecommerce/WebSection_viewTraditionalLogin.zpt
+++ b/bt5/erp5_advanced_ecommerce/SkinTemplateItem/portal_skins/erp5_advanced_ecommerce/WebSection_viewTraditionalLogin.zpt
@@ -15,7 +15,7 @@
   <div class="login_side">
     <span class="group_title" i18n:translate="" i18n:domain="ui"> Login </span>
     <div class="field">
-         <label class="required" i18n:translate="" i18n:domain="ui">Login</label>
+         <label class="required" i18n:translate="" i18n:domain="ui">Username</label>
         <input type="text" name="__ac_name" id="name" tal:attributes="value python: request.get('__ac_name') or ''" />
         <p class="clear"></p>
      </div>

--- a/bt5/erp5_advanced_ecommerce/SkinTemplateItem/portal_skins/erp5_advanced_ecommerce/WebSite_viewRegistrationDialog/your_reference.xml
+++ b/bt5/erp5_advanced_ecommerce/SkinTemplateItem/portal_skins/erp5_advanced_ecommerce/WebSite_viewRegistrationDialog/your_reference.xml
@@ -115,7 +115,7 @@
                </item>
                <item>
                    <key> <string>title</string> </key>
-                    <value> <string>User Login</string> </value>
+                    <value> <string>Username</string> </value>
                </item>
              </dictionary>
            </value>

--- a/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/login_form.zpt
+++ b/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/login_form.zpt
@@ -25,7 +25,7 @@
                 tal:attributes="value request/came_from" />
          <fieldset>
            <div class="field">
-              <label for="name" class="required" i18n:translate="" i18n:domain="ui">Name</label>
+              <label for="name" class="required" i18n:translate="" i18n:domain="ui">Username</label>
              <div class="input"><input type="text" name="__ac_name" id="name" /></div>
              <p class="clear"></p>
            </div>

--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/login_form/ac_login.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/login_form/ac_login.xml
@@ -271,7 +271,7 @@
                </item>
                <item>
                    <key> <string>title</string> </key>
-                    <value> <string>Login or Email</string> </value>
+                    <value> <string>Username or Email</string> </value>
                </item>
                <item>
                    <key> <string>unicode</string> </key>

--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/WebSite_loginForm/ac_login.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/WebSite_loginForm/ac_login.xml
@@ -273,7 +273,7 @@
                </item>
                <item>
                    <key> <string>title</string> </key>
-                    <value> <string>Login</string> </value>
+                    <value> <string>Username</string> </value>
                </item>
                <item>
                    <key> <string>unicode</string> </key>

--- a/bt5/erp5_mobile/SkinTemplateItem/portal_skins/erp5_mobile_ui/login_form.zpt
+++ b/bt5/erp5_mobile/SkinTemplateItem/portal_skins/erp5_mobile_ui/login_form.zpt
@@ -44,7 +44,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

      <fieldset class="left fielset_login">
        <div class="field">
-          <label for="name" class="required" i18n:translate="" i18n:domain="ui">Name</label>
+          <label for="name" class="required" i18n:translate="" i18n:domain="ui">Username</label>
          <div class="input"><input type="text" name="__ac_name" id="name" /></div>
        </div>
        <div class="field">

--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_viewRegistrationDialog/your_reference.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_viewRegistrationDialog/your_reference.xml
@@ -107,7 +107,7 @@
                </item>
                <item>
                    <key> <string>title</string> </key>
-                    <value> <string>User Login</string> </value>
+                    <value> <string>Username</string> </value>
                </item>
              </dictionary>
            </value>

--- a/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/login_form.zpt
+++ b/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/login_form.zpt
@@ -41,7 +41,7 @@
            <form method="post" tal:attributes="action python: '%s/' % context.absolute_url()">

              <div class="ui-field-contain">
-                <label i18n:domain="ui" i18n:translate="" >Login</label>
+                <label i18n:domain="ui" i18n:translate="" >Username</label>
                <div><input autofocus type="text" name="__ac_name" value="" required=""></div>
              </div>
              <div class="ui-field-contain">

--- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_logout_translate_zuite/testPageLogout.zpt
+++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_logout_translate_zuite/testPageLogout.zpt
@@ -59,7 +59,12 @@

 <tr>
  <td>verifyTextPresent</td>
-  <td>denglu</td>
+  <td>turu jëfandikookat</td>
+  <td></td>
+</tr>
+ <tr>
+  <td>verifyElementPresent</td>
+  <td>//input[@value="denglu"]</td>
  <td></td>
 </tr>

@@ -96,7 +101,7 @@

 <tr>
  <td>verifyTextPresent</td>
-  <td>denglu</td>
+  <td>turu jëfandikookat</td>
  <td></td>
 </tr>


--- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_logout_zuite/testRenderjsLogout.zpt
+++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_logout_zuite/testRenderjsLogout.zpt
@@ -74,7 +74,7 @@

 <tr>
  <td>assertTextPresent</td>
-  <td>Login</td>
+  <td>Username</td>
  <td></td>
 </tr>
 <tr>
@@ -141,7 +141,7 @@
 </tr>
 <tr>
  <td>assertTextPresent</td>
-  <td>Login</td>
+  <td>Username</td>
  <td></td>
 </tr>

@@ -171,7 +171,7 @@

 <tr>
  <td>assertTextPresent</td>
-  <td>Login</td>
+  <td>Username</td>
  <td></td>
 </tr>
 <tr>

--- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_recover_password_zuite/testRenderjsRecoverPassword.zpt
+++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_recover_password_zuite/testRenderjsRecoverPassword.zpt
@@ -85,7 +85,7 @@

 <tr>
  <td>assertTextPresent</td>
-  <td>Login</td>
+  <td>Username</td>
  <td></td>
 </tr>
 <tr>
@@ -111,7 +111,7 @@
 </tr>
 <tr>
  <td>assertTextPresent</td>
-  <td>Login</td>
+  <td>Username</td>
  <td></td>
 </tr>
 <tr>
@@ -136,7 +136,7 @@
  <td></td>
 <tr>
  <td>assertTextPresent</td>
-  <td>Login</td>
+  <td>Username</td>
  <td></td>
 </tr>
 <tr>

--- a/bt5/erp5_web_renderjs_ui_test/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui_test/Base_createBaseLanguage.py
+++ b/bt5/erp5_web_renderjs_ui_test/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui_test/Base_createBaseLanguage.py
+# coding: utf-8
 context.Base_createUITestLanguages()
 param_dict = [
  { 'message': 'History', 'translation': 'lishi', 'language': 'wo'},
@@ -28,6 +29,7 @@ param_dict = [
  { 'message': 'All criterions (AND)', 'translation': 'fuheshuoyou', 'language': 'wo'},
  { 'message': 'Logout', 'translation': 'tuichu', 'language': 'wo'},
  { 'message': 'User', 'translation': 'yonghu', 'language': 'wo'},
+  { 'message': 'Username', 'translation': u'turu jëfandikookat', 'language': 'wo'},
  { 'message': 'Sort Editor', 'translation': 'paixubianyiqi', 'language': 'wo'},
  { 'message': 'Home', 'translation': 'zhuye', 'language': 'wo'},
  { 'message': 'State', 'translation': 'zhuangtai', 'language': 'wo'},

--- a/bt5/tiolive_base/SkinTemplateItem/portal_skins/tiolive_base/login_form.zpt
+++ b/bt5/tiolive_base/SkinTemplateItem/portal_skins/tiolive_base/login_form.zpt
@@ -22,7 +22,7 @@
                 tal:attributes="value request/came_from" />
          <fieldset>
            <div class="field">
-              <label for="name" class="required" i18n:translate="" i18n:domain="ui">Name</label>
+              <label for="name" class="required" i18n:translate="" i18n:domain="ui">Username</label>
              <div class="input"><input type="text" name="__ac_name" id="name" tal:attributes="value python: request.get('__ac_name') or ''" /></div>
              <p class="clear"></p>
            </div>

--- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/login_form.zpt
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/login_form.zpt
@@ -25,7 +25,7 @@
                 tal:attributes="value request/came_from" />
          <fieldset>
            <div class="field">
-              <label for="name" class="required" i18n:translate="" i18n:domain="ui">Name</label>
+              <label for="name" class="required" i18n:translate="" i18n:domain="ui">Username</label>
              <div class="input"><input type="text" name="__ac_name" id="name" /></div>
              <p class="clear"></p>
            </div>