Download as
Browse Code »

Commit 33136de0493b8c4793ff7101aa0a81cbed529b86

Authored by Luan
1 parent 8bd78c8d
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Removing django-linguo and adding django-i18n-model

Showing 6 changed files with 147 additions and 50 deletions   Show diff stats
requirements.txt
  Diff comments   View file @33136de
@@ -16,7 +16,7 @@ django-taggit @@ -16,7 +16,7 @@ django-taggit
16 python-memcached 16 python-memcached
17 django-hitcounter 17 django-hitcounter
18 Pillow 18 Pillow
19 -django-linguo 19 +django-i18n-model
20 20
21 gunicorn 21 gunicorn
22 gevent 22 gevent
src/badger/admin.py
  Diff comments   View file @33136de
@@ -3,28 +3,15 @@ @@ -3,28 +3,15 @@
3 from django.contrib import admin 3 from django.contrib import admin
4 from django.utils.translation import ugettext_lazy as _ 4 from django.utils.translation import ugettext_lazy as _
5 5
6 -from .forms import BadgeForm  
7 -from .models import Badge 6 +from .models import Badge, BadgeI18N
  7 +
  8 +
  9 +class BadgeI18NInline(admin.TabularInline):
  10 + model = BadgeI18N
8 11
9 12
10 class BadgeAdmin(admin.ModelAdmin): 13 class BadgeAdmin(admin.ModelAdmin):
11 - form = BadgeForm  
12 - fieldsets = (  
13 - (None, {  
14 - 'fields': (  
15 - 'title', 'description', 'image', 'type', 'user_attr',  
16 - 'comparison', 'value',  
17 - )  
18 - }),  
19 - (_(u'Translatable items - English'), {  
20 - 'classes': ('collapse', ),  
21 - 'fields': ('title_en', 'description_en'),  
22 - }),  
23 - (_(u'Translatable items - Spanish'), {  
24 - 'classes': ('collapse', ),  
25 - 'fields': ('title_es', 'description_es'),  
26 - })  
27 - ) 14 + inlines = [BadgeI18NInline, ]
28 15
29 16
30 admin.site.register(Badge, BadgeAdmin) 17 admin.site.register(Badge, BadgeAdmin)
src/badger/forms.py
View file @8bd78c8
@@ -1,23 +0,0 @@ @@ -1,23 +0,0 @@
1 -# -*- coding: utf-8 -*-  
2 -  
3 -from django import forms  
4 -from django.utils.translation import ugettext_lazy as _  
5 -  
6 -from .models import Badge  
7 -  
8 -  
9 -class BadgeForm(forms.ModelForm):  
10 - description_en = forms.CharField(  
11 - label=_(u'Description (English)'),  
12 - required=False  
13 - )  
14 - description_es = forms.CharField(  
15 - label=_(u'Description (Spanish)'),  
16 - required=False  
17 - )  
18 -  
19 - title_en = forms.CharField(label=_(u'Title (English)'), required=False)  
20 - title_es = forms.CharField(label=_(u'Title (Spanish)'), required=False)  
21 -  
22 - class Meta:  
23 - model = Badge  
src/badger/migrations/0003_auto__add_badgei18n__add_unique_badgei18n_i18n_source_i18n_language__d.py 0 → 100644
  Diff comments   View file @33136de
