diff options
-rw-r--r-- | askbot/conf/site_modes.py | 4 | ||||
-rw-r--r-- | askbot/cron/askbot_cron_job | 2 | ||||
-rw-r--r-- | askbot/management/commands/send_email_alerts.py | 2 | ||||
-rw-r--r-- | askbot/setup_templates/settings.py | 2 | ||||
-rw-r--r-- | askbot/setup_templates/settings.py.mustache | 2 | ||||
-rw-r--r-- | askbot/skins/default/templates/badges.html | 2 | ||||
-rw-r--r-- | askbot/skins/default/templates/question/subscribe_by_email_prompt.html | 1 |
7 files changed, 7 insertions, 8 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 38bf0337..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=$PYTHONPATH/$PROJECT_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/setup_templates/settings.py b/askbot/setup_templates/settings.py index f9920bca..191d13f3 100644 --- a/askbot/setup_templates/settings.py +++ b/askbot/setup_templates/settings.py @@ -183,7 +183,7 @@ CACHE_TIMEOUT = 6000 CACHE_PREFIX = 'askbot' #make this unique CACHE_MIDDLEWARE_ANONYMOUS_ONLY = True #If you use memcache you may want to uncomment the following line to enable memcached based sessions -#SESSION_ENGINE = 'django.contrib.sessions.backends.cache_db' +#SESSION_ENGINE = 'django.contrib.sessions.backends.cached_db' AUTHENTICATION_BACKENDS = ( 'django.contrib.auth.backends.ModelBackend', diff --git a/askbot/setup_templates/settings.py.mustache b/askbot/setup_templates/settings.py.mustache index e39231f0..3287fb18 100644 --- a/askbot/setup_templates/settings.py.mustache +++ b/askbot/setup_templates/settings.py.mustache @@ -182,7 +182,7 @@ CACHE_TIMEOUT = 6000 CACHE_PREFIX = 'askbot' #make this unique CACHE_MIDDLEWARE_ANONYMOUS_ONLY = True #If you use memcache you may want to uncomment the following line to enable memcached based sessions -#SESSION_ENGINE = 'django.contrib.sessions.backends.cache_db' +#SESSION_ENGINE = 'django.contrib.sessions.backends.cached_db' AUTHENTICATION_BACKENDS = ( 'django.contrib.auth.backends.ModelBackend', diff --git a/askbot/skins/default/templates/badges.html b/askbot/skins/default/templates/badges.html index 078f96c1..ce76e76b 100644 --- a/askbot/skins/default/templates/badges.html +++ b/askbot/skins/default/templates/badges.html @@ -7,7 +7,7 @@ {% trans %}Community gives you awards for your questions, answers and votes.{% endtrans %}<br/> {% trans %}Below is the list of available badges and number of times each type of badge has been awarded. Have ideas about fun -badges? Please, give us your <a href='%(feedback_faq_url)s'>feedback</a> +badges? Please, give us your <a href='{{feedback_faq_url}}'>feedback</a> {% endtrans %} </p> <div id="medalList"> 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 %} |