Commit cf3dccbe authored by Jérome Perrin's avatar Jérome Perrin

*: 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.
parent 1fba1fb6
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<div class="login_side"> <div class="login_side">
<span class="group_title" i18n:translate="" i18n:domain="ui"> Login </span> <span class="group_title" i18n:translate="" i18n:domain="ui"> Login </span>
<div class="field"> <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 ''" /> <input type="text" name="__ac_name" id="name" tal:attributes="value python: request.get('__ac_name') or ''" />
<p class="clear"></p> <p class="clear"></p>
</div> </div>
......
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>User Login</string> </value> <value> <string>Username</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
tal:attributes="value request/came_from" /> tal:attributes="value request/came_from" />
<fieldset> <fieldset>
<div class="field"> <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 class="input"><input type="text" name="__ac_name" id="name" /></div>
<p class="clear"></p> <p class="clear"></p>
</div> </div>
......
...@@ -271,7 +271,7 @@ ...@@ -271,7 +271,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Login or Email</string> </value> <value> <string>Username or Email</string> </value>
</item> </item>
<item> <item>
<key> <string>unicode</string> </key> <key> <string>unicode</string> </key>
......
...@@ -273,7 +273,7 @@ ...@@ -273,7 +273,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Login</string> </value> <value> <string>Username</string> </value>
</item> </item>
<item> <item>
<key> <string>unicode</string> </key> <key> <string>unicode</string> </key>
......
...@@ -44,7 +44,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ...@@ -44,7 +44,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
<fieldset class="left fielset_login"> <fieldset class="left fielset_login">
<div class="field"> <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 class="input"><input type="text" name="__ac_name" id="name" /></div>
</div> </div>
<div class="field"> <div class="field">
......
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>User Login</string> </value> <value> <string>Username</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<form method="post" tal:attributes="action python: '%s/' % context.absolute_url()"> <form method="post" tal:attributes="action python: '%s/' % context.absolute_url()">
<div class="ui-field-contain"> <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><input autofocus type="text" name="__ac_name" value="" required=""></div>
</div> </div>
<div class="ui-field-contain"> <div class="ui-field-contain">
......
...@@ -59,7 +59,12 @@ ...@@ -59,7 +59,12 @@
<tr> <tr>
<td>verifyTextPresent</td> <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> <td></td>
</tr> </tr>
...@@ -96,7 +101,7 @@ ...@@ -96,7 +101,7 @@
<tr> <tr>
<td>verifyTextPresent</td> <td>verifyTextPresent</td>
<td>denglu</td> <td>turu jëfandikookat</td>
<td></td> <td></td>
</tr> </tr>
......
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
<tr> <tr>
<td>assertTextPresent</td> <td>assertTextPresent</td>
<td>Login</td> <td>Username</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
</tr> </tr>
<tr> <tr>
<td>assertTextPresent</td> <td>assertTextPresent</td>
<td>Login</td> <td>Username</td>
<td></td> <td></td>
</tr> </tr>
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
<tr> <tr>
<td>assertTextPresent</td> <td>assertTextPresent</td>
<td>Login</td> <td>Username</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
......
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
<tr> <tr>
<td>assertTextPresent</td> <td>assertTextPresent</td>
<td>Login</td> <td>Username</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
</tr> </tr>
<tr> <tr>
<td>assertTextPresent</td> <td>assertTextPresent</td>
<td>Login</td> <td>Username</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
<td></td> <td></td>
<tr> <tr>
<td>assertTextPresent</td> <td>assertTextPresent</td>
<td>Login</td> <td>Username</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
......
# coding: utf-8
context.Base_createUITestLanguages() context.Base_createUITestLanguages()
param_dict = [ param_dict = [
{ 'message': 'History', 'translation': 'lishi', 'language': 'wo'}, { 'message': 'History', 'translation': 'lishi', 'language': 'wo'},
...@@ -28,6 +29,7 @@ param_dict = [ ...@@ -28,6 +29,7 @@ param_dict = [
{ 'message': 'All criterions (AND)', 'translation': 'fuheshuoyou', 'language': 'wo'}, { 'message': 'All criterions (AND)', 'translation': 'fuheshuoyou', 'language': 'wo'},
{ 'message': 'Logout', 'translation': 'tuichu', 'language': 'wo'}, { 'message': 'Logout', 'translation': 'tuichu', 'language': 'wo'},
{ 'message': 'User', 'translation': 'yonghu', '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': 'Sort Editor', 'translation': 'paixubianyiqi', 'language': 'wo'},
{ 'message': 'Home', 'translation': 'zhuye', 'language': 'wo'}, { 'message': 'Home', 'translation': 'zhuye', 'language': 'wo'},
{ 'message': 'State', 'translation': 'zhuangtai', 'language': 'wo'}, { 'message': 'State', 'translation': 'zhuangtai', 'language': 'wo'},
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
tal:attributes="value request/came_from" /> tal:attributes="value request/came_from" />
<fieldset> <fieldset>
<div class="field"> <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> <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> <p class="clear"></p>
</div> </div>
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
tal:attributes="value request/came_from" /> tal:attributes="value request/came_from" />
<fieldset> <fieldset>
<div class="field"> <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 class="input"><input type="text" name="__ac_name" id="name" /></div>
<p class="clear"></p> <p class="clear"></p>
</div> </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