diff --git a/HISTORY.rst b/HISTORY.rst index dbde64e..46e968e 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -3,13 +3,14 @@ History ------- -0.3.0 (Unreleased) +0.3.0 (unreleased) ++++++++++++++++++ * Multisite support * Configurable default author support * Refactored settings * Fix multilanguage issues +* Fix SEO fields length. 0.2.0 (2014-09-24) ++++++++++++++++++ diff --git a/README.rst b/README.rst index 861cf36..815b35b 100644 --- a/README.rst +++ b/README.rst @@ -35,10 +35,10 @@ Supported django CMS versions: * django CMS 3.0 -Documentation -------------- - -No doc at the moment, sorry +.. warning:: Starting from version 0.3 the length of the meta_description and + meta_title fields has been changed according to the most common + defaults for search engines. Existing data will not be affected, + but widgets that enforce the length for new data is now being used. Quickstart ---------- diff --git a/cms_helper.py b/cms_helper.py index 0999553..c4c7a37 100644 --- a/cms_helper.py +++ b/cms_helper.py @@ -9,7 +9,6 @@ HELPER_SETTINGS = { ], 'ROOT_URLCONF': 'tests.test_utils.urls', 'INSTALLED_APPS': [ - 'django.contrib.messages', 'admin_enhancer', 'filer', 'parler', @@ -21,7 +20,6 @@ HELPER_SETTINGS = { 'cmsplugin_filer_image', 'django_select2', 'taggit_autosuggest', - 'djangocms_blog', ], 'LANGUAGE_CODE': 'en', 'LANGUAGES': ( diff --git a/djangocms_blog/admin.py b/djangocms_blog/admin.py index 0702ec8..ca76cbd 100755 --- a/djangocms_blog/admin.py +++ b/djangocms_blog/admin.py @@ -7,6 +7,7 @@ from django.conf import settings from django.contrib.auth import get_user_model from parler.admin import TranslatableAdmin +from .forms import PostAdminForm from .models import Post, BlogCategory from .settings import get_setting @@ -24,6 +25,7 @@ class BlogCategoryAdmin(EnhancedModelAdminMixin, TranslatableAdmin): class PostAdmin(EnhancedModelAdminMixin, FrontendEditableAdmin, PlaceholderAdmin, TranslatableAdmin): + form = PostAdminForm list_display = ['title', 'author', 'date_published', 'date_published_end'] date_hierarchy = 'date_published' raw_id_fields = ['author'] @@ -43,7 +45,7 @@ class PostAdmin(EnhancedModelAdminMixin, FrontendEditableAdmin, 'classes': ('collapse',) }), ('SEO', { - 'fields': [('meta_description', 'meta_keywords', 'meta_title')], + 'fields': [('meta_description', 'meta_title', 'meta_keywords')], 'classes': ('collapse',) }), ] diff --git a/djangocms_blog/forms.py b/djangocms_blog/forms.py index 6d8310a..4661ca3 100644 --- a/djangocms_blog/forms.py +++ b/djangocms_blog/forms.py @@ -2,6 +2,9 @@ from django import forms from django.conf import settings import django_select2 +from parler.forms import TranslatableModelForm + +from .models import Post class LatestEntriesForm(forms.ModelForm): @@ -16,3 +19,17 @@ class LatestEntriesForm(forms.ModelForm): 'all': ('%sdjangocms_blog/css/%s' % (settings.STATIC_URL, 'djangocms_blog_admin.css'),) } + + +class PostAdminForm(TranslatableModelForm): + + def __init__(self, *args, **kwargs): + super(PostAdminForm, self).__init__(*args, **kwargs) + original_attrs = self.fields['meta_description'].widget.attrs + original_attrs['maxlength'] = 160 + self.fields['meta_description'].widget = forms.TextInput(original_attrs) + self.fields['meta_title'].max_length = 70 + + class Meta: + model = Post + exclude = () \ No newline at end of file diff --git a/djangocms_blog/locale/ar/LC_MESSAGES/django.mo b/djangocms_blog/locale/ar/LC_MESSAGES/django.mo index e3c0997..87f17d0 100644 Binary files a/djangocms_blog/locale/ar/LC_MESSAGES/django.mo and b/djangocms_blog/locale/ar/LC_MESSAGES/django.mo differ diff --git a/djangocms_blog/locale/ar/LC_MESSAGES/django.po b/djangocms_blog/locale/ar/LC_MESSAGES/django.po index 98c1714..a627d3d 100644 --- a/djangocms_blog/locale/ar/LC_MESSAGES/django.po +++ b/djangocms_blog/locale/ar/LC_MESSAGES/django.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: djangocms-blog\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-01 07:16+0200\n" -"PO-Revision-Date: 2014-10-12 12:01+0000\n" -"Last-Translator: Bashar Al-Abdulhadi\n" +"POT-Creation-Date: 2014-11-30 12:49+0100\n" +"PO-Revision-Date: 2014-11-30 11:49+0000\n" +"Last-Translator: yakky \n" "Language-Team: Arabic (http://www.transifex.com/projects/p/djangocms-blog/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -61,124 +61,142 @@ msgstr "التعديل على موضوع" msgid "Blog articles on %(site_name)s" msgstr "مواضيع المدونة على %(site_name)s" -#: models.py:28 +#: models.py:31 msgid "parent" msgstr "" -#: models.py:30 +#: models.py:33 msgid "created at" msgstr "" -#: models.py:31 +#: models.py:34 msgid "modified at" msgstr "" -#: models.py:34 +#: models.py:37 msgid "name" msgstr "" -#: models.py:35 models.py:95 +#: models.py:38 models.py:105 msgid "slug" msgstr "" -#: models.py:42 +#: models.py:45 msgid "blog category" msgstr "" -#: models.py:43 +#: models.py:46 msgid "blog categories" msgstr "" -#: models.py:66 +#: models.py:70 msgid "Author" msgstr "" -#: models.py:71 +#: models.py:75 msgid "Published Since" msgstr "" -#: models.py:73 +#: models.py:77 msgid "Published Until" msgstr "" -#: models.py:75 +#: models.py:79 msgid "Publish" msgstr "" -#: models.py:76 +#: models.py:80 msgid "category" msgstr "" -#: models.py:78 +#: models.py:82 msgid "Main image" msgstr "" -#: models.py:81 +#: models.py:85 msgid "Main image thumbnail" msgstr "" -#: models.py:85 +#: models.py:89 msgid "Main image full" msgstr "" -#: models.py:89 +#: models.py:93 msgid "Enable comments on post" msgstr "" -#: models.py:94 +#: models.py:96 +msgid "Site(s)" +msgstr "" + +#: models.py:98 +msgid "" +"Select sites in which to show the post. If none is set it will be visible in" +" all the configured sites." +msgstr "" + +#: models.py:104 msgid "Title" msgstr "" -#: models.py:96 +#: models.py:106 msgid "Abstract" msgstr "" -#: models.py:97 +#: models.py:107 msgid "Post meta description" msgstr "" -#: models.py:99 +#: models.py:109 msgid "Post meta keywords" msgstr "" -#: models.py:101 +#: models.py:111 +msgid "Post meta title" +msgstr "" + +#: models.py:112 +msgid "used in title tag and social sharing" +msgstr "" + +#: models.py:115 msgid "Text" msgstr "" -#: models.py:158 +#: models.py:178 msgid "blog article" msgstr "" -#: models.py:159 +#: models.py:179 msgid "blog articles" msgstr "" -#: models.py:199 models.py:226 +#: models.py:222 models.py:250 msgid "Articles" msgstr "" -#: models.py:200 +#: models.py:223 msgid "The number of latests articles to be displayed." msgstr "" -#: models.py:202 +#: models.py:225 msgid "Show only the blog articles tagged with chosen tags." msgstr "" -#: models.py:204 +#: models.py:227 msgid "Show only the blog articles tagged with chosen categories." msgstr "" -#: models.py:222 templates/djangocms_blog/plugins/authors.html:3 +#: models.py:246 templates/djangocms_blog/plugins/authors.html:3 msgid "Authors" msgstr "" -#: models.py:227 +#: models.py:251 msgid "The number of author articles to be displayed." msgstr "" -#: templates/djangocms_blog/post_detail.html:16 -#: templates/djangocms_blog/includes/blog_item.html:10 +#: templates/djangocms_blog/post_detail.html:18 +#: templates/djangocms_blog/includes/blog_item.html:11 msgid "by" msgstr "" @@ -223,7 +241,7 @@ msgstr "" msgid "next" msgstr "" -#: templates/djangocms_blog/includes/blog_item.html:44 +#: templates/djangocms_blog/includes/blog_item.html:46 msgid "read more" msgstr "" diff --git a/djangocms_blog/locale/de/LC_MESSAGES/django.mo b/djangocms_blog/locale/de/LC_MESSAGES/django.mo index 4a00551..db2bc5b 100644 Binary files a/djangocms_blog/locale/de/LC_MESSAGES/django.mo and b/djangocms_blog/locale/de/LC_MESSAGES/django.mo differ diff --git a/djangocms_blog/locale/de/LC_MESSAGES/django.po b/djangocms_blog/locale/de/LC_MESSAGES/django.po index 19e50b4..fe51b54 100644 --- a/djangocms_blog/locale/de/LC_MESSAGES/django.po +++ b/djangocms_blog/locale/de/LC_MESSAGES/django.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: djangocms-blog\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-01 07:16+0200\n" -"PO-Revision-Date: 2014-11-20 14:53+0000\n" -"Last-Translator: Christoph Reimers \n" +"POT-Creation-Date: 2014-11-30 12:49+0100\n" +"PO-Revision-Date: 2014-11-30 11:49+0000\n" +"Last-Translator: yakky \n" "Language-Team: German (http://www.transifex.com/projects/p/djangocms-blog/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -61,124 +61,142 @@ msgstr "Post bearbeiten" msgid "Blog articles on %(site_name)s" msgstr "Blog-Artikel auf %(site_name)s" -#: models.py:28 +#: models.py:31 msgid "parent" msgstr "übergeordnetes Element" -#: models.py:30 +#: models.py:33 msgid "created at" msgstr "erstellt am" -#: models.py:31 +#: models.py:34 msgid "modified at" msgstr "bearbeitet am" -#: models.py:34 +#: models.py:37 msgid "name" msgstr "Name" -#: models.py:35 models.py:95 +#: models.py:38 models.py:105 msgid "slug" msgstr "" -#: models.py:42 +#: models.py:45 msgid "blog category" msgstr "Blog-Kategorie" -#: models.py:43 +#: models.py:46 msgid "blog categories" msgstr "Blog-Kategorien" -#: models.py:66 +#: models.py:70 msgid "Author" msgstr "Autor" -#: models.py:71 +#: models.py:75 msgid "Published Since" msgstr "Veröffentlicht seit" -#: models.py:73 +#: models.py:77 msgid "Published Until" msgstr "Veröffentlicht bis" -#: models.py:75 +#: models.py:79 msgid "Publish" msgstr "Veröffentlichen" -#: models.py:76 +#: models.py:80 msgid "category" msgstr "Kategorie" -#: models.py:78 +#: models.py:82 msgid "Main image" msgstr "Haupt-Bild" -#: models.py:81 +#: models.py:85 msgid "Main image thumbnail" msgstr "Haupt-Bild Vorschau" -#: models.py:85 +#: models.py:89 msgid "Main image full" msgstr "volles Haupt-Bild" -#: models.py:89 +#: models.py:93 msgid "Enable comments on post" msgstr "Kommentare einschalten" -#: models.py:94 +#: models.py:96 +msgid "Site(s)" +msgstr "" + +#: models.py:98 +msgid "" +"Select sites in which to show the post. If none is set it will be visible in" +" all the configured sites." +msgstr "" + +#: models.py:104 msgid "Title" msgstr "Titel" -#: models.py:96 +#: models.py:106 msgid "Abstract" msgstr "Auszug" -#: models.py:97 +#: models.py:107 msgid "Post meta description" msgstr "Post Meta-Description" -#: models.py:99 +#: models.py:109 msgid "Post meta keywords" msgstr "Post Meta-Keywords" -#: models.py:101 +#: models.py:111 +msgid "Post meta title" +msgstr "" + +#: models.py:112 +msgid "used in title tag and social sharing" +msgstr "" + +#: models.py:115 msgid "Text" msgstr "Text" -#: models.py:158 +#: models.py:178 msgid "blog article" msgstr "Blog-Artikel" -#: models.py:159 +#: models.py:179 msgid "blog articles" msgstr "Blog-Artikel" -#: models.py:199 models.py:226 +#: models.py:222 models.py:250 msgid "Articles" msgstr "Artikel" -#: models.py:200 +#: models.py:223 msgid "The number of latests articles to be displayed." msgstr "Anzahl der anzuzeigenden letzten Artikel" -#: models.py:202 +#: models.py:225 msgid "Show only the blog articles tagged with chosen tags." msgstr "Nur die Blog-Einträge mit dem ausgewählten Tag anzeigen" -#: models.py:204 +#: models.py:227 msgid "Show only the blog articles tagged with chosen categories." msgstr "Nur die Blog-Einträge der ausgewählten Kategorie anzeigen" -#: models.py:222 templates/djangocms_blog/plugins/authors.html:3 +#: models.py:246 templates/djangocms_blog/plugins/authors.html:3 msgid "Authors" msgstr "Authoren" -#: models.py:227 +#: models.py:251 msgid "The number of author articles to be displayed." msgstr "Die Anzahl der anzuzeigenden Autoren-Artikel" -#: templates/djangocms_blog/post_detail.html:16 -#: templates/djangocms_blog/includes/blog_item.html:10 +#: templates/djangocms_blog/post_detail.html:18 +#: templates/djangocms_blog/includes/blog_item.html:11 msgid "by" msgstr "von" @@ -223,7 +241,7 @@ msgstr "von" msgid "next" msgstr "nächste" -#: templates/djangocms_blog/includes/blog_item.html:44 +#: templates/djangocms_blog/includes/blog_item.html:46 msgid "read more" msgstr "weiterlesen" diff --git a/djangocms_blog/locale/en/LC_MESSAGES/django.mo b/djangocms_blog/locale/en/LC_MESSAGES/django.mo index 16fc5c0..fbf2d2b 100644 Binary files a/djangocms_blog/locale/en/LC_MESSAGES/django.mo and b/djangocms_blog/locale/en/LC_MESSAGES/django.mo differ diff --git a/djangocms_blog/locale/en/LC_MESSAGES/django.po b/djangocms_blog/locale/en/LC_MESSAGES/django.po index 6fcb549..8f44053 100644 --- a/djangocms_blog/locale/en/LC_MESSAGES/django.po +++ b/djangocms_blog/locale/en/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-01 07:16+0200\n" +"POT-Creation-Date: 2014-11-30 12:50+0100\n" "PO-Revision-Date: 2014-03-05 18:09+0100\n" "Last-Translator: Iacopo Spalletti\n" "Language-Team: Italian \n" @@ -60,125 +60,144 @@ msgstr "" msgid "Blog articles on %(site_name)s" msgstr "Blog articles on %(site_name)s" -#: models.py:28 +#: models.py:31 msgid "parent" msgstr "parent" -#: models.py:30 +#: models.py:33 msgid "created at" msgstr "created at" -#: models.py:31 +#: models.py:34 msgid "modified at" msgstr "modified at" -#: models.py:34 +#: models.py:37 msgid "name" msgstr "name" -#: models.py:35 models.py:95 +#: models.py:38 models.py:105 msgid "slug" msgstr "slug" -#: models.py:42 +#: models.py:45 msgid "blog category" msgstr "blog category" -#: models.py:43 +#: models.py:46 msgid "blog categories" msgstr "blog categories" -#: models.py:66 +#: models.py:70 msgid "Author" msgstr "Author" -#: models.py:71 +#: models.py:75 msgid "Published Since" msgstr "Published Since" -#: models.py:73 +#: models.py:77 msgid "Published Until" msgstr "Published Until" -#: models.py:75 +#: models.py:79 msgid "Publish" msgstr "Publish" -#: models.py:76 +#: models.py:80 msgid "category" msgstr "category" -#: models.py:78 +#: models.py:82 msgid "Main image" msgstr "Main image" -#: models.py:81 +#: models.py:85 msgid "Main image thumbnail" msgstr "Main image thumbnail" -#: models.py:85 +#: models.py:89 msgid "Main image full" msgstr "Main image full" -#: models.py:89 +#: models.py:93 msgid "Enable comments on post" msgstr "" -#: models.py:94 +#: models.py:96 +msgid "Site(s)" +msgstr "" + +#: models.py:98 +msgid "" +"Select sites in which to show the post. If none is set it will be visible in " +"all the configured sites." +msgstr "" + +#: models.py:104 msgid "Title" msgstr "Title" -#: models.py:96 +#: models.py:106 msgid "Abstract" msgstr "" -#: models.py:97 +#: models.py:107 msgid "Post meta description" msgstr "Post meta description" -#: models.py:99 +#: models.py:109 #, fuzzy msgid "Post meta keywords" msgstr "Post meta description" -#: models.py:101 +#: models.py:111 +#, fuzzy +msgid "Post meta title" +msgstr "Post meta description" + +#: models.py:112 +msgid "used in title tag and social sharing" +msgstr "" + +#: models.py:115 msgid "Text" msgstr "Text" -#: models.py:158 +#: models.py:178 msgid "blog article" msgstr "blog article" -#: models.py:159 +#: models.py:179 msgid "blog articles" msgstr "blog articles" -#: models.py:199 models.py:226 +#: models.py:222 models.py:250 msgid "Articles" msgstr "Articles" -#: models.py:200 +#: models.py:223 msgid "The number of latests articles to be displayed." msgstr "The number of latests articles to be displayed." -#: models.py:202 +#: models.py:225 msgid "Show only the blog articles tagged with chosen tags." msgstr "Show only the blog articles tagged with chosen tags." -#: models.py:204 +#: models.py:227 msgid "Show only the blog articles tagged with chosen categories." msgstr "Show only the blog articles tagged with chosen categories." -#: models.py:222 templates/djangocms_blog/plugins/authors.html:3 +#: models.py:246 templates/djangocms_blog/plugins/authors.html:3 msgid "Authors" msgstr "Authors" -#: models.py:227 +#: models.py:251 msgid "The number of author articles to be displayed." msgstr "The number of author articles to be displayed." -#: templates/djangocms_blog/post_detail.html:16 -#: templates/djangocms_blog/includes/blog_item.html:10 +#: templates/djangocms_blog/post_detail.html:18 +#: templates/djangocms_blog/includes/blog_item.html:11 msgid "by" msgstr "by" @@ -223,7 +242,7 @@ msgstr "of" msgid "next" msgstr "next" -#: templates/djangocms_blog/includes/blog_item.html:44 +#: templates/djangocms_blog/includes/blog_item.html:46 msgid "read more" msgstr "read more" diff --git a/djangocms_blog/locale/it/LC_MESSAGES/django.mo b/djangocms_blog/locale/it/LC_MESSAGES/django.mo index f5557b1..287b7fd 100644 Binary files a/djangocms_blog/locale/it/LC_MESSAGES/django.mo and b/djangocms_blog/locale/it/LC_MESSAGES/django.mo differ diff --git a/djangocms_blog/locale/it/LC_MESSAGES/django.po b/djangocms_blog/locale/it/LC_MESSAGES/django.po index c5bd97a..a1c2d80 100644 --- a/djangocms_blog/locale/it/LC_MESSAGES/django.po +++ b/djangocms_blog/locale/it/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: djangocms-blog\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-01 07:16+0200\n" -"PO-Revision-Date: 2014-10-12 09:43+0000\n" +"POT-Creation-Date: 2014-11-30 12:49+0100\n" +"PO-Revision-Date: 2014-11-30 11:51+0000\n" "Last-Translator: yakky \n" "Language-Team: Italian (http://www.transifex.com/projects/p/djangocms-blog/language/it/)\n" "MIME-Version: 1.0\n" @@ -62,124 +62,142 @@ msgstr "Modifica articolo" msgid "Blog articles on %(site_name)s" msgstr "Articoli del blog su %(site_name)s" -#: models.py:28 +#: models.py:31 msgid "parent" msgstr "superiore" -#: models.py:30 +#: models.py:33 msgid "created at" msgstr "creato il" -#: models.py:31 +#: models.py:34 msgid "modified at" msgstr "modificato il" -#: models.py:34 +#: models.py:37 msgid "name" msgstr "nome" -#: models.py:35 models.py:95 +#: models.py:38 models.py:105 msgid "slug" msgstr "slug" -#: models.py:42 +#: models.py:45 msgid "blog category" msgstr "categoria del blog" -#: models.py:43 +#: models.py:46 msgid "blog categories" msgstr "categorie del blog" -#: models.py:66 +#: models.py:70 msgid "Author" msgstr "Autore" -#: models.py:71 +#: models.py:75 msgid "Published Since" msgstr "Pubblicato il" -#: models.py:73 +#: models.py:77 msgid "Published Until" msgstr "fino al" -#: models.py:75 +#: models.py:79 msgid "Publish" msgstr "Pubblicato" -#: models.py:76 +#: models.py:80 msgid "category" msgstr "categoria" -#: models.py:78 +#: models.py:82 msgid "Main image" msgstr "Immagine" -#: models.py:81 +#: models.py:85 msgid "Main image thumbnail" msgstr "Dimensione miniatura" -#: models.py:85 +#: models.py:89 msgid "Main image full" msgstr "Dimensione piena" -#: models.py:89 +#: models.py:93 msgid "Enable comments on post" msgstr "Abilita commenti sul post" -#: models.py:94 +#: models.py:96 +msgid "Site(s)" +msgstr "Sito/i" + +#: models.py:98 +msgid "" +"Select sites in which to show the post. If none is set it will be visible in" +" all the configured sites." +msgstr "Seleziona i siti in cui deve apparire l'articolo. Se non è selezionato nessun sito, l'articolo comparirà in tutti i siti configurati." + +#: models.py:104 msgid "Title" msgstr "Titolo" -#: models.py:96 +#: models.py:106 msgid "Abstract" msgstr "Riassunto" -#: models.py:97 +#: models.py:107 msgid "Post meta description" -msgstr "Meta descrizione dell'articolo" +msgstr "Descrizione SEO dell'articolo" -#: models.py:99 +#: models.py:109 msgid "Post meta keywords" -msgstr "Meta keyword dell'articolo" +msgstr "Keyword SEO dell'articolo" -#: models.py:101 +#: models.py:111 +msgid "Post meta title" +msgstr "Titolo SEO dell'articolo" + +#: models.py:112 +msgid "used in title tag and social sharing" +msgstr "Usato nel tag title e nei titoli per le condivisioni sui social network" + +#: models.py:115 msgid "Text" msgstr "Test" -#: models.py:158 +#: models.py:178 msgid "blog article" msgstr "articolo del blog" -#: models.py:159 +#: models.py:179 msgid "blog articles" msgstr "articoli del blog" -#: models.py:199 models.py:226 +#: models.py:222 models.py:250 msgid "Articles" msgstr "Articoli" -#: models.py:200 +#: models.py:223 msgid "The number of latests articles to be displayed." msgstr "Il numero di articoli da mostrare." -#: models.py:202 +#: models.py:225 msgid "Show only the blog articles tagged with chosen tags." msgstr "Mostra solo gli articoli marcati con i tag selezionati." -#: models.py:204 +#: models.py:227 msgid "Show only the blog articles tagged with chosen categories." msgstr "Mostra solo gli articoli marcati con i categorie selezionati." -#: models.py:222 templates/djangocms_blog/plugins/authors.html:3 +#: models.py:246 templates/djangocms_blog/plugins/authors.html:3 msgid "Authors" msgstr "Autori" -#: models.py:227 +#: models.py:251 msgid "The number of author articles to be displayed." msgstr "Numero di elementi per autore da mostrare." -#: templates/djangocms_blog/post_detail.html:16 -#: templates/djangocms_blog/includes/blog_item.html:10 +#: templates/djangocms_blog/post_detail.html:18 +#: templates/djangocms_blog/includes/blog_item.html:11 msgid "by" msgstr "di" @@ -224,7 +242,7 @@ msgstr "di" msgid "next" msgstr "successivo" -#: templates/djangocms_blog/includes/blog_item.html:44 +#: templates/djangocms_blog/includes/blog_item.html:46 msgid "read more" msgstr "leggi" diff --git a/djangocms_blog/locale/pt_BR/LC_MESSAGES/django.mo b/djangocms_blog/locale/pt_BR/LC_MESSAGES/django.mo index adc61df..d26d46d 100644 Binary files a/djangocms_blog/locale/pt_BR/LC_MESSAGES/django.mo and b/djangocms_blog/locale/pt_BR/LC_MESSAGES/django.mo differ diff --git a/djangocms_blog/locale/pt_BR/LC_MESSAGES/django.po b/djangocms_blog/locale/pt_BR/LC_MESSAGES/django.po index aec99f7..6a5b51e 100644 --- a/djangocms_blog/locale/pt_BR/LC_MESSAGES/django.po +++ b/djangocms_blog/locale/pt_BR/LC_MESSAGES/django.po @@ -6,9 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: djangocms-blog\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-01 07:16+0200\n" -"PO-Revision-Date: 2014-03-29 15:29+0000\n" -"Last-Translator: Iacopo Spalletti\n" +"POT-Creation-Date: 2014-11-30 12:49+0100\n" +"PO-Revision-Date: 2014-11-30 11:49+0000\n" +"Last-Translator: yakky \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/djangocms-blog/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -60,124 +60,142 @@ msgstr "" msgid "Blog articles on %(site_name)s" msgstr "" -#: models.py:28 +#: models.py:31 msgid "parent" msgstr "" -#: models.py:30 +#: models.py:33 msgid "created at" msgstr "" -#: models.py:31 +#: models.py:34 msgid "modified at" msgstr "" -#: models.py:34 +#: models.py:37 msgid "name" msgstr "" -#: models.py:35 models.py:95 +#: models.py:38 models.py:105 msgid "slug" msgstr "" -#: models.py:42 +#: models.py:45 msgid "blog category" msgstr "" -#: models.py:43 +#: models.py:46 msgid "blog categories" msgstr "" -#: models.py:66 +#: models.py:70 msgid "Author" msgstr "" -#: models.py:71 +#: models.py:75 msgid "Published Since" msgstr "" -#: models.py:73 +#: models.py:77 msgid "Published Until" msgstr "" -#: models.py:75 +#: models.py:79 msgid "Publish" msgstr "" -#: models.py:76 +#: models.py:80 msgid "category" msgstr "" -#: models.py:78 +#: models.py:82 msgid "Main image" msgstr "" -#: models.py:81 +#: models.py:85 msgid "Main image thumbnail" msgstr "" -#: models.py:85 +#: models.py:89 msgid "Main image full" msgstr "" -#: models.py:89 +#: models.py:93 msgid "Enable comments on post" msgstr "" -#: models.py:94 +#: models.py:96 +msgid "Site(s)" +msgstr "" + +#: models.py:98 +msgid "" +"Select sites in which to show the post. If none is set it will be visible in" +" all the configured sites." +msgstr "" + +#: models.py:104 msgid "Title" msgstr "" -#: models.py:96 +#: models.py:106 msgid "Abstract" msgstr "" -#: models.py:97 +#: models.py:107 msgid "Post meta description" msgstr "" -#: models.py:99 +#: models.py:109 msgid "Post meta keywords" msgstr "" -#: models.py:101 +#: models.py:111 +msgid "Post meta title" +msgstr "" + +#: models.py:112 +msgid "used in title tag and social sharing" +msgstr "" + +#: models.py:115 msgid "Text" msgstr "" -#: models.py:158 +#: models.py:178 msgid "blog article" msgstr "" -#: models.py:159 +#: models.py:179 msgid "blog articles" msgstr "" -#: models.py:199 models.py:226 +#: models.py:222 models.py:250 msgid "Articles" msgstr "" -#: models.py:200 +#: models.py:223 msgid "The number of latests articles to be displayed." msgstr "" -#: models.py:202 +#: models.py:225 msgid "Show only the blog articles tagged with chosen tags." msgstr "" -#: models.py:204 +#: models.py:227 msgid "Show only the blog articles tagged with chosen categories." msgstr "" -#: models.py:222 templates/djangocms_blog/plugins/authors.html:3 +#: models.py:246 templates/djangocms_blog/plugins/authors.html:3 msgid "Authors" msgstr "" -#: models.py:227 +#: models.py:251 msgid "The number of author articles to be displayed." msgstr "" -#: templates/djangocms_blog/post_detail.html:16 -#: templates/djangocms_blog/includes/blog_item.html:10 +#: templates/djangocms_blog/post_detail.html:18 +#: templates/djangocms_blog/includes/blog_item.html:11 msgid "by" msgstr "" @@ -222,7 +240,7 @@ msgstr "" msgid "next" msgstr "" -#: templates/djangocms_blog/includes/blog_item.html:44 +#: templates/djangocms_blog/includes/blog_item.html:46 msgid "read more" msgstr "" diff --git a/djangocms_blog/locale/ru/LC_MESSAGES/django.mo b/djangocms_blog/locale/ru/LC_MESSAGES/django.mo index aa4c8f2..5d2559d 100644 Binary files a/djangocms_blog/locale/ru/LC_MESSAGES/django.mo and b/djangocms_blog/locale/ru/LC_MESSAGES/django.mo differ diff --git a/djangocms_blog/locale/ru/LC_MESSAGES/django.po b/djangocms_blog/locale/ru/LC_MESSAGES/django.po index ed0f258..3916659 100644 --- a/djangocms_blog/locale/ru/LC_MESSAGES/django.po +++ b/djangocms_blog/locale/ru/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: djangocms-blog\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-01 07:16+0200\n" -"PO-Revision-Date: 2014-10-12 09:43+0000\n" +"POT-Creation-Date: 2014-11-30 12:49+0100\n" +"PO-Revision-Date: 2014-11-30 11:49+0000\n" "Last-Translator: yakky \n" "Language-Team: Russian (http://www.transifex.com/projects/p/djangocms-blog/language/ru/)\n" "MIME-Version: 1.0\n" @@ -61,124 +61,142 @@ msgstr "" msgid "Blog articles on %(site_name)s" msgstr "Статьи из блог на %(site_name)s" -#: models.py:28 +#: models.py:31 msgid "parent" msgstr "предок" -#: models.py:30 +#: models.py:33 msgid "created at" msgstr "время создания" -#: models.py:31 +#: models.py:34 msgid "modified at" msgstr "время изменения" -#: models.py:34 +#: models.py:37 msgid "name" msgstr "название" -#: models.py:35 models.py:95 +#: models.py:38 models.py:105 msgid "slug" msgstr "URL" -#: models.py:42 +#: models.py:45 msgid "blog category" msgstr "категория блога" -#: models.py:43 +#: models.py:46 msgid "blog categories" msgstr "категории блога" -#: models.py:66 +#: models.py:70 msgid "Author" msgstr "Автор" -#: models.py:71 +#: models.py:75 msgid "Published Since" msgstr "Опубликована с" -#: models.py:73 +#: models.py:77 msgid "Published Until" msgstr "Опубликована до" -#: models.py:75 +#: models.py:79 msgid "Publish" msgstr "Показывать на сайте" -#: models.py:76 +#: models.py:80 msgid "category" msgstr "категория" -#: models.py:78 +#: models.py:82 msgid "Main image" msgstr "Картинка для статьи" -#: models.py:81 +#: models.py:85 msgid "Main image thumbnail" msgstr "Уменьшенная копия" -#: models.py:85 +#: models.py:89 msgid "Main image full" msgstr "Полный размер" -#: models.py:89 +#: models.py:93 msgid "Enable comments on post" msgstr "" -#: models.py:94 +#: models.py:96 +msgid "Site(s)" +msgstr "" + +#: models.py:98 +msgid "" +"Select sites in which to show the post. If none is set it will be visible in" +" all the configured sites." +msgstr "" + +#: models.py:104 msgid "Title" msgstr "Заголовок" -#: models.py:96 +#: models.py:106 msgid "Abstract" msgstr "" -#: models.py:97 +#: models.py:107 msgid "Post meta description" msgstr "" -#: models.py:99 +#: models.py:109 msgid "Post meta keywords" msgstr "" -#: models.py:101 +#: models.py:111 +msgid "Post meta title" +msgstr "" + +#: models.py:112 +msgid "used in title tag and social sharing" +msgstr "" + +#: models.py:115 msgid "Text" msgstr "" -#: models.py:158 +#: models.py:178 msgid "blog article" msgstr "статья блога" -#: models.py:159 +#: models.py:179 msgid "blog articles" msgstr "статьи блога" -#: models.py:199 models.py:226 +#: models.py:222 models.py:250 msgid "Articles" msgstr "Статьи" -#: models.py:200 +#: models.py:223 msgid "The number of latests articles to be displayed." msgstr "Количество показываемых последних статей." -#: models.py:202 +#: models.py:225 msgid "Show only the blog articles tagged with chosen tags." msgstr "Показывать только статьи с выбранными тэгами." -#: models.py:204 +#: models.py:227 msgid "Show only the blog articles tagged with chosen categories." msgstr "Показывать только статьи из выбранныех категорий." -#: models.py:222 templates/djangocms_blog/plugins/authors.html:3 +#: models.py:246 templates/djangocms_blog/plugins/authors.html:3 msgid "Authors" msgstr "Авторы" -#: models.py:227 +#: models.py:251 msgid "The number of author articles to be displayed." msgstr "Количество статей автора, которые будут показаны." -#: templates/djangocms_blog/post_detail.html:16 -#: templates/djangocms_blog/includes/blog_item.html:10 +#: templates/djangocms_blog/post_detail.html:18 +#: templates/djangocms_blog/includes/blog_item.html:11 msgid "by" msgstr "создана" @@ -223,7 +241,7 @@ msgstr "из" msgid "next" msgstr "следующая" -#: templates/djangocms_blog/includes/blog_item.html:44 +#: templates/djangocms_blog/includes/blog_item.html:46 msgid "read more" msgstr "продолжение" diff --git a/djangocms_blog/models.py b/djangocms_blog/models.py index 108dd6a..c4f2ac3 100644 --- a/djangocms_blog/models.py +++ b/djangocms_blog/models.py @@ -93,8 +93,10 @@ class Post(ModelMeta, TranslatableModel): verbose_name=_(u'Enable comments on post'), default=get_setting('ENABLE_COMMENTS') ) - sites = models.ManyToManyField(Site, verbose_name=_(u'Site(s'), blank=True, null=True, - help_text=_(u'Select sites in which to show the post. If none is set it will be' + sites = models.ManyToManyField(Site, verbose_name=_(u'Site(s)'), blank=True, + null=True, + help_text=_(u'Select sites in which to show the post. ' + u'If none is set it will be ' u'visible in all the configured sites.') )