From: Javyer Der Derian Date: Thu, 17 Apr 2014 21:58:12 +0000 (-0300) Subject: Merge pull request #40 from jasimmk/master X-Git-Tag: live~23 X-Git-Url: https://git.openstreetmap.org/osqa.git/commitdiff_plain/d273a5bb2bdf640687ecb431be28e5abc21b80ca?hp=9417d3254858438fe5fa59160bfd9edef1332c90 Merge pull request #40 from jasimmk/master Making requirements to Django 1.6 --- diff --git a/forum/actions/user.py b/forum/actions/user.py index 5a6aba5..a9ec71a 100644 --- a/forum/actions/user.py +++ b/forum/actions/user.py @@ -1,6 +1,7 @@ from django.utils.translation import ungettext, ugettext as _ from django.core.urlresolvers import reverse from django.db.models import F +from django.contrib import messages from forum.models.action import ActionProxy from forum.models import Award, Badge, ValidationHash, User from forum import settings, REQUEST_HOLDER @@ -252,4 +253,4 @@ class SuspendAction(ActionProxy): return _("%(user)s suspended %(users)s %(suspension)s: %(msg)s") % { 'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)), 'users': self.affected_links(viewer), 'suspension': suspension, 'msg': self.extra.get('publicmsg', _('Bad behaviour')) - } \ No newline at end of file + } diff --git a/forum/skins/default/templates/auth/mail_validation.html b/forum/skins/default/templates/auth/mail_validation.html index 82029d6..7e6a2f3 100644 --- a/forum/skins/default/templates/auth/mail_validation.html +++ b/forum/skins/default/templates/auth/mail_validation.html @@ -13,17 +13,17 @@ {% htmlcontent notifications/base.html %}

{% trans "Please use the following link to help us verify your email address:" %}

-

{% trans "Validate my email address" %}

+

{% trans "Validate my email address" %}

{% trans "If the above link is not clickable, copy and paste this url into your web browser's address bar:" %}

-

{% fullurl auth_validate_email user=recipient.id,code=validation_code %}

+

{% fullurl "auth_validate_email" user=recipient.id code=validation_code %}

{% endhtmlcontent %} {% textcontent notifications/base_text.html %} {% trans "Copy and paste this url into your web browser's address bar to help us verify your email address:" %} -{% fullurl auth_validate_email user=recipient.id,code=validation_code %} +{% fullurl "auth_validate_email" user=recipient.id code=validation_code %} {% endtextcontent %} {% endemail %} diff --git a/forum/skins/default/templates/auth/temp_login_email.html b/forum/skins/default/templates/auth/temp_login_email.html index 32ade89..3c5707f 100644 --- a/forum/skins/default/templates/auth/temp_login_email.html +++ b/forum/skins/default/templates/auth/temp_login_email.html @@ -14,17 +14,17 @@

{% blocktrans %}The following link grants you a one time access to your account at {{ app_name }}.{% endblocktrans %}

-

{% trans "Go to your account" %}

+

{% trans "Go to your account" %}

{% trans "If the above link is not clickable, copy and paste this url into your web browser's address bar:" %}

-

{% fullurl auth_tempsignin user=recipient.id,code=temp_login_code %}

+

{% fullurl "auth_tempsignin" user=recipient.id code=temp_login_code %}

{% endhtmlcontent %} {% textcontent notifications/base_text.html %} {% blocktrans %}The following url grants you a one time access to your account at {{ app_name }}.{% endblocktrans %} -{% fullurl auth_tempsignin user=recipient.id,code=temp_login_code %} +{% fullurl "auth_tempsignin" user=recipient.id code=temp_login_code %} {% endtextcontent %} {% endemail %} diff --git a/forum/views/meta.py b/forum/views/meta.py index a47cf1d..e7d1515 100644 --- a/forum/views/meta.py +++ b/forum/views/meta.py @@ -37,7 +37,7 @@ def static(request, title, content): def media(request, skin, path): response = serve(request, "%s/media/%s" % (skin, path), document_root=os.path.join(os.path.dirname(os.path.dirname(__file__)), 'skins').replace('\\', '/')) - content_type = response['Content-Type'] + content_type = response.get('Content-Type', '') if ('charset=' not in content_type): if (content_type.startswith('text') or content_type=='application/x-javascript'): content_type += '; charset=utf-8' diff --git a/forum/views/readers.py b/forum/views/readers.py index 669eaf3..a8b94e9 100644 --- a/forum/views/readers.py +++ b/forum/views/readers.py @@ -8,6 +8,7 @@ from django.core.paginator import Paginator, EmptyPage, InvalidPage from django.template import RequestContext from django import template from django.utils.html import * +from django.utils.http import urlquote from django.db.models import Q, Count from django.utils.translation import ugettext as _ from django.core.urlresolvers import reverse diff --git a/forum_modules/akismet/startup.py b/forum_modules/akismet/startup.py index 2387e05..c050754 100644 --- a/forum_modules/akismet/startup.py +++ b/forum_modules/akismet/startup.py @@ -1,5 +1,4 @@ import json -import loggin from django.utils.translation import ugettext as _ from django.http import HttpResponse, HttpResponseRedirect diff --git a/forum_modules/robotstxt/urls.py b/forum_modules/robotstxt/urls.py index 5f74a0a..ddcac3b 100644 --- a/forum_modules/robotstxt/urls.py +++ b/forum_modules/robotstxt/urls.py @@ -3,5 +3,5 @@ from django.http import HttpResponse import settings urlpatterns = patterns('', - (r'^robots.txt$', lambda r: HttpResponse(settings.ROBOTS_FILE.value)), + (r'^robots.txt$', lambda r: HttpResponse(settings.ROBOTS_FILE.value, content_type='text/plain')), ) diff --git a/settings_local.py.dist b/settings_local.py.dist index 896a433..81c1eaa 100644 --- a/settings_local.py.dist +++ b/settings_local.py.dist @@ -72,7 +72,6 @@ TIME_ZONE = 'America/New_York' USE_I18N = True LANGUAGE_CODE = 'en' -DJANGO_VERSION = 1.1 OSQA_DEFAULT_SKIN = 'default' DISABLED_MODULES = ['books', 'recaptcha', 'project_badges']