Download as
Browse Code »

Commit 95c40aa2bccc590602430dbba44b3b522c43bb01

Authored by Luan
1 parent ac81e096
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

Adding django linguo to project and making badges' title and description translatable

Showing 6 changed files with 179 additions and 6 deletions   Show diff stats
requirements.txt
  Diff comments   View file @95c40aa
@@ -16,6 +16,7 @@ django-taggit @@ -16,6 +16,7 @@ django-taggit
16 python-memcached 16 python-memcached
17 django-hitcounter 17 django-hitcounter
18 Pillow 18 Pillow
  19 +django-linguo
19 20
20 gunicorn 21 gunicorn
21 gevent 22 gevent
src/badger/admin.py
  Diff comments   View file @95c40aa
  1 +# -*- coding: utf-8 -*-
  2 +
1 from django.contrib import admin 3 from django.contrib import admin
  4 +from django.utils.translation import ugettext_lazy as _
2 5
  6 +from .forms import BadgeForm
3 from .models import Badge 7 from .models import Badge
4 8
5 9
6 class BadgeAdmin(admin.ModelAdmin): 10 class BadgeAdmin(admin.ModelAdmin):
7 - pass 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 + )
8 28
9 29
10 admin.site.register(Badge, BadgeAdmin) 30 admin.site.register(Badge, BadgeAdmin)
src/badger/forms.py 0 → 100644
  Diff comments   View file @95c40aa
@@ -0,0 +1,23 @@ @@ -0,0 +1,23 @@
  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/0002_auto__add_field_badge_title_en__add_field_badge_title_es__add_field_ba.py 0 → 100644
  Diff comments   View file @95c40aa
@@ -0,0 +1,120 @@ @@ -0,0 +1,120 @@
  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 field 'Badge.title_en'
  12 + db.add_column(u'badger_badge', 'title_en',
  13 + self.gf('django.db.models.fields.CharField')(max_length=200, null=True, blank=True),
  14 + keep_default=False)
  15 +
  16 + # Adding field 'Badge.title_es'
  17 + db.add_column(u'badger_badge', 'title_es',
  18 + self.gf('django.db.models.fields.CharField')(max_length=200, null=True, blank=True),
  19 + keep_default=False)
  20 +
  21 + # Adding field 'Badge.description_en'
  22 + db.add_column(u'badger_badge', 'description_en',
  23 + self.gf('django.db.models.fields.CharField')(max_length=200, null=True, blank=True),
  24 + keep_default=False)
  25 +
  26 + # Adding field 'Badge.description_es'
  27 + db.add_column(u'badger_badge', 'description_es',
  28 + self.gf('django.db.models.fields.CharField')(max_length=200, null=True, blank=True),
  29 + keep_default=False)
  30 +
  31 +
  32 + # Changing field 'Badge.description'
  33 + db.alter_column(u'badger_badge', 'description', self.gf('django.db.models.fields.CharField')(max_length=200, null=True))
  34 +
  35 + # Changing field 'Badge.title'
  36 + db.alter_column(u'badger_badge', 'title', self.gf('django.db.models.fields.CharField')(max_length=200, null=True))
  37 +
  38 + def backwards(self, orm):
  39 + # Deleting field 'Badge.title_en'
  40 + db.delete_column(u'badger_badge', 'title_en')
  41 +
  42 + # Deleting field 'Badge.title_es'
  43 + db.delete_column(u'badger_badge', 'title_es')
  44 +
  45 + # Deleting field 'Badge.description_en'
  46 + db.delete_column(u'badger_badge', 'description_en')
  47 +
  48 + # Deleting field 'Badge.description_es'
  49 + db.delete_column(u'badger_badge', 'description_es')
  50 +
  51 +
  52 + # Changing field 'Badge.description'
  53 + db.alter_column(u'badger_badge', 'description', self.gf('django.db.models.fields.CharField')(default='', max_length=200))
  54 +
  55 + # Changing field 'Badge.title'
  56 + db.alter_column(u'badger_badge', 'title', self.gf('django.db.models.fields.CharField')(default='', max_length=200))
  57 +
  58 + models = {
  59 + u'accounts.user': {
  60 + 'Meta': {'object_name': 'User'},
  61 + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
  62 + 'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
  63 + 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
  64 + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
  65 + 'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
  66 + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
  67 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  68 + 'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
  69 + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
  70 + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
  71 + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
  72 + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
  73 + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
  74 + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
  75 + 'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
  76 + 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
  77 + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
  78 + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
  79 + 'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
  80 + 'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})
  81 + },
  82 + u'auth.group': {
  83 + 'Meta': {'object_name': 'Group'},
  84 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  85 + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
  86 + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
  87 + },
  88 + u'auth.permission': {
  89 + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
  90 + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
  91 + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
  92 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  93 + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
  94 + },
  95 + u'badger.badge': {
  96 + 'Meta': {'object_name': 'Badge'},
  97 + 'awardees': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['accounts.User']", 'null': 'True', 'blank': 'True'}),
  98 + 'comparison': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
  99 + 'description': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
  100 + 'description_en': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
  101 + 'description_es': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
  102 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  103 + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}),
  104 + 'title': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
  105 + 'title_en': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
  106 + 'title_es': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
  107 + 'type': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
  108 + 'user_attr': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
  109 + 'value': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'})
  110 + },
  111 + u'contenttypes.contenttype': {
  112 + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
  113 + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
  114 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  115 + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
  116 + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
  117 + }
  118 + }
  119 +
  120 + complete_apps = ['badger']
