Merge branch 'master' of github.com:ASKBOT/askbot-devel

6 files changed, 18 insertions, 16 deletions

diff --git a/askbot/conf/ldap.py b/askbot/conf/ldap.py
index 7d384516..0b50352d 100644
--- a/askbot/conf/ldap.py
+++ b/askbot/conf/ldap.py
@@ -83,7 +83,7 @@ settings.register(
         default = '',
         help_text = _(
             'Usually base DN mirrors domain name of your organization, '
-            'e.g. "dn=example,dn=com" when your site url is "example.com".'
+            'e.g. "dn=example,dn=com" when your site url is "example.com". '
             'This value is the "root" address of your LDAP directory.'
         )
     )
diff --git a/askbot/conf/login_providers.py b/askbot/conf/login_providers.py
index beb56a72..f4a5a24d 100644
--- a/askbot/conf/login_providers.py
+++ b/askbot/conf/login_providers.py
@@ -113,7 +113,9 @@ settings.register(
         'SIGNIN_CUSTOM_OPENID_ENDPOINT',
         default='http://example.com',
         description=_('Custom OpenID endpoint'),
-        help_text=_('Important: with the "username" mode must have a %%(username)s placeholder e.g. http://example.com/%%(username)s/'),
+        help_text=_('Important: with the "username" mode there must be a '
+                    '%%(username)s placeholder e.g. '
+                    'http://example.com/%%(username)s/'),
     )
 )
 
diff --git a/askbot/conf/sidebar_question.py b/askbot/conf/sidebar_question.py
index fbd6b19e..4bdedcee 100644
--- a/askbot/conf/sidebar_question.py
+++ b/askbot/conf/sidebar_question.py
@@ -76,7 +76,7 @@ settings.register(
         description = _('Custom sidebar header'),
         default = '',
         help_text = _(
-                    'Use this area to enter content at the TOP of the sidebar'
+                    'Use this area to enter content at the TOP of the sidebar '
                     'in HTML format. When using this option '
                     '(as well as the sidebar footer), please '
                     'use the HTML validation service to make sure that '
diff --git a/askbot/conf/words.py b/askbot/conf/words.py
index be4eb191..5e12b111 100644
--- a/askbot/conf/words.py
+++ b/askbot/conf/words.py
@@ -224,7 +224,7 @@ settings.register(
         WORDS,
         'WORDS_QUESTIONS_COUNTABLE_FORMS',
         default='question\nquestions',
-        description=_('Countable plural forms for "queston"'),
+        description=_('Countable plural forms for "question"'),
         help_text=_('Enter one form per line, pay attention')
     )
 )
diff --git a/askbot/forms.py b/askbot/forms.py
index e7e869cd..1bc7aa89 100644
--- a/askbot/forms.py
+++ b/askbot/forms.py
@@ -511,8 +511,8 @@ class SummaryField(forms.CharField):
         self.label = _('update summary:')
         self.help_text = _(
             'enter a brief summary of your revision (e.g. '
-            'fixed spelling, grammar, improved style, this '
-            'field is optional)'
+            'fixed spelling, grammar, improved style...), this '
+            'field is optional'
         )
 
 class EditorForm(forms.Form):
diff --git a/askbot/templates/user_profile/user_edit.html b/askbot/templates/user_profile/user_edit.html
index fa9ecfdd..7b819a8e 100644
--- a/askbot/templates/user_profile/user_edit.html
+++ b/askbot/templates/user_profile/user_edit.html
@@ -36,15 +36,15 @@
                     <th></th>
                 </tr>
                 <tr>
-                <td>{% trans %}Screen Name{% endtrans %}:</td>
-                <td>
-                {% if settings.EDITABLE_SCREEN_NAME %}
-                    {{ form.username }}
-                    <span class="form-error"> {{ form.username.errors }} </span></td>
-                {% else %}
-                    {{ view_user.username|escape }}
-                {% endif %}
-                </td>
+                    <td>{% trans %}Screen Name{% endtrans %}:</td>
+                    <td>
+                        {% if settings.EDITABLE_SCREEN_NAME %}
+                            {{ form.username }}
+                            <span class="form-error"> {{ form.username.errors }} </span>
+                        {% else %}
+                            {{ view_user.username|escape }}
+                        {% endif %}
+                    </td>
                 </tr>
                 <tr>
                     <td>
@@ -118,7 +118,7 @@
             $().ready(function(){
                 $("#nav_profile").attr('className',"on");
                 $("#cancel").bind('click', function(){history.go(-1);})
-            });     
+            });
         </script>
         {% block userjs %}
         {% endblock %}