Commits

Anonymous committed 30ff29e

[svn r75] fix spelling (issue #32). thanks to jnoehr

Comments (0)

Files changed (12)

django_authopenid/forms.py

                         username__exact = self.cleaned_data['username']
                 )
             except User.DoesNotExist:
-                raise forms.ValidationError(_("This username don't exist \
-                    in database. Please choose another."))
+                raise forms.ValidationError(_("This username does not exist \
+                    in our database. Please choose another."))
             return self.cleaned_data['username']
 
     def clean_password(self):
                     password=self.cleaned_data['password']
             )
             if self.user_cache is None:
-                raise forms.ValidationError(_("Please enter a correct \
+                raise forms.ValidationError(_("Please enter a valid \
                     username and password. Note that both fields are \
                     case-sensitive."))
             elif self.user_cache.is_active == False:
                     password = self.cleaned_data['password']
             )
             if self.user_cache is None:
-                raise forms.ValidationError(_("Please enter a correct \
+                raise forms.ValidationError(_("Please enter a valid \
                     username and password. Note that both fields are \
                     case-sensitive."))
             elif self.user_cache.is_active == False:
     def clean_oldpw(self):
         """ test old password """
         if not self.user.check_password(self.cleaned_data['oldpw']):
-            raise forms.ValidationError(_("Old password is wrong. \
-                    Please enter a valid password."))
+            raise forms.ValidationError(_("Old password is incorrect. \
+                    Please enter the correct password."))
         return self.cleaned_data['oldpw']
     
     def clean_password2(self):
                 'password2' in self.cleaned_data and \
            self.cleaned_data['password1'] == self.cleaned_data['password2']:
             return self.cleaned_data['password2']
-        raise forms.ValidationError(_("new passwords do not match each other"))
+        raise forms.ValidationError(_("new passwords do not match"))
         
         
 class ChangeemailForm(forms.Form):

django_authopenid/templates/authopenid/changeopenid.html

 {% load i18n %}
 
 {% block content %}
-<h4 class="headblue">{% trans "Account: change openid url" %}</h4>
+<h4 class="headblue">{% trans "Account: change OpenID URL" %}</h4>
 
-<p>{% blocktrans %}This is where you can change your openid url used to connect to friendsnippets. Make sure you remember it!{% endblocktrans %}</p>
+<p>{% blocktrans %}This is where you can change your OpenID URL. Make sure you remember it!{% endblocktrans %}</p>
 {% if form.errors %}
 <p class="errors">{% trans "Please correct errors below:" %}<br />
 	{% if form.openid_url.errors %} 
 <div class="aligned">
 	<form action="." method="post" accept-charset="utf-8">
 
-		<div id="form-row"><label for="id_openid_url">{% trans "OpenID url:" %}</label>{{ form.openid_url }}</div>
-        <p><input type="submit" value="{% trans "Change openid" %}"></p>
+		<div id="form-row"><label for="id_openid_url">{% trans "OpenID URL:" %}</label>{{ form.openid_url }}</div>
+        <p><input type="submit" value="{% trans "Change OpenID" %}"></p>
 
 	</form>
 	</div>

django_authopenid/templates/authopenid/changepw.html

 <div class="aligned">
 	<form action="{{ path }}" method="post" accept-charset="utf-8">
 
-		<div id="form-row"><label for="id_oldpw">{% trans "Old password" %}</label>{{ form.oldpw }}</div>
+		<div id="form-row"><label for="id_oldpw">{% trans "Current password" %}</label>{{ form.oldpw }}</div>
 		<div id="form-row"><label for="id_password1">{% trans "New password" %}</label>{{ form.password1 }}</div>
 		<div id="form-row"><label for="id_password2">{% trans "New password again" %}</label>{{ form.password2 }}</div>
         <p><input type="submit" value="{% trans "Change password" %}"></p>

django_authopenid/templates/authopenid/complete.html

 	<div id="completetxt">
 	<h1>{% trans "Your OpenID is verified! " %}</h1>
 	{% blocktrans %}
-	<p>Your OpenID can now be associated with a new or existing membership. You can change the association later in your preferences</p>
+	<p>Your OpenID can now be associated with a new or existing membership. You can change the association later in your preferences.</p>
 	{% endblocktrans %}
 	<br /><br />
 	<h2>{% trans "Associate your OpenID" %}</h2>
             {{ form.next }}
 			<fieldset>
 				<legend>{% trans "A new account" %}</legend>
-				<div class="form-row"><label for "id_username">{% trans "Screen name" %}</label><br />{{ form1.username }}</div>
+				<div class="form-row"><label for "id_username">{% trans "Username" %}</label><br />{{ form1.username }}</div>
 				<div class="form-row"><label for "id_email">{% trans "Email" %}</label><br />{{ form1.email }}</div>
-				<div class="submit-row"><input type="submit" name="bnewaccount" value="CREATE MY ACCOUNT"></div>
+				<div class="submit-row"><input type="submit" name="bnewaccount" value="Create account"></div>
 				<hr class="clear" />
             	</fieldset>
 		</form>
             {{ form.next }}
 			<fieldset>
 				<legend>{% trans "An exisiting account" %}</legend>
-				<div class="form-row"><label for "id_username">{% trans "Screen name" %}</label><br />{{ form2.username }}</div>
+				<div class="form-row"><label for "id_username">{% trans "Username" %}</label><br />{{ form2.username }}</div>
 				<div class="form-row"><label for "id_passwordl">{% trans "Password" %}</label><br />{{ form2.password }}</div>
-				<div class="submit-row"><input type="submit" name="bverify" value="VERIFY"></div>
+				<div class="submit-row"><input type="submit" name="bverify" value="Verify"></div>
 			</fieldset>
 		</form>
 	</div>

django_authopenid/templates/authopenid/confirm_email.txt

 Password: {{ password }}
 
 
-You could sign in  with this url:
+You may sign in here:
 {{ site_url }}signin/
 
 

django_authopenid/templates/authopenid/delete.html

 	<form action="." method="post" accept-charset="utf-8">
 
         <div id="form-row"> {{ form.confirm }} {% trans "I am sure I want to delete my account." %}</div>
-        <div id="form-row"><label for="id_password">{% trans "Password/ OpenID URL" %}</label>{{ form.password }} {% trans "(required for your security)" %}</div>
+        <div id="form-row"><label for="id_password">{% trans "Password/OpenID URL" %}</label>{{ form.password }} {% trans "(required for your security)" %}</div>
 
-        <p><input type="submit" value="{% trans "delete account forever" %}"></p>
+        <p><input type="submit" value="{% trans "Delete account permanently" %}"></p>
 
 	</form>
 	</div>

django_authopenid/templates/authopenid/sendpw.html

 {% block content %}
 <h4 class="headblue">{% trans "Account: Send a new password" %}</h4>
 
-<p class="settings-descr">{% blocktrans %}Lost your password ? Here you can ask to reset your password. Enter the username you use  and you will get a confirm mail with your new password. This new password will be activated only after you clicked on the link you will find in the email{% endblocktrans %}</p>
+<p class="settings-descr">{% blocktrans %}Lost your password ? Here you can ask to reset your password. Enter the username you use  and you will get a confirmation email with your new password. This new password will be activated only after you have clicked on the link in the email.{% endblocktrans %}</p>
 {% if form.errors %}
 <p class="errors">{% trans "Please correct errors below:" %}<br />
 	{% if form.username.errors %} 

django_authopenid/templates/authopenid/sendpw_email.txt

-Someone ask to reset your password on {{ site_url }}. 
-If it's not you, please ignore this email. 
+Someone has requested to reset your password on {{ site_url }}.
+If this is not you, it is safe to ignore this email.
 
 Your new account details are:
 
 Username: {{ username }}
 New password: {{ password }}
 
-To confirm reset of your password go on this url:
+To confirm reset of your password go to this address:
 {{ site_url }}{{ url_confirm }}?key={{ confirm_key }}
 
-See you,
+Regards,
 
+

django_authopenid/templates/authopenid/settings.html

 	{% endif %}
     <h5>{% trans "Account" %}</h5>
 	<dl>
-        <dt>» <a href="{{ settings_path }}{% trans "password/" %}">{% trans "change password" %}</a></dt>
-        <dd>{% trans "Give your  account a new password." %}</dd>
-        <dt>» <a href="{{ settings_path }}{% trans "email/" %}">{% trans "change email" %}</a></dt>
-        <dd>{% trans "Add or update the email address associated with your account." %}</dd>
+        <dt>» <a href="{{ settings_path }}{% trans "password/" %}">{% trans "Change password" %}</a></dt>
+        <dd>{% trans "Change the password for your account." %}</dd>
+        <dt>» <a href="{{ settings_path }}{% trans "email/" %}">{% trans "Change email" %}</a></dt>
+        <dd>{% trans "Update the email address associated with your account." %}</dd>
         {% if is_openid %}
-        <dt>» <a href="{{ settings_path }}{% trans "openid/" %}">{% trans "change openid url" %}</a></dt>
-        <dd>{% trans "Change openid associated to your account" %}</dd>
+        <dt>» <a href="{{ settings_path }}{% trans "openid/" %}">{% trans "Change OpenID URL" %}</a></dt>
+        <dd>{% trans "Change OpenID associated with your account." %}</dd>
         {% endif %}
         
-        <dt>» <a href="{{ settings_path }}{% trans "delete/" %}">{% trans "delete account" %}</a></dt>
-        <dd>{% trans "Erase your username and all your data from website" %}</dd>
+        <dt>» <a href="{{ settings_path }}{% trans "delete/" %}">{% trans "Delete account" %}</a></dt>
+        <dd>{% trans "Erase your username and all your data from this site." %}</dd>
 	</dl>
 </div>
 {% endblock %}

django_authopenid/templates/authopenid/signin.html

 <form name="fopenid" action="{{ action }}" method="post">
     {{ form2.next }}
 	<fieldset>
-		<legend>{% trans "Sign In Using Your OpenID" %}</legend>
+		<legend>{% trans "Sign In Using Your OpenID URL" %}</legend>
         <div class="form-row"><label for="id_openid_ul">{% trans "OpenId URL :" %}</label><br />{{ form2.openid_url }}</div>
-        <div class="submit-row "><input name="bsignin" type="submit" value="{% trans "Sign in with OPENID" %}"></div>
+        <div class="submit-row "><input name="bsignin" type="submit" value="{% trans "Sign in with OpenID" %}"></div>
 		
 	</fieldset>
 </form>	

django_authopenid/templates/authopenid/signup.html

 <div class="jointxt">
     {% blocktrans %}
     <h1>Join</h1>
-    <p>There are two ways to join: with an email + screen name, or with OpenID.<br />Enter information only for the type of sign up you want to do.</p>
+    <p>There are two ways to join: with an email + username, or with OpenID.<br />Enter information only for the type of sign up you want to do.</p>
     {% endblocktrans %}
 	<br />
 	<br />
     {% endif %}
 </div>
     <form action="{{ action }}" method="post" accept-charset="utf-8">	
-        <div class="form-row"><label for="id_username">{% trans "Choose a Screen Name:" %}</label><br />{{ form.username }}</div>
+        <div class="form-row"><label for="id_username">{% trans "Choose a Username:" %}</label><br />{{ form.username }}</div>
 
         <div class="form-row"><label for="id_email">{% trans "Enter Your Email Address:" %}</label><br />{{ form.email }}</div>
         <div class="form-row"><label for="id_password1">{% trans "Choose a Password:" %}</label><br />{{ form.password1 }}</div>
         <div class="form-row"><label for="id_password2">{% trans "Confirm Your Password:" %}</label><br />{{ form.password2 }}</div>
 
-        <div class="submit-row"><input type="submit" value="{% trans "JOIN FREE" %}" /></div>
+        <div class="submit-row"><input type="submit" value="{% trans "Sign up" %}" /></div>
         <br />
     </form>
 <br />
     <h2 class="signup">{% trans "OpenID Signup" %}</h2>
     <form name="fopenid" action="{{ action_signin }}" method="post">
         <div class="form-row">{{ form2.openid_url }}</div>
-        <div class="submit-row "><input name="bsignin" type="submit" value="{% trans "Sign in with OPENID" %}"></div>
+        <div class="submit-row "><input name="bsignin" type="submit" value="{% trans "Sign in with OpenID" %}"></div>
     </form>
 {% endblock %}

django_authopenid/views.py

         return on_success(request, openid_response.identity_url,
                 openid_response)
     elif openid_response.status == CANCEL:
-        return on_failure(request, 'The request was cancelled')
+        return on_failure(request, 'The request was canceled')
     elif openid_response.status == FAILURE:
         return on_failure(request, openid_response.message)
     elif openid_response.status == SETUP_NEEDED:
         )
     except:
         return emailopenid_failure(request, 
-                _("No openid % associated in our database" % identity_url))
+                _("No OpenID %s found associated in our database" % identity_url))
 
     if uassoc.user.username != request.user.username:
         return emailopenid_failure(request, 
-                _("The openid %s isn't associated to current logged user" % 
+                _("The OpenID %s isn't associated to current user logged in" % 
                     identity_url))
     
     new_email = request.session.get('new_email', '')
             uassoc.save()
     elif uassoc.user.username != request.user.username:
         return changeopenid_failure(request, 
-                _('This openid is already associated with another account.'))
+                _('This OpenID is already associated with another account.'))
 
     request.session['openids'] = []
     request.session['openids'].append(openid_)
 
-    msg = _("Openid %s associated with your account." % identity_url) 
+    msg = _("OpenID %s is now associated with your account." % identity_url) 
     redirect = "%s?msg=%s" % (
             reverse('user_account_settings'), 
             urlquote_plus(msg))
         )
     except:
         return deleteopenid_failure(request,
-                _("No openid % associated in our database" % identity_url))
+                _("No OpenID %s found associated in our database" % identity_url))
 
     if uassoc.user.username == user_.username:
         user_.delete()
         return signout(request)
     else:
         return deleteopenid_failure(request,
-                _("The openid %s isn't associated to current logged user" % 
+                _("The OpenID %s isn't associated to current user logged in" % 
                     identity_url))
     
     msg = _("Account deleted.") 
             uqueue.save()
             # send email 
             current_domain = Site.objects.get_current().domain
-            subject = _("Request for a new password")
+            subject = _("Request for new password")
             message_template = loader.get_template(
                     'authopenid/sendpw_email.txt')
             message_context = Context({ 
             message = message_template.render(message_context)
             send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, 
                     [form.user_cache.email])
-            msg = _("A new password has been sent to your email")
+            msg = _("A new password has been sent to your email address.")
     else:
         form = EmailPasswordForm()
         
                 confirm_key__exact=confirm_key
         )
     except:
-        msg = _("Can not change password. Confirmation key '%s'\
-                isn't registered." % confirm_key) 
+        msg = _("Could not change password. Confirmation key '%s'\
+                is not registered." % confirm_key) 
         redirect = "%s?msg=%s" % (
                 reverse('user_sendpw'), urlquote_plus(msg))
         return HttpResponseRedirect(redirect)
     user_.set_password(uqueue.new_password)
     user_.save()
     uqueue.delete()
-    msg = _("Password changed for %s. You could now sign-in" % 
+    msg = _("Password changed for %s. You may now sign in." % 
             user_.username) 
     redirect = "%s?msg=%s" % (reverse('user_signin'), 
                                         urlquote_plus(msg))