Merge remote-tracking branch 'origin/master'

thesues · Apr 26, 2011 · 3f68425 · 3f68425
2 parents 4f1a906 + 5499b0c
commit 3f68425
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 17 deletions.
diff --git a/settings.py b/settings.py
@@ -31,7 +31,7 @@
 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'zh-CN'
+LANGUAGE_CODE = 'en-us'
 
 SITE_ID = 1
 

diff --git a/smthtop10/bookTemplate.py b/smthtop10/bookTemplate.py
@@ -1,4 +1,4 @@
-#coding:utf8
+# coding=utf-8
 bookTemplate = """<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>

diff --git a/smthtop10/forms.py b/smthtop10/forms.py
@@ -3,16 +3,19 @@
 from django import forms
 from django.utils.translation import ugettext_lazy as _
 
+
 #this is for registration
 class UserRegsiterForm(RegistrationFormUniqueEmail):
-    kindlemail=forms.EmailField()
+    kindlemail=forms.EmailField(label=_("kindlemail"))
+    updatetime=forms.ChoiceField(choices=UPDATE_TIME,label=_("updatetime"))
     def clean_kindlemail(self):
         if UserProfile.objects.filter(kindlemail=self.cleaned_data['kindlemail']):
-            raise forms.ValidationError("This email address is already in use. Please supply a different email address.")
+            raise forms.ValidationError(_("This email address is already in use. Please supply a different email address."))
         return self.cleaned_data['kindlemail']
 
 class ProfileForm(forms.ModelForm):
     class Meta:
         model=UserProfile
         exclude=["user"]
-
+
+
diff --git a/smthtop10/models.py b/smthtop10/models.py
@@ -13,7 +13,7 @@ def __init__(self,author="unknow",content="unknow",signature="unknown",reference
         self.imagefilenameList=[]
     def __str__(self):
         return "%s:\n%s" % (self.author.encode("utf8"),self.content.encode("utf8"))
-        
+
 class Feed():
     def __init__(self,title="unknown"):
         self.list=list()
@@ -25,9 +25,15 @@ def append(self,post):
     def __str__(self):
         return self.title.encode("utf8")
 
-class UserProfile(models.Model): 
+UPDATE_TIME=(
+        (7,"7:00 AM"),
+        (13,"13:00 AM"),
+        (19,"19:00 AM")
+        )
+class UserProfile(models.Model):
     kindlemail=models.EmailField(max_length=75)
     user=models.ForeignKey(User,unique=True)
+    updateTime=models.IntegerField(choices=UPDATE_TIME)
     def __unicode__(self):
         return unicode(self.user.username)
 

diff --git a/smthtop10/regbackend.py b/smthtop10/regbackend.py
@@ -4,6 +4,7 @@ def user_created(sender, user, request, **kwargs):
     form = UserRegsiterForm(request.POST)
     profile=UserProfile(user=user)
     profile.kindlemail=form.data['kindlemail']
+    profile.updateTime=form.data['updateTime']
     profile.save()
 from registration.signals import user_registered
 user_registered.connect(user_created)
diff --git a/smthtop10/sendMail.py b/smthtop10/sendMail.py
@@ -6,7 +6,9 @@
 from django.core.mail import *
 from smthtop10.models import UserProfile
 from datetime import date
+from datetime import datetime
 today=date.today()
+hour=datetime.now().hour
 archive="./archive/"+today.strftime("%Y%m%d")+"/"
 
 #gernarater mobi files
@@ -17,7 +19,8 @@
 print mobifile
 if os.path.isfile(mobifile):
     t=EmailMessage()
-    for i in UserProfile.objects.all():
+    for i in UserProfile.objects.filter(updateTime__iexact=hour):
         t.to.append(i.kindlemail)
     t.attach_file(mobifile)
     t.send()
+
diff --git a/smthtop10/shell/run.sh b/smthtop10/shell/run.sh
@@ -1,3 +1,3 @@
 export DJANGO_SETTINGS_MODULE=newsmth.settings
 python buildbook.py
-python sendMail.py
+python sendMail.py
diff --git a/smthtop10/templates/registration/registration_form.html b/smthtop10/templates/registration/registration_form.html
@@ -22,11 +22,3 @@ <h2>Register</h2>
     </body>
 </html>
 
-
-
-
-
-
-
-
-