Merge pull request #55 from sergeyklay/feature/site-meta

Update site metadata
sergeyklay · Apr 18, 2021 · 16864e2 · 16864e2
2 parents 7e0b6c9 + 899e8c8
commit 16864e2
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 33 deletions.
diff --git a/apps/blog/templates/blog/posts/list.html b/apps/blog/templates/blog/posts/list.html
@@ -8,8 +8,8 @@
 
 {% block page_meta %}
     <!-- Feed links -->
-    <link rel="alternate" type="application/rss+xml" title="{{ SITE_NAME }} » {% trans 'Feed (RSS 2.0)' %}" href="{{ BASE_URL }}{% url 'blog:posts_rss' %}">
-    <link rel="alternate" type="application/atom+xml" title="{{ SITE_NAME }} » {% trans 'Feed (Atom)' %}" href="{{ BASE_URL }}{% url 'blog:posts_atom' %}">
+    <link rel="alternate" type="application/rss+xml" title="{{ SITE_NAME }} » {% trans 'Posts RSS feed' %}" href="{{ BASE_URL }}{% url 'blog:posts_rss' %}">
+    <link rel="alternate" type="application/atom+xml" title="{{ SITE_NAME }} » {% trans 'Posts Atom feed' %}" href="{{ BASE_URL }}{% url 'blog:posts_atom' %}">
 {% endblock %}
 
 {% block content %}

diff --git a/assets/humans.txt b/assets/humans.txt
@@ -18,8 +18,8 @@ CONGRATULATIONS, you found my humans.txt file!
 
     /* SITE */
 
-    Last update: 2021-04-10
+    Last update: 2021-04-18
     Language: Russian, Ukrainian, English
     Doctype: HTML5
-    Standards: HTML5, CSS3, Open Graph protocol, Dublin Core metadata
+    Standards: Python 3, HTML5, CSS3, Open Graph protocol, Dublin Core metadata, Schema.org
     Components: Django, jQuery, Ed Theme
diff --git a/locales/ru/LC_MESSAGES/django.mo b/locales/ru/LC_MESSAGES/django.mo
diff --git a/locales/ru/LC_MESSAGES/django.po b/locales/ru/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: branch 1.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-16 07:32+0000\n"
-"PO-Revision-Date: 2021-04-16 11:27+0300\n"
+"POT-Creation-Date: 2021-04-18 06:48+0000\n"
+"PO-Revision-Date: 2021-04-18 09:52+0300\n"
 "Last-Translator: Serghei Iakovlev <egrep@protonmail.ch>\n"
 "Language-Team: Russian <egrep@protonmail.ch>\n"
 "Language: ru\n"
@@ -32,7 +32,7 @@ msgstr "Основное содержимое"
 msgid "SEO"
 msgstr "SEO"
 
-#: apps/blog/apps.py:27 apps/blog/templates/blog/posts/list.html:6
+#: apps/blog/apps.py:27 apps/blog/templates/blog/posts/list.html:18
 #: templates/partials/sidebar.html:15
 msgid "Blog"
 msgstr "Блог"
@@ -149,7 +149,7 @@ msgstr "Обратный адрес"
 msgid "Your email address will not be published."
 msgstr "Ваш электронный адрес не будет опубликован."
 
-#: apps/blog/templates/blog/partials/comment-form.html:41
+#: apps/blog/templates/blog/partials/comment-form.html:39
 msgid ""
 "Comments are subject to approval and moderation. If you don't see your "
 "comment, please be patient. It may be posted soon. Do not post your comment "
@@ -159,7 +159,7 @@ msgstr ""
 "подождите. Возможно, скоро он будет опубликован. Не оставляйте свой "
 "комментарий второй раз. Спасибо."
 
-#: apps/blog/templates/blog/partials/comment-form.html:52
+#: apps/blog/templates/blog/partials/comment-form.html:49
 msgid "Submit"
 msgstr "Отправить"
 
@@ -175,11 +175,19 @@ msgstr "Следующие публикации"
 msgid "Read more..."
 msgstr "Читать далее..."
 
