Skip to content

erp5
erp5
Commit 655c06ec authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

Use consistent term in login forms 

We were using many different terms every for "username", this is an attempt to use a consistent term every where for login and a few other terms used for logging in and resetting password

See merge request !1164
parents a0b46aa4 e2e0a544
Pipeline #10075 failed with stage
    Hide whitespace changes
    Inline Side-by-side
    Showing with 44 additions and 22 deletions
    bt5/erp5_advanced_ecommerce/SkinTemplateItem/portal_skins/erp5_advanced_ecommerce/WebSection_viewTraditionalLogin.zpt
    View file @ 655c06ec
    ......@@ -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>
    ......
    bt5/erp5_advanced_ecommerce/SkinTemplateItem/portal_skins/erp5_advanced_ecommerce/WebSite_viewRegistrationDialog/your_reference.xml
    View file @ 655c06ec
    ......@@ -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>
    ......
    bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/ERP5Site_viewCredentialRecoveryLoginDialog.xml
    View file @ 655c06ec
    ......@@ -136,7 +136,7 @@
    </item>
    <item>
    <key> <string>title</string> </key>
    <value> <string>Send</string> </value>
    <value> <string>Recover your Account</string> </value>
    </item>
    <item>
    <key> <string>unicode_mode</string> </key>
    ......
    bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/login_form.zpt
    View file @ 655c06ec
    ......@@ -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>
    ......
    bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/login_form/ac_login.xml
    View file @ 655c06ec
    ......@@ -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>
    ......
    bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/WebSite_loginForm/ac_login.xml
    View file @ 655c06ec
    ......@@ -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>
    ......
    bt5/erp5_l10n_fr/MessageTranslationTemplateItem/fr/erp5_ui/translation.po
    View file @ 655c06ec
    ......@@ -14371,6 +14371,9 @@ msgstr "Utile pour les lignes intermédiaires. Par défaut, les ligne de feuille
    msgid "User"
    msgstr "Utilisateur"
    msgid "Username"
    msgstr "Nom d'utilisateur"
    msgid "User ${user} does not exist."
    msgstr "L'utilisateur ${user} n'existe pas."
    ......
    bt5/erp5_l10n_ja/MessageTranslationTemplateItem/ja/erp5_ui/translation.po
    View file @ 655c06ec
    ......@@ -5574,6 +5574,9 @@ msgstr "アップロード用モジュール"
    msgid "User"
    msgstr "ユーザ"
    msgid "Username"
    msgstr "ユーザ名"
    msgid "User Account Workflow"
    msgstr "ユーザアカウントワークフロー"
    ......
    bt5/erp5_l10n_pl_PL/MessageTranslationTemplateItem/pl/erp5_ui/translation.po
    View file @ 655c06ec
    ......@@ -3099,6 +3099,9 @@ msgstr "Klucz"
    msgid "User"
    msgstr "Użytkownik"
    msgid "Username"
    msgstr "Nazwa użytkownika"
    msgid "User Login"
    msgstr "Identyfikator użytkownika"
    ......
    bt5/erp5_l10n_pt-BR/MessageTranslationTemplateItem/pt-BR/erp5_ui/translation.po
    View file @ 655c06ec
    ......@@ -6483,6 +6483,9 @@ msgstr "Utilize este estado para fechar a conta. Nenhuma transação pode ser de
    msgid "User"
    msgstr "Usuário"
    msgid "Username"
    msgstr "Usuário"
    msgid "User ${user} does not exist."
    msgstr "Usuário ${user} não existe."
    ......
    bt5/erp5_l10n_zh/MessageTranslationTemplateItem/zh/erp5_ui/translation.po
    View file @ 655c06ec
    ......@@ -8428,6 +8428,9 @@ msgstr "使用值来为销售机会过滤资源列表"
    msgid "User"
    msgstr "用户"
    msgid "Username"
    msgstr "用户名"
    msgid "User Account Workflow"
    msgstr "用户账户流程"
    ......
    bt5/erp5_mobile/SkinTemplateItem/portal_skins/erp5_mobile_ui/login_form.zpt
    View file @ 655c06ec
    ......@@ -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">
    ......
    bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_viewRegistrationDialog/your_reference.xml
    View file @ 655c06ec
    ......@@ -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>
    ......
    bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/WebSite_viewResetPassword.zpt
    View file @ 655c06ec
    ......@@ -32,7 +32,7 @@
    <div><input autofocus name="password" type="password" value="" required=""></div>
    </div>
    <div class="ui-field-contain">
    <label data-i18n="Retype New Password">Retype New Password<span></span></label>
    <label data-i18n="New Password Confirmation">New Password Confirmation<span></span></label>
    <div><input name="password_confirm" type="password" value="" required=""></div>
    </div>
    <div class="ui-field-contain">
    ......
    bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/login_form.zpt
    View file @ 655c06ec
    ......@@ -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">
    ......
    bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_logout_translate_zuite/testPageLogout.zpt
    View file @ 655c06ec
    ......@@ -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>
    ......
    bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_logout_zuite/testRenderjsLogout.zpt
    View file @ 655c06ec
    ......@@ -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>
    ......
    bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_recover_password_zuite/testRenderjsRecoverPassword.zpt
    View file @ 655c06ec
    ......@@ -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>
    ......
    bt5/erp5_web_renderjs_ui_test/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui_test/Base_createBaseLanguage.py
    View file @ 655c06ec
    # 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'},
    ......
    bt5/tiolive_base/SkinTemplateItem/portal_skins/tiolive_base/login_form.zpt
    View file @ 655c06ec
    ......@@ -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>
    ......
    product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PasswordTool_viewEmailPassword.xml
    View file @ 655c06ec
    ......@@ -132,7 +132,7 @@
    </item>
    <item>
    <key> <string>title</string> </key>
    <value> <string>Validate</string> </value>
    <value> <string>Recover your Account</string> </value>
    </item>
    <item>
    <key> <string>unicode_mode</string> </key>
    ......
    product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PasswordTool_viewResetPassword/password_confirm.xml
    View file @ 655c06ec
    ......@@ -241,7 +241,7 @@
    </item>
    <item>
    <key> <string>title</string> </key>
    <value> <string>Retype New Password</string> </value>
    <value> <string>New Password Confirmation</string> </value>
    </item>
    <item>
    <key> <string>truncate</string> </key>
    ......
    product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/login_form.zpt
    View file @ 655c06ec
    ......@@ -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>
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment
    GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7