@@ -0,0 +1,131 @@ @@ -0,0 +1,131 @@
  1 +# -*- coding: utf-8 -*-
  2 +import datetime
  3 +from south.db import db
  4 +from south.v2 import SchemaMigration
  5 +from django.db import models
  6 +
  7 +
  8 +class Migration(SchemaMigration):
  9 +
  10 + def forwards(self, orm):
  11 + # Adding model 'BadgeI18N'
  12 + db.create_table(u'badger_badgei18n', (
  13 + (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
  14 + ('i18n_language', self.gf('django.db.models.fields.CharField')(max_length=10)),
  15 + ('title', self.gf('django.db.models.fields.CharField')(max_length=200, null=True, blank=True)),
  16 + ('description', self.gf('django.db.models.fields.CharField')(max_length=200, null=True, blank=True)),
  17 + ('i18n_source', self.gf('django.db.models.fields.related.ForeignKey')(related_name='translations', to=orm['badger.Badge'])),
  18 + ))
  19 + db.send_create_signal(u'badger', ['BadgeI18N'])
  20 +
  21 + # Adding unique constraint on 'BadgeI18N', fields ['i18n_source', 'i18n_language']
  22 + db.create_unique(u'badger_badgei18n', ['i18n_source_id', 'i18n_language'])
  23 +
  24 + # Deleting field 'Badge.title_en'
  25 + db.delete_column(u'badger_badge', 'title_en')
  26 +
  27 + # Deleting field 'Badge.description_en'
  28 + db.delete_column(u'badger_badge', 'description_en')
  29 +
  30 + # Deleting field 'Badge.title_es'
  31 + db.delete_column(u'badger_badge', 'title_es')
  32 +
  33 + # Deleting field 'Badge.description_es'
  34 + db.delete_column(u'badger_badge', 'description_es')
  35 +
  36 +
  37 + def backwards(self, orm):
  38 + # Removing unique constraint on 'BadgeI18N', fields ['i18n_source', 'i18n_language']
  39 + db.delete_unique(u'badger_badgei18n', ['i18n_source_id', 'i18n_language'])
  40 +
  41 + # Deleting model 'BadgeI18N'
  42 + db.delete_table(u'badger_badgei18n')
  43 +
  44 + # Adding field 'Badge.title_en'
  45 + db.add_column(u'badger_badge', 'title_en',
  46 + self.gf('django.db.models.fields.CharField')(max_length=200, null=True, blank=True),
  47 + keep_default=False)
  48 +
  49 + # Adding field 'Badge.description_en'
  50 + db.add_column(u'badger_badge', 'description_en',
  51 + self.gf('django.db.models.fields.CharField')(max_length=200, null=True, blank=True),
  52 + keep_default=False)
  53 +
  54 + # Adding field 'Badge.title_es'
  55 + db.add_column(u'badger_badge', 'title_es',
  56 + self.gf('django.db.models.fields.CharField')(max_length=200, null=True, blank=True),
  57 + keep_default=False)
  58 +
  59 + # Adding field 'Badge.description_es'
  60 + db.add_column(u'badger_badge', 'description_es',
  61 + self.gf('django.db.models.fields.CharField')(max_length=200, null=True, blank=True),
  62 + keep_default=False)
  63 +
  64 +
  65 + models = {
  66 + u'accounts.user': {
  67 + 'Meta': {'object_name': 'User'},
  68 + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
  69 + 'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
  70 + 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
  71 + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
  72 + 'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
  73 + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
  74 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  75 + 'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
  76 + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
  77 + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
  78 + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
  79 + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
  80 + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
  81 + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
  82 + 'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
  83 + 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
  84 + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
  85 + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
  86 + 'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
  87 + 'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})
  88 + },
  89 + u'auth.group': {
  90 + 'Meta': {'object_name': 'Group'},
  91 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  92 + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
  93 + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
  94 + },
  95 + u'auth.permission': {
  96 + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
  97 + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
  98 + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
  99 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  100 + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
  101 + },
  102 + u'badger.badge': {
  103 + 'Meta': {'object_name': 'Badge'},
  104 + 'awardees': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['accounts.User']", 'null': 'True', 'blank': 'True'}),
  105 + 'comparison': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
  106 + 'description': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
  107 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  108 + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}),
  109 + 'title': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
  110 + 'type': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
  111 + 'user_attr': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
  112 + 'value': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'})
  113 + },
  114 + u'badger.badgei18n': {
  115 + 'Meta': {'unique_together': "(('i18n_source', 'i18n_language'),)", 'object_name': 'BadgeI18N'},
  116 + 'description': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
  117 + 'i18n_language': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
  118 + 'i18n_source': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'translations'", 'to': u"orm['badger.Badge']"}),
  119 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  120 + 'title': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
  121 + },
  122 + u'contenttypes.contenttype': {
  123 + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
  124 + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
  125 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  126 + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
  127 + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
  128 + }
  129 + }
  130 +
  131 + complete_apps = ['badger']
0 \ No newline at end of file 132 \ No newline at end of file
src/badger/models.py
  Diff comments   View file @33136de
@@ -5,11 +5,10 @@ from django.contrib.auth import get_user_model @@ -5,11 +5,10 @@ from django.contrib.auth import get_user_model
5 from django.db import models 5 from django.db import models
6 from django.utils.translation import ugettext_lazy as _ 6 from django.utils.translation import ugettext_lazy as _
7 from PIL import Image 7 from PIL import Image
8 -from linguo.models import MultilingualModel  
9 -from linguo.managers import MultilingualManager 8 +from i18n_model.models import I18nModel
10 9
11 10
12 -class Badge(MultilingualModel): 11 +class Badge(models.Model):
13 COMPARISON_CHOICES = ( 12 COMPARISON_CHOICES = (
14 (u'gte', _(u'Greater than or equal')), 13 (u'gte', _(u'Greater than or equal')),
15 (u'lte', _(u'less than or equal')), 14 (u'lte', _(u'less than or equal')),
@@ -66,12 +65,9 @@ class Badge(MultilingualModel): @@ -66,12 +65,9 @@ class Badge(MultilingualModel):
66 null=True 65 null=True
67 ) 66 )
68 67
69 - objects = MultilingualManager()  
70 -  
71 class Meta: 68 class Meta:
72 verbose_name = _(u'Badge') 69 verbose_name = _(u'Badge')
73 verbose_name_plural = _(u'Badges') 70 verbose_name_plural = _(u'Badges')
74 - translate = ('title', 'description')  
75 71
76 def get_badge_url(self): 72 def get_badge_url(self):
77 return u'{}{}'.format(settings.MEDIA_URL, self.image) 73 return u'{}{}'.format(settings.MEDIA_URL, self.image)
@@ -89,3 +85,9 @@ class Badge(MultilingualModel): @@ -89,3 +85,9 @@ class Badge(MultilingualModel):
89 self.get_user_attr_display(), 85 self.get_user_attr_display(),
90 self.get_type_display(), 86 self.get_type_display(),
91 ) 87 )
  88 +
  89 +
  90 +class BadgeI18N(I18nModel):
  91 + class Meta:
  92 + source_model = Badge
  93 + translation_fields = ('title', 'description')
src/colab/custom_settings.py
  Diff comments   View file @33136de
@@ -108,7 +108,7 @@ INSTALLED_APPS = INSTALLED_APPS + ( @@ -108,7 +108,7 @@ INSTALLED_APPS = INSTALLED_APPS + (
108 'conversejs', 108 'conversejs',
109 'haystack', 109 'haystack',
110 'hitcounter', 110 'hitcounter',
111 - 'linguo', 111 + 'i18n_model',
112 112
113 # Own apps 113 # Own apps
114 'super_archives', 114 'super_archives',