-#: apps/blog/templates/blog/posts/list.html:15
+#: apps/blog/templates/blog/posts/list.html:11
+msgid "Posts RSS feed"
+msgstr "RSS-канал публикаций"
+
+#: apps/blog/templates/blog/posts/list.html:12
+msgid "Posts Atom feed"
+msgstr "Atom-канал публикаций"
+
+#: apps/blog/templates/blog/posts/list.html:27
 msgid "There are no posts yet."
 msgstr "Публикаций пока нет."
 
-#: apps/blog/templates/blog/posts/view.html:72
+#: apps/blog/templates/blog/posts/view.html:79
 #, python-format
 msgid "%(total_comments)s comment"
 msgid_plural "%(total_comments)s comments"
@@ -188,7 +196,7 @@ msgstr[1] "%(total_comments)s комментария"
 msgstr[2] "%(total_comments)s комментариев"
 msgstr[3] "%(total_comments)s комментариев"
 
-#: apps/blog/templates/blog/posts/view.html:85
+#: apps/blog/templates/blog/posts/view.html:94
 msgid "There are no comments yet."
 msgstr "Комментариев пока нет."
 
@@ -331,15 +339,15 @@ msgstr "Дата обновления"
 msgid "Draft"
 msgstr "Черновик"
 
-#: branch/models.py:42 branch/settings/base.py:258
+#: branch/models.py:42 branch/settings/base.py:260
 msgid "English"
 msgstr "Английский"
 
-#: branch/models.py:43 branch/settings/base.py:260
+#: branch/models.py:43 branch/settings/base.py:262
 msgid "Russian"
 msgstr "Русский"
 
-#: branch/models.py:44 branch/settings/base.py:259
+#: branch/models.py:44 branch/settings/base.py:261
 msgid "Ukrainian"
 msgstr "Украинский"
 
@@ -399,7 +407,7 @@ msgstr "Мета описание"
 msgid "This will be displayed in meta tags. Keep it under 120 characters."
 msgstr "Это будет отображаться в метатегах. Используйте до 120 символов."
 
-#: templates/base.html:100
+#: templates/base.html:105
 msgid "Go to main page"
 msgstr "На главную"
 

diff --git a/locales/uk/LC_MESSAGES/django.mo b/locales/uk/LC_MESSAGES/django.mo
diff --git a/locales/uk/LC_MESSAGES/django.po b/locales/uk/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: branch 1.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-16 07:32+0000\n"
-"PO-Revision-Date: 2021-04-16 11:27+0300\n"
+"POT-Creation-Date: 2021-04-18 06:48+0000\n"
+"PO-Revision-Date: 2021-04-18 09:51+0300\n"
 "Last-Translator: Serghei Iakovlev <egrep@protonmail.ch>\n"
 "Language-Team: Ukrainian <egrep@protonmail.ch>\n"
 "Language: uk\n"
@@ -33,7 +33,7 @@ msgstr "Загальний зміст"
 msgid "SEO"
 msgstr "SEO"
 
-#: apps/blog/apps.py:27 apps/blog/templates/blog/posts/list.html:6
+#: apps/blog/apps.py:27 apps/blog/templates/blog/posts/list.html:18
 #: templates/partials/sidebar.html:15
 msgid "Blog"
 msgstr "Блог"
@@ -150,7 +150,7 @@ msgstr "Зворотня адреса"
 msgid "Your email address will not be published."
 msgstr "Ваша електронна адреса не буде опублікований."
 
-#: apps/blog/templates/blog/partials/comment-form.html:41
+#: apps/blog/templates/blog/partials/comment-form.html:39
 msgid ""
 "Comments are subject to approval and moderation. If you don't see your "
 "comment, please be patient. It may be posted soon. Do not post your comment "
@@ -160,7 +160,7 @@ msgstr ""
 "зачекайте. Можливо, скоро він буде опублікований. Не залишайте свій коментар "
 "вдруге. Дякую."
 