0 \ No newline at end of file 121 \ No newline at end of file
src/badger/models.py
  Diff comments   View file @95c40aa
@@ -3,11 +3,13 @@ @@ -3,11 +3,13 @@
3 from django.conf import settings 3 from django.conf import settings
4 from django.contrib.auth import get_user_model 4 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 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 10
9 11
10 -class Badge(models.Model): 12 +class Badge(MultilingualModel):
11 COMPARISON_CHOICES = ( 13 COMPARISON_CHOICES = (
12 (u'gte', _(u'Greater than or equal')), 14 (u'gte', _(u'Greater than or equal')),
13 (u'lte', _(u'less than or equal')), 15 (u'lte', _(u'less than or equal')),
@@ -32,8 +34,11 @@ class Badge(models.Model): @@ -32,8 +34,11 @@ class Badge(models.Model):
32 u'wikis': u'wiki_count', 34 u'wikis': u'wiki_count',
33 u'contributions': u'contribution_count', 35 u'contributions': u'contribution_count',
34 } 36 }
35 - title = models.CharField(_(u'Title'), max_length=200)  
36 - description = models.CharField(_(u'Description'), max_length=200) 37 +
  38 + title = models.CharField(_(u'Title'), max_length=200, blank=True,
  39 + null=True)
  40 + description = models.CharField(_(u'Description'), max_length=200,
  41 + blank=True, null=True)
37 image = models.ImageField(upload_to='badges') 42 image = models.ImageField(upload_to='badges')
38 type = models.CharField(_(u'Type'), max_length=200, choices=TYPE_CHOICES) 43 type = models.CharField(_(u'Type'), max_length=200, choices=TYPE_CHOICES)
39 user_attr = models.CharField( 44 user_attr = models.CharField(
@@ -61,9 +66,12 @@ class Badge(models.Model): @@ -61,9 +66,12 @@ class Badge(models.Model):
61 null=True 66 null=True
62 ) 67 )
63 68
  69 + objects = MultilingualManager()
  70 +
64 class Meta: 71 class Meta:
65 verbose_name = _(u'Badge') 72 verbose_name = _(u'Badge')
66 verbose_name_plural = _(u'Badges') 73 verbose_name_plural = _(u'Badges')
  74 + translate = ('title', 'description')
67 75
68 def get_badge_url(self): 76 def get_badge_url(self):
69 return u'{}{}'.format(settings.MEDIA_URL, self.image) 77 return u'{}{}'.format(settings.MEDIA_URL, self.image)
src/colab/custom_settings.py
  Diff comments   View file @95c40aa
@@ -8,9 +8,9 @@ TIME_ZONE = 'America/Sao_Paulo' @@ -8,9 +8,9 @@ TIME_ZONE = 'America/Sao_Paulo'
8 8
9 gettext = lambda s: s 9 gettext = lambda s: s
10 LANGUAGES = ( 10 LANGUAGES = (
  11 + ('pt-br', gettext('Portuguese')),
11 ('en', gettext('English')), 12 ('en', gettext('English')),
12 ('es', gettext('Spanish')), 13 ('es', gettext('Spanish')),
13 - ('pt-br', gettext('Portuguese')),  
14 ) 14 )
15 15
16 DJANGO_DATE_FORMAT_TO_JS = { 16 DJANGO_DATE_FORMAT_TO_JS = {
@@ -108,6 +108,7 @@ INSTALLED_APPS = INSTALLED_APPS + ( @@ -108,6 +108,7 @@ INSTALLED_APPS = INSTALLED_APPS + (
108 'conversejs', 108 'conversejs',
109 'haystack', 109 'haystack',
110 'hitcounter', 110 'hitcounter',
  111 + 'linguo',
111 112
112 # Own apps 113 # Own apps
113 'super_archives', 114 'super_archives',