ungleich-public/djangocms_blog
6
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #165 from nephila/feature/fix_gettext

Browse source 
Fix __str__ method
This commit is contained in:
Iacopo Spalletti 2015-11-16 23:31:10 +01:00
commit e7dfd59222
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
djangocms_blog/cms_plugins.py
View file

@ -31,7 +31,7 @@ class BlogLatestEntriesPlugin(BlogPlugin):
model = LatestPostsPlugin model = LatestPostsPlugin
form = LatestEntriesForm form = LatestEntriesForm
filter_horizontal = ('categories',) filter_horizontal = ('categories',)
fields = ('latest_posts', 'tags', 'categories') fields = ('app_config', 'latest_posts', 'tags', 'categories')
cache = False cache = False
base_render_template = 'plugins/latest_entries.html' base_render_template = 'plugins/latest_entries.html'
@ -50,7 +50,7 @@ class BlogLatestEntriesPluginCached(BlogPlugin):
model = LatestPostsPlugin model = LatestPostsPlugin
form = LatestEntriesForm form = LatestEntriesForm
filter_horizontal = ('categories',) filter_horizontal = ('categories',)
fields = ('latest_posts', 'tags', 'categories') fields = ('app_config', 'latest_posts', 'tags', 'categories')
base_render_template = 'plugins/latest_entries.html' base_render_template = 'plugins/latest_entries.html'
def render(self, context, instance, placeholder): def render(self, context, instance, placeholder):

16
djangocms_blog/models.py
View file

@ -270,7 +270,6 @@ class Post(ModelMeta, TranslatableModel):
return self.make_full_url(self.get_absolute_url()) return self.make_full_url(self.get_absolute_url())
@python_2_unicode_compatible
class BasePostPlugin(CMSPlugin): class BasePostPlugin(CMSPlugin):
app_config = AppHookConfigField( app_config = AppHookConfigField(
BlogConfig, null=True, verbose_name=_('app. config'), blank=True BlogConfig, null=True, verbose_name=_('app. config'), blank=True
@ -287,12 +286,10 @@ class BasePostPlugin(CMSPlugin):
posts = posts.active_translations(language_code=language) posts = posts.active_translations(language_code=language)
if not request or not getattr(request, 'toolbar', False) or not request.toolbar.edit_mode: if not request or not getattr(request, 'toolbar', False) or not request.toolbar.edit_mode:
posts = posts.published() posts = posts.published()
return posts return posts.all()
def __str__(self):
return _('generic blog plugin')
@python_2_unicode_compatible
class LatestPostsPlugin(BasePostPlugin): class LatestPostsPlugin(BasePostPlugin):
latest_posts = models.IntegerField(_('articles'), default=get_setting('LATEST_POSTS'), latest_posts = models.IntegerField(_('articles'), default=get_setting('LATEST_POSTS'),
help_text=_('The number of latests ' help_text=_('The number of latests '
@ -306,7 +303,7 @@ class LatestPostsPlugin(BasePostPlugin):
u'with chosen categories.')) u'with chosen categories.'))
def __str__(self): def __str__(self):
return _('%s latest articles by tag') % self.latest_posts return force_text(_('%s latest articles by tag') % self.latest_posts)
def copy_relations(self, oldinstance): def copy_relations(self, oldinstance):
for tag in oldinstance.tags.all(): for tag in oldinstance.tags.all():
@ -321,6 +318,7 @@ class LatestPostsPlugin(BasePostPlugin):
return posts.distinct()[:self.latest_posts] return posts.distinct()[:self.latest_posts]
@python_2_unicode_compatible
class AuthorEntriesPlugin(BasePostPlugin): class AuthorEntriesPlugin(BasePostPlugin):
authors = models.ManyToManyField( authors = models.ManyToManyField(
dj_settings.AUTH_USER_MODEL, verbose_name=_('authors'), dj_settings.AUTH_USER_MODEL, verbose_name=_('authors'),
@ -332,7 +330,7 @@ class AuthorEntriesPlugin(BasePostPlugin):
) )
def __str__(self): def __str__(self):
return _('%s latest articles by author') % self.latest_posts return force_text(_('%s latest articles by author') % self.latest_posts)
def copy_relations(self, oldinstance): def copy_relations(self, oldinstance):
self.authors = oldinstance.authors.all() self.authors = oldinstance.authors.all()
@ -354,7 +352,11 @@ class AuthorEntriesPlugin(BasePostPlugin):
return authors return authors
@python_2_unicode_compatible
class GenericBlogPlugin(BasePostPlugin): class GenericBlogPlugin(BasePostPlugin):
class Meta: class Meta:
abstract = False abstract = False
def __str__(self):
return force_text(_('generic blog plugin'))