diff --git a/requirements.txt b/requirements.txt index f4ed1f7..3db7be8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,6 +16,7 @@ django-taggit python-memcached django-hitcounter Pillow +django-linguo gunicorn gevent diff --git a/src/badger/admin.py b/src/badger/admin.py index fca391b..ec4238e 100644 --- a/src/badger/admin.py +++ b/src/badger/admin.py @@ -1,10 +1,30 @@ +# -*- coding: utf-8 -*- + from django.contrib import admin +from django.utils.translation import ugettext_lazy as _ +from .forms import BadgeForm from .models import Badge class BadgeAdmin(admin.ModelAdmin): - pass + form = BadgeForm + fieldsets = ( + (None, { + 'fields': ( + 'title', 'description', 'image', 'type', 'user_attr', + 'comparison', 'value', + ) + }), + (_(u'Translatable items - English'), { + 'classes': ('collapse', ), + 'fields': ('title_en', 'description_en'), + }), + (_(u'Translatable items - Spanish'), { + 'classes': ('collapse', ), + 'fields': ('title_es', 'description_es'), + }) + ) admin.site.register(Badge, BadgeAdmin) diff --git a/src/badger/forms.py b/src/badger/forms.py new file mode 100644 index 0000000..91ad3f1 --- /dev/null +++ b/src/badger/forms.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- + +from django import forms +from django.utils.translation import ugettext_lazy as _ + +from .models import Badge + + +class BadgeForm(forms.ModelForm): + description_en = forms.CharField( + label=_(u'Description (English)'), + required=False + ) + description_es = forms.CharField( + label=_(u'Description (Spanish)'), + required=False + ) + + title_en = forms.CharField(label=_(u'Title (English)'), required=False) + title_es = forms.CharField(label=_(u'Title (Spanish)'), required=False) + + class Meta: + model = Badge diff --git a/src/badger/migrations/0002_auto__add_field_badge_title_en__add_field_badge_title_es__add_field_ba.py b/src/badger/migrations/0002_auto__add_field_badge_title_en__add_field_badge_title_es__add_field_ba.py new file mode 100644 index 0000000..132e0d3 --- /dev/null +++ b/src/badger/migrations/0002_auto__add_field_badge_title_en__add_field_badge_title_es__add_field_ba.py @@ -0,0 +1,120 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding field 'Badge.title_en' + db.add_column(u'badger_badge', 'title_en', + self.gf('django.db.models.fields.CharField')(max_length=200, null=True, blank=True), + keep_default=False) + + # Adding field 'Badge.title_es' + db.add_column(u'badger_badge', 'title_es', + self.gf('django.db.models.fields.CharField')(max_length=200, null=True, blank=True), + keep_default=False) + + # Adding field 'Badge.description_en' + db.add_column(u'badger_badge', 'description_en', + self.gf('django.db.models.fields.CharField')(max_length=200, null=True, blank=True), + keep_default=False) + + # Adding field 'Badge.description_es' + db.add_column(u'badger_badge', 'description_es', + self.gf('django.db.models.fields.CharField')(max_length=200, null=True, blank=True), + keep_default=False) + + + # Changing field 'Badge.description' + db.alter_column(u'badger_badge', 'description', self.gf('django.db.models.fields.CharField')(max_length=200, null=True)) + + # Changing field 'Badge.title' + db.alter_column(u'badger_badge', 'title', self.gf('django.db.models.fields.CharField')(max_length=200, null=True)) + + def backwards(self, orm): + # Deleting field 'Badge.title_en' + db.delete_column(u'badger_badge', 'title_en') + + # Deleting field 'Badge.title_es' + db.delete_column(u'badger_badge', 'title_es') + + # Deleting field 'Badge.description_en' + db.delete_column(u'badger_badge', 'description_en') + + # Deleting field 'Badge.description_es' + db.delete_column(u'badger_badge', 'description_es') + + + # Changing field 'Badge.description' + db.alter_column(u'badger_badge', 'description', self.gf('django.db.models.fields.CharField')(default='', max_length=200)) + + # Changing field 'Badge.title' + db.alter_column(u'badger_badge', 'title', self.gf('django.db.models.fields.CharField')(default='', max_length=200)) + + models = { + u'accounts.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}), + 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}), + 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}), + 'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), + 'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'}) + }, + u'auth.group': { + 'Meta': {'object_name': 'Group'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'auth.permission': { + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'badger.badge': { + 'Meta': {'object_name': 'Badge'}, + 'awardees': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['accounts.User']", 'null': 'True', 'blank': 'True'}), + 'comparison': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'description_en': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'description_es': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'title_en': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'title_es': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'type': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + 'user_attr': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'value': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'}) + }, + u'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + } + } + + complete_apps = ['badger'] \ No newline at end of file diff --git a/src/badger/models.py b/src/badger/models.py index 141e560..13bd798 100644 --- a/src/badger/models.py +++ b/src/badger/models.py @@ -3,11 +3,13 @@ from django.conf import settings from django.contrib.auth import get_user_model from django.db import models -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from PIL import Image +from linguo.models import MultilingualModel +from linguo.managers import MultilingualManager -class Badge(models.Model): +class Badge(MultilingualModel): COMPARISON_CHOICES = ( (u'gte', _(u'Greater than or equal')), (u'lte', _(u'less than or equal')), @@ -32,8 +34,11 @@ class Badge(models.Model): u'wikis': u'wiki_count', u'contributions': u'contribution_count', } - title = models.CharField(_(u'Title'), max_length=200) - description = models.CharField(_(u'Description'), max_length=200) + + title = models.CharField(_(u'Title'), max_length=200, blank=True, + null=True) + description = models.CharField(_(u'Description'), max_length=200, + blank=True, null=True) image = models.ImageField(upload_to='badges') type = models.CharField(_(u'Type'), max_length=200, choices=TYPE_CHOICES) user_attr = models.CharField( @@ -61,9 +66,12 @@ class Badge(models.Model): null=True ) + objects = MultilingualManager() + class Meta: verbose_name = _(u'Badge') verbose_name_plural = _(u'Badges') + translate = ('title', 'description') def get_badge_url(self): return u'{}{}'.format(settings.MEDIA_URL, self.image) diff --git a/src/colab/custom_settings.py b/src/colab/custom_settings.py index 3f304ec..547e53f 100644 --- a/src/colab/custom_settings.py +++ b/src/colab/custom_settings.py @@ -8,9 +8,9 @@ TIME_ZONE = 'America/Sao_Paulo' gettext = lambda s: s LANGUAGES = ( + ('pt-br', gettext('Portuguese')), ('en', gettext('English')), ('es', gettext('Spanish')), - ('pt-br', gettext('Portuguese')), ) DJANGO_DATE_FORMAT_TO_JS = { @@ -108,6 +108,7 @@ INSTALLED_APPS = INSTALLED_APPS + ( 'conversejs', 'haystack', 'hitcounter', + 'linguo', # Own apps 'super_archives', -- libgit2 0.21.2