X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/14a614f4d0c3b4eb4517c62bbe8dace766e81209..5b9ee3437b7fa98820eba7286abd524c3ede76e9:/apps/chunks/models.py?ds=sidebyside diff --git a/apps/chunks/models.py b/apps/chunks/models.py index ef244eb0b..5cdf8fea8 100644 --- a/apps/chunks/models.py +++ b/apps/chunks/models.py @@ -1,6 +1,6 @@ from django.core.cache import cache from django.db import models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext_lazy as _, get_language class Chunk(models.Model): @@ -9,8 +9,8 @@ class Chunk(models.Model): any template with the use of a special template tag. """ key = models.CharField(_('key'), help_text=_('A unique name for this chunk of content'), primary_key=True, max_length=255) - description = models.CharField(_('description'), blank=True, max_length=255) - content = models.TextField(_('content'), blank=True) + description = models.CharField(_('description'), blank=True, null=True, max_length=255) + content = models.TextField(_('content'), blank=True, null=True) class Meta: ordering = ('key',) @@ -20,12 +20,13 @@ class Chunk(models.Model): def __unicode__(self): return self.key - def cache_key(self): - return 'chunk_' + self.key + @staticmethod + def cache_key(key): + return 'chunk/%s/%s' % (key, get_language()) def save(self, *args, **kwargs): ret = super(Chunk, self).save(*args, **kwargs) - cache.delete(self.cache_key()) + cache.delete(self.cache_key(self.key)) return ret