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

Conflicts:
	askbot/cron/askbot_cron_job

5 files changed, 6 insertions, 7 deletions

diff --git a/askbot/conf/site_modes.py b/askbot/conf/site_modes.py
index a88103b4..efbbcca0 100644
--- a/askbot/conf/site_modes.py
+++ b/askbot/conf/site_modes.py
@@ -76,9 +76,9 @@ settings.register(
             "Bootstrap mode lowers reputation and certain badge "
             "thresholds, to values, more suitable "
             "for the smaller communities, "
-            "<strong>WARNING:</strong> your current value for "
+            "<strong>WARNING:</strong> your current values for "
             "Minimum reputation, "
-            "Bagde Settings and "
+            "Badge Settings and "
             "Vote Rules will "
             "be changed after you modify this setting."
         ),
diff --git a/askbot/cron/askbot_cron_job b/askbot/cron/askbot_cron_job
index 2886808b..04ba2303 100644
--- a/askbot/cron/askbot_cron_job
+++ b/askbot/cron/askbot_cron_job
@@ -9,7 +9,7 @@ PROJECT_PARENT_DIR=/path/to/dir_containing_askbot_site
 PROJECT_DIR_NAME=askbot_site
 
 export PYTHONPATH=$PROJECT_PARENT_DIR:$PYTHONPATH
-PROJECT_ROOT=$PROJECT_PARENT_DIR/$PROJECT_DIR_NAME
+PROJECT_ROOT=$PROJECT_DIR_NAME/$PROJECT_NAME
 
 #these are actual commands that are to be run
 python $PROJECT_ROOT/manage.py send_email_alerts
diff --git a/askbot/management/commands/send_email_alerts.py b/askbot/management/commands/send_email_alerts.py
index 8cb71859..8002ecbf 100644
--- a/askbot/management/commands/send_email_alerts.py
+++ b/askbot/management/commands/send_email_alerts.py
@@ -472,7 +472,7 @@ class Command(NoArgsCommand):
 
                 text += _(
                     '<p>Please remember that you can always <a '
-                    'hrefl"%(email_settings_link)s">adjust</a> frequency of the email updates or '
+                    'href="%(email_settings_link)s">adjust</a> frequency of the email updates or '
                     'turn them off entirely.<br/>If you believe that this message was sent in an '
                     'error, please email about it the forum administrator at %(admin_email)s.</'
                     'p><p>Sincerely,</p><p>Your friendly %(sitename)s server.</p>'
diff --git a/askbot/skins/default/templates/badges.html b/askbot/skins/default/templates/badges.html
index 668de4f8..ce76e76b 100644
--- a/askbot/skins/default/templates/badges.html
+++ b/askbot/skins/default/templates/badges.html
@@ -38,7 +38,7 @@ badges? Please, give us your <a href='{{feedback_faq_url}}'>feedback</a>
         <a style="cursor:default;" title="{% trans %}gold badge: the highest honor and is very rare{% endtrans %}" class="medal"><span class="badge1">&#9679;</span>&nbsp;{% trans %}gold{% endtrans %}</a>
     </p>
     <p>
-        {% trans %}Gold badge is the highest award in this community. To obtain it have to show 
+        {% trans %}Gold badge is the highest award in this community. To obtain it you have to show 
 profound knowledge and ability in addition to your active participation.{% endtrans %}
     </p>
     <p>
@@ -48,7 +48,7 @@ profound knowledge and ability in addition to your active participation.{% endtr
             class="medal"><span class="badge2">&#9679;</span>&nbsp;{% trans %}silver{% endtrans %}</a>
     </p>
     <p>
-        {% trans %}msgid "silver badge: occasionally awarded for the very high quality contributions{% endtrans %}
+        {% trans %}silver badge: occasionally awarded for the very high quality contributions{% endtrans %}
     </p>
     <p>
         <a style="cursor:default;" title="{% trans %}bronze badge: often given as a special honor{% endtrans %}" class="medal">
diff --git a/askbot/skins/default/templates/question/subscribe_by_email_prompt.html b/askbot/skins/default/templates/question/subscribe_by_email_prompt.html
index a9158143..6a77601c 100644
--- a/askbot/skins/default/templates/question/subscribe_by_email_prompt.html
+++ b/askbot/skins/default/templates/question/subscribe_by_email_prompt.html
@@ -8,7 +8,6 @@
 {% else %}
     <p>
         {{ answer.email_notify }}
-        <label>{% trans %}once you sign in you will be able to subscribe for any updates here{% endtrans %}</label>
         <label>{% trans %}<span class='strong'>Here</span> (once you log in) you will be able to sign up for the periodic email updates about this question.{% endtrans %}</label>
     </p>
 {% endif %}