From 0b9212c4b06dbdcb479e66ae7af467ed7540a689 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Sat, 21 Apr 2012 20:06:08 -0400 Subject: fixed url on a badges page --- askbot/skins/default/templates/badges.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/askbot/skins/default/templates/badges.html b/askbot/skins/default/templates/badges.html index 62627b05..668de4f8 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 %}
{% 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 feedback +badges? Please, give us your feedback {% endtrans %}

-- cgit v1.2.3-1-g7c22 From a0514ece9975b79b99c9e3ab8ca37b098763f123 Mon Sep 17 00:00:00 2001 From: Jim Tittsler Date: Mon, 23 Apr 2012 20:24:58 +1200 Subject: badges template text cleanup --- askbot/skins/default/templates/badges.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/askbot/skins/default/templates/badges.html b/askbot/skins/default/templates/badges.html index 62627b05..078f96c1 100644 --- a/askbot/skins/default/templates/badges.html +++ b/askbot/skins/default/templates/badges.html @@ -38,7 +38,7 @@ badges? Please, give us your feedback ● {% trans %}gold{% endtrans %}

- {% 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 %}

@@ -48,7 +48,7 @@ profound knowledge and ability in addition to your active participation.{% endtr class="medal">● {% trans %}silver{% endtrans %}

- {% 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 %}

-- cgit v1.2.3-1-g7c22 From 8777bb3355d7d4cbdbadff00413d045c1de85fbc Mon Sep 17 00:00:00 2001 From: Jim Tittsler Date: Fri, 27 Apr 2012 17:36:59 +1200 Subject: remove duplicate label for subscribe (once you log in) checkbox --- askbot/skins/default/templates/question/subscribe_by_email_prompt.html | 1 - 1 file changed, 1 deletion(-) 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 %}

{{ answer.email_notify }} -

{% endif %} -- cgit v1.2.3-1-g7c22 From 9beae392a36e9e9acd8e0b3cefb13680a57c727f Mon Sep 17 00:00:00 2001 From: Jim Tittsler Date: Fri, 27 Apr 2012 23:33:33 +1200 Subject: correct path to manage.py --- askbot/cron/askbot_cron_job | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3-1-g7c22 From 07735f865ae6be6c525f4dcaf2e52d8280f21ce0 Mon Sep 17 00:00:00 2001 From: Jim Tittsler Date: Sat, 28 Apr 2012 00:08:59 +1200 Subject: fix HREF= for "adjust" frequency of the email updates --- askbot/management/commands/send_email_alerts.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 += _( '

Please remember that you can always adjust frequency of the email updates or ' + 'href="%(email_settings_link)s">adjust frequency of the email updates or ' 'turn them off entirely.
If you believe that this message was sent in an ' 'error, please email about it the forum administrator at %(admin_email)s.

Sincerely,

Your friendly %(sitename)s server.

' -- cgit v1.2.3-1-g7c22 From f4a72b0cd2bd5eacdf4e0b466d7761f8d1a06ee7 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Sun, 29 Apr 2012 16:45:19 -0300 Subject: fixed the cached_db setting for the SESSION_ENGINE setting that is commented out --- askbot/setup_templates/settings.py | 2 +- askbot/setup_templates/settings.py.mustache | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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', -- cgit v1.2.3-1-g7c22 From 555118bf6059c0187a2329ec827ab0425830ebf9 Mon Sep 17 00:00:00 2001 From: Jim Tittsler Date: Tue, 1 May 2012 14:34:26 +1200 Subject: typo/spelling; plural --- askbot/conf/site_modes.py | 4 ++-- 1 file changed, 2 insertions(+), 2 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, " - "WARNING: your current value for " + "WARNING: your current values for " "Minimum reputation, " - "Bagde Settings and " + "Badge Settings and " "Vote Rules will " "be changed after you modify this setting." ), -- cgit v1.2.3-1-g7c22