Add from __future__ import unicode_literals, issue #37

This commit is contained in:
Roberto Rosario
2015-01-19 04:06:40 -04:00
parent efbac7300c
commit d59ea3ede2
334 changed files with 2452 additions and 2268 deletions
-2
View File
@@ -1,5 +1,3 @@
from __future__ import absolute_import
from django.dispatch import receiver
from south.signals import post_migrate
+8 -8
View File
@@ -1,4 +1,4 @@
from __future__ import absolute_import
from __future__ import unicode_literals
import logging
@@ -10,32 +10,32 @@ logger = logging.getLogger(__name__)
class RegistrationForm(forms.Form):
name = forms.CharField(
label=_(u'Your name:'),
label=_('Your name:'),
required=True
)
email = forms.CharField(
label=_(u'Your email:'),
label=_('Your email:'),
required=True
)
company = forms.CharField(
label=_(u'Company name:'),
label=_('Company name:'),
required=False
)
industry = forms.CharField(
label=_(u'Industry:'),
label=_('Industry:'),
required=False
)
website = forms.CharField(
label=_(u'Company website:'),
label=_('Company website:'),
required=False
)
country = forms.CharField(
label=_(u'Country:'),
label=_('Country:'),
required=False
)
@@ -43,6 +43,6 @@ class RegistrationForm(forms.Form):
widget=forms.widgets.Textarea(
attrs={'rows': 2},
),
label=_(u'Other information:'),
label=_('Other information:'),
required=False
)
+1 -1
View File
@@ -1,4 +1,4 @@
from __future__ import absolute_import
from __future__ import unicode_literals
from django.utils.translation import ugettext_lazy as _
+2
View File
@@ -1,3 +1,5 @@
from __future__ import unicode_literals
FORM_SUBMIT_URL = 'https://docs.google.com/spreadsheet/formResponse'
FORM_KEY = 'dHp4cFBZNHNtc0xwcW9IazVXY1ZmVWc6MQ'
FORM_RECEIVER_FIELD = 'entry.0.single'
+4 -4
View File
@@ -1,4 +1,4 @@
from __future__ import absolute_import
from __future__ import unicode_literals
from json import dumps, loads
import requests
@@ -20,7 +20,7 @@ class RegistrationSingleton(SingletonModel):
_registered = None
registered = models.BooleanField(default=False, verbose_name=_('Registered'))
registration_data = models.TextField(verbose_name=_(u'Registration data'), blank=True)
registration_data = models.TextField(verbose_name=_('Registration data'), blank=True)
@classmethod
def registration_state(cls):
@@ -46,7 +46,7 @@ class RegistrationSingleton(SingletonModel):
if name_value:
cls._cached_name = name_value
return name_value or _(u'No name')
return name_value or _('No name')
@property
def is_registered(self):
@@ -83,4 +83,4 @@ class RegistrationSingleton(SingletonModel):
lock.release()
class Meta:
verbose_name = verbose_name_plural = _(u'Registration properties')
verbose_name = verbose_name_plural = _('Registration properties')
+3
View File
@@ -1,3 +1,5 @@
from __future__ import unicode_literals
import requests
from mayan.celery import app
@@ -6,6 +8,7 @@ from .exceptions import AlreadyRegistered
from .models import RegistrationSingleton
# TODO: move rate_limit to literals.py
@app.task(bind=True, ignore_result=True, max_retries=None, rate_limit='1/m', throws=(AlreadyRegistered,))
def task_registration_register(self, form_data):
try:
+2
View File
@@ -1,3 +1,5 @@
from __future__ import unicode_literals
from django.conf.urls import patterns, url
urlpatterns = patterns('registration.views',
+4 -4
View File
@@ -1,4 +1,4 @@
from __future__ import absolute_import
from __future__ import unicode_literals
from django.contrib import messages
from django.core.urlresolvers import reverse
@@ -16,19 +16,19 @@ def form_view(request):
registration = RegistrationSingleton.objects.get()
if registration.registered:
messages.error(request, _(u'Your copy is already registered.'))
messages.error(request, _('Your copy is already registered.'))
return HttpResponseRedirect(reverse('main:home'))
if request.method == 'POST':
form = RegistrationForm(request.POST)
if form.is_valid():
task_registration_register.apply_async(args=[form.cleaned_data], queue='tools')
messages.success(request, _(u'Thank you for registering.'))
messages.success(request, _('Thank you for registering.'))
return HttpResponseRedirect(reverse('main:home'))
else:
form = RegistrationForm()
return render_to_response('main/generic_form.html', {
'title': _(u'Registration form'),
'title': _('Registration form'),
'form': form,
}, context_instance=RequestContext(request))