-#: apps/blog/templates/blog/partials/comment-form.html:52
+#: apps/blog/templates/blog/partials/comment-form.html:49
 msgid "Submit"
 msgstr "Відправити"
 
@@ -176,11 +176,19 @@ msgstr "Наступні публікації"
 msgid "Read more..."
 msgstr "Читати далі..."
 
-#: apps/blog/templates/blog/posts/list.html:15
+#: apps/blog/templates/blog/posts/list.html:11
+msgid "Posts RSS feed"
+msgstr "RSS-канал публікацій"
+
+#: apps/blog/templates/blog/posts/list.html:12
+msgid "Posts Atom feed"
+msgstr "Atom-канал публікацій"
+
+#: apps/blog/templates/blog/posts/list.html:27
 msgid "There are no posts yet."
 msgstr "Ще немає повідомлень."
 
-#: apps/blog/templates/blog/posts/view.html:72
+#: apps/blog/templates/blog/posts/view.html:79
 #, python-format
 msgid "%(total_comments)s comment"
 msgid_plural "%(total_comments)s comments"
@@ -189,7 +197,7 @@ msgstr[1] "%(total_comments)s коментарі"
 msgstr[2] "%(total_comments)s коментарів"
 msgstr[3] "%(total_comments)s коментарів"
 
-#: apps/blog/templates/blog/posts/view.html:85
+#: apps/blog/templates/blog/posts/view.html:94
 msgid "There are no comments yet."
 msgstr "Коментарів поки немає."
 
@@ -332,15 +340,15 @@ msgstr "Дата оновлення"
 msgid "Draft"
 msgstr "Чернетка"
 
-#: branch/models.py:42 branch/settings/base.py:258
+#: branch/models.py:42 branch/settings/base.py:260
 msgid "English"
 msgstr "Англійська"
 
-#: branch/models.py:43 branch/settings/base.py:260
+#: branch/models.py:43 branch/settings/base.py:262
 msgid "Russian"
 msgstr "Російська"
 
-#: branch/models.py:44 branch/settings/base.py:259
+#: branch/models.py:44 branch/settings/base.py:261
 msgid "Ukrainian"
 msgstr "Українська"
 
@@ -400,7 +408,7 @@ msgstr "Мета опис"
 msgid "This will be displayed in meta tags. Keep it under 120 characters."
 msgstr "Це буде відображатися в метатегах. Використовуйте до 120 символів."
 
-#: templates/base.html:100
+#: templates/base.html:105
 msgid "Go to main page"
 msgstr "На головну"
 

diff --git a/templates/base.html b/templates/base.html
@@ -10,7 +10,13 @@
 
     {% block post_schema %}{% endblock %}
 
-    <meta name="generator" content="Branch">
+    {% block made_by %}
+        <!-- Made by -->
+        <meta name="generator" content="Branch">
+        <link type="text/plain" rel="author" href="{{ BASE_URL }}/humans.txt">
+    {% endblock %}
+
+    <!-- Page SEO -->
     {% block page_description %}
         <meta name="description" content="{% include 'partials/description-value.html' %}">
     {% endblock %}
@@ -38,10 +44,6 @@
         {% include 'partials/twitter-metadata.html' %}
     {% endblock %}
 
-    {% block humans %}
-        <link type="text/plain" rel="author" href="{{ BASE_URL }}/humans.txt">
-    {% endblock %}
-
     <!-- Icons -->
     <link rel="shortcut icon" href="{% static 'icons/favicon.ico' %}">
     <link rel="icon" type="image/vnd.microsoft.icon" href="{% static 'icons/favicon.ico' %}">

diff --git a/templates/partials/twitter-metadata.html b/templates/partials/twitter-metadata.html
@@ -10,3 +10,5 @@
 {% else%}
     <meta name="twitter:image:src" content="{{ BASE_URL }}{% static 'img/blog-logo.jpg' %}">
 {% endif %}
+
+<meta name="twitter:image:alt" content="{{ page_title|default:SITE_NAME }}">