Permalink
Browse files

Merge pull request #43 from fmondaini/master

Algumas mudanças sutis
  • Loading branch information...
petry committed Dec 11, 2012
2 parents ad0e27a + 00a5ea2 commit f75a98ae86bc6d124e067cf7a74ca4d8e13283f0
Showing with 36 additions and 6 deletions.
  1. +1 −3 Makefile
  2. +8 −0 app/members/models.py
  3. +2 −2 associados/settings.py
  4. +0 −1 requirements_test.txt
  5. +11 −0 requirements_test_osx.txt
  6. +14 −0 setup_os.sh
View
@@ -1,7 +1,5 @@
-
deps:
- @pip install -r requirements.txt
- @pip install -r requirements_test.txt
+ @bash -c "./setup_os.sh"
setup: deps
@python manage.py syncdb --settings associados.settings_local
View
@@ -15,6 +15,7 @@ class Organization(DefaultFields):
class Meta:
ordering = ('name',)
+ verbose_name_plural = _('Organizations')
def __unicode__(self):
return self.name
@@ -26,6 +27,7 @@ class City(DefaultFields):
class Meta:
ordering = ('state', 'name')
+ verbose_name_plural = _('Cities')
def __unicode__(self):
return self.name
@@ -38,6 +40,9 @@ def get_public_key_storage_path(instance, filename):
class Category(models.Model):
name = models.CharField(max_length=30)
+ class Meta:
+ verbose_name_plural = _('Categories')
+
def __unicode__(self):
return self.name
@@ -81,3 +86,6 @@ def get_payment_check_list(self):
payment_valid = True
days_left = dif.days
return {'expired': not payment_valid, 'days_left': days_left, 'last_date': None}
+
+ def __unicode__(self):
+ return self.user.get_full_name()
View
@@ -152,8 +152,8 @@
# Email
-EMAIL_HOST_USER = os.environ['SENDGRID_USERNAME']
-EMAIL_HOST_PASSWORD = os.environ['SENDGRID_PASSWORD']
+EMAIL_HOST_USER = os.getenv('SENDGRID_USERNAME')
+EMAIL_HOST_PASSWORD = os.getenv('SENDGRID_PASSWORD')
EMAIL_HOST= 'smtp.sendgrid.net'
EMAIL_PORT = 587
EMAIL_USE_TLS = True
View
@@ -5,7 +5,6 @@ django-dynamic-fixture==1.6.3
django-extensions==0.9
ipdb==0.6.1
ipython==0.12.1
-readline==6.2.2
sorl-thumbnail==11.12
wsgiref==0.1.2
django-nose==1.1
View
@@ -0,0 +1,11 @@
+Django==1.4
+coverage==3.5.2
+django-debug-toolbar==0.9.4
+django-dynamic-fixture==1.6.3
+django-extensions==0.9
+ipdb==0.6.1
+ipython==0.12.1
+readline==6.2.2
+sorl-thumbnail==11.12
+wsgiref==0.1.2
+django-nose==1.1
View
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+if [[ $OSTYPE == 'linux-gnu' ]]; then
+ echo 'Linux: Instalando dependencias...'
+ sleep 3
+ pip install -r requirements.txt
+ pip install -r requirements_test.txt
+
+elif [[ $OSTYPE == darwin* ]]; then
+ echo 'OSX: Instalando dependencias...'
+ sleep 3
+ pip install -r requirements.txt
+ pip install -r requirements_test_osx.txt
+fi

0 comments on commit f75a98a

Please sign in to comment.