Merge branch 'release/0.9.x' into develop

AUTHORS.rst

@@ -44,6 +44,7 @@ Contributors
 * Petr Klus
 * Plamen Nikolov
 * Sami Kalliomäki
+* Sidnei Pereira
 * Stefan Wehrmeyer
 * Sylvain Fankhauser
 * Tadas Dailyda

HISTORY.rst

@@ -4,6 +4,12 @@
 History
 =======
 
+******************
+0.9.6 (unreleased)
+******************
+
+* Fixed string representation when model has no language
+
 ******************
 0.9.5 (2018-04-07)
 ******************

djangocms_blog/models.py

@@ -18,7 +18,7 @@
 from django.utils.encoding import force_bytes, force_text, python_2_unicode_compatible
 from django.utils.functional import cached_property
 from django.utils.html import escape, strip_tags
-from django.utils.translation import get_language, ugettext_lazy as _
+from django.utils.translation import get_language, ugettext, ugettext_lazy as _
 from djangocms_text_ckeditor.fields import HTMLField
 from filer.fields.image import FilerImageField
 from meta.models import ModelMeta
@@ -164,7 +164,8 @@ def get_absolute_url(self, lang=None):
         )
 
     def __str__(self):
-        return self.safe_translation_getter('name', any_language=True)
+        default = ugettext('BlogCategory (no translation)')
+        return self.safe_translation_getter('name', any_language=True, default=default)
 
     def save(self, *args, **kwargs):
         super(BlogCategory, self).save(*args, **kwargs)
@@ -289,7 +290,8 @@ class Meta:
         get_latest_by = 'date_published'
 
     def __str__(self):
-        return self.safe_translation_getter('title', any_language=True)
+        default = ugettext('Post (no translation)')
+        return self.safe_translation_getter('title', any_language=True, default=default)
 
     @property
     def guid(self, language=None):

tests/test_models.py

@@ -1146,6 +1146,10 @@ def test_str_repr(self):
         )
         self.assertEqual(force_text(plugin.__str__()), 'generic blog plugin')
 
+        no_translation_post = Post()
+        no_translation_default_title = 'Post (no translation)'
+        self.assertEqual(force_text(no_translation_post), no_translation_default_title)
+
 
 class KnockerTest(BaseTest):