diff --git a/requirements.txt b/requirements.txt index 3db7be8..ccf56e8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,7 +16,7 @@ django-taggit python-memcached django-hitcounter Pillow -django-linguo +django-i18n-model gunicorn gevent diff --git a/src/badger/admin.py b/src/badger/admin.py index ec4238e..d4ba85c 100644 --- a/src/badger/admin.py +++ b/src/badger/admin.py @@ -3,28 +3,15 @@ from django.contrib import admin from django.utils.translation import ugettext_lazy as _ -from .forms import BadgeForm -from .models import Badge +from .models import Badge, BadgeI18N + + +class BadgeI18NInline(admin.TabularInline): + model = BadgeI18N class BadgeAdmin(admin.ModelAdmin): - 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'), - }) - ) + inlines = [BadgeI18NInline, ] admin.site.register(Badge, BadgeAdmin) diff --git a/src/badger/forms.py b/src/badger/forms.py deleted file mode 100644 index 91ad3f1..0000000 --- a/src/badger/forms.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- 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/0003_auto__add_badgei18n__add_unique_badgei18n_i18n_source_i18n_language__d.py b/src/badger/migrations/0003_auto__add_badgei18n__add_unique_badgei18n_i18n_source_i18n_language__d.py new file mode 100644 index 0000000..7f27e98 --- /dev/null +++ b/src/badger/migrations/0003_auto__add_badgei18n__add_unique_badgei18n_i18n_source_i18n_language__d.py @@ -0,0 +1,131 @@ +# -*- 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 model 'BadgeI18N' + db.create_table(u'badger_badgei18n', ( + (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('i18n_language', self.gf('django.db.models.fields.CharField')(max_length=10)), + ('title', self.gf('django.db.models.fields.CharField')(max_length=200, null=True, blank=True)), + ('description', self.gf('django.db.models.fields.CharField')(max_length=200, null=True, blank=True)), + ('i18n_source', self.gf('django.db.models.fields.related.ForeignKey')(related_name='translations', to=orm['badger.Badge'])), + )) + db.send_create_signal(u'badger', ['BadgeI18N']) + + # Adding unique constraint on 'BadgeI18N', fields ['i18n_source', 'i18n_language'] + db.create_unique(u'badger_badgei18n', ['i18n_source_id', 'i18n_language']) + + # Deleting field 'Badge.title_en' + db.delete_column(u'badger_badge', 'title_en') + + # Deleting field 'Badge.description_en' + db.delete_column(u'badger_badge', 'description_en') + + # Deleting field 'Badge.title_es' + db.delete_column(u'badger_badge', 'title_es') + + # Deleting field 'Badge.description_es' + db.delete_column(u'badger_badge', 'description_es') + + + def backwards(self, orm): + # Removing unique constraint on 'BadgeI18N', fields ['i18n_source', 'i18n_language'] + db.delete_unique(u'badger_badgei18n', ['i18n_source_id', 'i18n_language']) + + # Deleting model 'BadgeI18N' + db.delete_table(u'badger_badgei18n') + + # 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.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.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_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) + + + 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'}), + 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'}), + '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'badger.badgei18n': { + 'Meta': {'unique_together': "(('i18n_source', 'i18n_language'),)", 'object_name': 'BadgeI18N'}, + 'description': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'i18n_language': ('django.db.models.fields.CharField', [], {'max_length': '10'}), + 'i18n_source': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'translations'", 'to': u"orm['badger.Badge']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '200', '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 13bd798..0a6f90c 100644 --- a/src/badger/models.py +++ b/src/badger/models.py @@ -5,11 +5,10 @@ from django.contrib.auth import get_user_model from django.db import models from django.utils.translation import ugettext_lazy as _ from PIL import Image -from linguo.models import MultilingualModel -from linguo.managers import MultilingualManager +from i18n_model.models import I18nModel -class Badge(MultilingualModel): +class Badge(models.Model): COMPARISON_CHOICES = ( (u'gte', _(u'Greater than or equal')), (u'lte', _(u'less than or equal')), @@ -66,12 +65,9 @@ class Badge(MultilingualModel): 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) @@ -89,3 +85,9 @@ class Badge(MultilingualModel): self.get_user_attr_display(), self.get_type_display(), ) + + +class BadgeI18N(I18nModel): + class Meta: + source_model = Badge + translation_fields = ('title', 'description') diff --git a/src/colab/custom_settings.py b/src/colab/custom_settings.py index 547e53f..a1bae68 100644 --- a/src/colab/custom_settings.py +++ b/src/colab/custom_settings.py @@ -108,7 +108,7 @@ INSTALLED_APPS = INSTALLED_APPS + ( 'conversejs', 'haystack', 'hitcounter', - 'linguo', + 'i18n_model', # Own apps 'super_archives', -- libgit2 0.21.2