Commit 655c06ec authored by Jérome Perrin's avatar Jérome Perrin

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
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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."
......
......@@ -5574,6 +5574,9 @@ msgstr "アップロード用モジュール"
msgid "User"
msgstr "ユーザ"
msgid "Username"
msgstr "ユーザ名"
msgid "User Account Workflow"
msgstr "ユーザアカウントワークフロー"
......
......@@ -3099,6 +3099,9 @@ msgstr "Klucz"
msgid "User"
msgstr "Użytkownik"
msgid "Username"
msgstr "Nazwa użytkownika"
msgid "User Login"
msgstr "Identyfikator użytkownika"
......
......@@ -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."
......
......@@ -8428,6 +8428,9 @@ msgstr "使用值来为销售机会过滤资源列表"
msgid "User"
msgstr "用户"
msgid "Username"
msgstr "用户名"
msgid "User Account Workflow"
msgstr "用户账户流程"
......
......@@ -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">
......
......@@ -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>
......
......@@ -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">
......
......@@ -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">
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
# 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'},
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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