From 246dd98e40436371ff9a96f5cf68a5c496a60153 Mon Sep 17 00:00:00 2001 From: Yaroslsav-95 Date: Mon, 8 Oct 2018 06:27:09 +0300 Subject: minor css fixes, translation strings for dynamic loading --- weblog/locale/es/LC_MESSAGES/django.mo | Bin 3900 -> 3794 bytes weblog/locale/es/LC_MESSAGES/django.po | 69 +++++++++++++++++++++------------ weblog/locale/ru/LC_MESSAGES/django.mo | Bin 4872 -> 4772 bytes weblog/locale/ru/LC_MESSAGES/django.po | 69 +++++++++++++++++++++------------ weblog/static/weblog/css/weblog.css | 24 +++++------- 5 files changed, 98 insertions(+), 64 deletions(-) diff --git a/weblog/locale/es/LC_MESSAGES/django.mo b/weblog/locale/es/LC_MESSAGES/django.mo index c04804a..1fba8ea 100755 Binary files a/weblog/locale/es/LC_MESSAGES/django.mo and b/weblog/locale/es/LC_MESSAGES/django.mo differ diff --git a/weblog/locale/es/LC_MESSAGES/django.po b/weblog/locale/es/LC_MESSAGES/django.po index f741372..58aa82d 100755 --- a/weblog/locale/es/LC_MESSAGES/django.po +++ b/weblog/locale/es/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-17 23:47+0300\n" +"POT-Creation-Date: 2018-10-08 06:22+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,30 +18,30 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: feeds.py:25 templates/weblog/index.html:6 templatetags/weblog_extras.py:43 -#: views.py:94 views.py:181 +#: feeds.py:27 templates/weblog/index.html:6 templatetags/weblog_extras.py:43 +#: views.py:100 views.py:201 msgctxt "Posts without category" msgid "Uncategorized" msgstr "Sin categoría" -#: feeds.py:31 +#: feeds.py:33 #, fuzzy, python-format #| msgctxt "Posts in category" #| msgid "Posts in %(category_name)s" msgid "%(blog_title)s's %(category_name)s RSS feed" msgstr "RSS de %(category_name)s en %(blog_title)s" -#: feeds.py:32 +#: feeds.py:34 #, python-format msgid "%(blog_title)s RSS feed" msgstr "RSS de %(blog_title)s" -#: feeds.py:41 +#: feeds.py:43 #, python-format msgid "Latest %(category_name)s blog posts on %(blog_title)s" msgstr "Las entradas más nueva de %(category_name)s en %(blog_title)s" -#: feeds.py:42 +#: feeds.py:44 #, python-format msgid "Latest blog posts on %(blog_title)s" msgstr "Las entradas más nueva en %(blog_title)s" @@ -158,7 +158,7 @@ msgctxt "Noun" msgid "Comments" msgstr "Comentarios" -#: templates/weblog/index.html:11 templates/weblog/index.html:28 +#: templates/weblog/index.html:11 templates/weblog/index.html:31 msgctxt "Home page" msgid "Home" msgstr "Página principal" @@ -186,48 +186,60 @@ msgctxt "Posts from archive (year/month,year)" msgid "Posts from %(year)s" msgstr "Entradas del %(year)s" -#: templates/weblog/index.html:34 +#: templates/weblog/index.html:38 msgid "Important post" msgstr "Importante" -#: templates/weblog/index.html:36 templates/weblog/index.html:51 -#: templates/weblog/post.html:7 +#: templates/weblog/index.html:40 templates/weblog/index.html:55 +#: templates/weblog/nxtpage.html:5 templates/weblog/post.html:7 #, python-format -msgid "Published on %(publish_date)s" -msgstr "Publicado el %(publish_date)s" +msgid "Published on %(publish_date)s" +msgstr "" -#: templates/weblog/index.html:36 templates/weblog/index.html:51 -#: templates/weblog/post.html:7 +#: templates/weblog/index.html:40 templates/weblog/index.html:55 +#: templates/weblog/nxtpage.html:5 templates/weblog/post.html:7 #, python-format msgctxt "Written by (Author)" -msgid ", by %(author)s" -msgstr ", por %(author)s" +msgid ", by %(author)s" +msgstr "" -#: templates/weblog/index.html:42 templates/weblog/index.html:57 +#: templates/weblog/index.html:46 templates/weblog/index.html:61 +#: templates/weblog/nxtpage.html:11 msgid "Read more..." msgstr "Leer más..." -#: templates/weblog/index.html:64 +#: templates/weblog/index.html:69 +#, fuzzy +#| msgid "Read more..." +msgctxt "Load more pages" +msgid "Load more..." +msgstr "Mostrar más..." + +#: templates/weblog/index.html:74 +msgid "Loading..." +msgstr "Cargando..." + +#: templates/weblog/index.html:80 msgctxt "Page" msgid "First" msgstr "Primera" -#: templates/weblog/index.html:65 +#: templates/weblog/index.html:81 msgctxt "Page" msgid "Previous" msgstr "Anterior" -#: templates/weblog/index.html:93 +#: templates/weblog/index.html:109 msgctxt "Page" msgid "Next" msgstr "Siguiente" -#: templates/weblog/index.html:94 +#: templates/weblog/index.html:110 msgctxt "Page" msgid "Last" msgstr "Última" -#: templates/weblog/index.html:100 +#: templates/weblog/index.html:117 msgid "Nothing has been posted yet." msgstr "No hay ninguna publicación." @@ -313,14 +325,21 @@ msgstr "" msgid "December" msgstr "" -#: views.py:202 +#: views.py:232 msgid "You need to sign in to submit a comment" msgstr "Para poder comentar necesita iniciar sesión" -#: views.py:204 +#: views.py:234 msgid "Error submitting comment: Invalid data" msgstr "Error al intentar enviar el comentario: Información invalida" +#~ msgid "Published on %(publish_date)s" +#~ msgstr "Publicado el %(publish_date)s" + +#~ msgctxt "Written by (Author)" +#~ msgid ", by %(author)s" +#~ msgstr ", por %(author)s" + #~ msgid "English" #~ msgstr "Inglés" diff --git a/weblog/locale/ru/LC_MESSAGES/django.mo b/weblog/locale/ru/LC_MESSAGES/django.mo index b530a1c..82203fb 100755 Binary files a/weblog/locale/ru/LC_MESSAGES/django.mo and b/weblog/locale/ru/LC_MESSAGES/django.mo differ diff --git a/weblog/locale/ru/LC_MESSAGES/django.po b/weblog/locale/ru/LC_MESSAGES/django.po index c87ccb2..fa92785 100755 --- a/weblog/locale/ru/LC_MESSAGES/django.po +++ b/weblog/locale/ru/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-17 23:47+0300\n" +"POT-Creation-Date: 2018-10-08 06:22+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,30 +20,30 @@ msgstr "" "%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n" "%100>=11 && n%100<=14)? 2 : 3);\n" -#: feeds.py:25 templates/weblog/index.html:6 templatetags/weblog_extras.py:43 -#: views.py:94 views.py:181 +#: feeds.py:27 templates/weblog/index.html:6 templatetags/weblog_extras.py:43 +#: views.py:100 views.py:201 msgctxt "Posts without category" msgid "Uncategorized" msgstr "Без категории" -#: feeds.py:31 +#: feeds.py:33 #, fuzzy, python-format #| msgctxt "Posts in category" #| msgid "Posts in %(category_name)s" msgid "%(blog_title)s's %(category_name)s RSS feed" msgstr "RSS лента %(category_name)s в %(blog_title)s's" -#: feeds.py:32 +#: feeds.py:34 #, python-format msgid "%(blog_title)s RSS feed" msgstr "RSS лента %(blog_title)s" -#: feeds.py:41 +#: feeds.py:43 #, python-format msgid "Latest %(category_name)s blog posts on %(blog_title)s" msgstr "Последние записи по теме %(category_name)s в %(blog_title)s" -#: feeds.py:42 +#: feeds.py:44 #, python-format msgid "Latest blog posts on %(blog_title)s" msgstr "Самые свежие записи %(blog_title)s" @@ -158,7 +158,7 @@ msgctxt "Noun" msgid "Comments" msgstr "Комментарии" -#: templates/weblog/index.html:11 templates/weblog/index.html:28 +#: templates/weblog/index.html:11 templates/weblog/index.html:31 msgctxt "Home page" msgid "Home" msgstr "Главная" @@ -186,48 +186,60 @@ msgctxt "Posts from archive (year/month,year)" msgid "Posts from %(year)s" msgstr "Архив: %(year)s" -#: templates/weblog/index.html:34 +#: templates/weblog/index.html:38 msgid "Important post" msgstr "Прикрепленная запись" -#: templates/weblog/index.html:36 templates/weblog/index.html:51 -#: templates/weblog/post.html:7 +#: templates/weblog/index.html:40 templates/weblog/index.html:55 +#: templates/weblog/nxtpage.html:5 templates/weblog/post.html:7 #, python-format -msgid "Published on %(publish_date)s" -msgstr "Опубликовано %(publish_date)s" +msgid "Published on %(publish_date)s" +msgstr "" -#: templates/weblog/index.html:36 templates/weblog/index.html:51 -#: templates/weblog/post.html:7 +#: templates/weblog/index.html:40 templates/weblog/index.html:55 +#: templates/weblog/nxtpage.html:5 templates/weblog/post.html:7 #, python-format msgctxt "Written by (Author)" -msgid ", by %(author)s" -msgstr ". %(author)s" +msgid ", by %(author)s" +msgstr "" -#: templates/weblog/index.html:42 templates/weblog/index.html:57 +#: templates/weblog/index.html:46 templates/weblog/index.html:61 +#: templates/weblog/nxtpage.html:11 msgid "Read more..." msgstr "Читать далее..." -#: templates/weblog/index.html:64 +#: templates/weblog/index.html:69 +#, fuzzy +#| msgid "Read more..." +msgctxt "Load more pages" +msgid "Load more..." +msgstr "Ещё..." + +#: templates/weblog/index.html:74 +msgid "Loading..." +msgstr "Идет загрузка" + +#: templates/weblog/index.html:80 msgctxt "Page" msgid "First" msgstr "Первая" -#: templates/weblog/index.html:65 +#: templates/weblog/index.html:81 msgctxt "Page" msgid "Previous" msgstr "Предыдущая" -#: templates/weblog/index.html:93 +#: templates/weblog/index.html:109 msgctxt "Page" msgid "Next" msgstr "Следующая" -#: templates/weblog/index.html:94 +#: templates/weblog/index.html:110 msgctxt "Page" msgid "Last" msgstr "Последняя" -#: templates/weblog/index.html:100 +#: templates/weblog/index.html:117 msgid "Nothing has been posted yet." msgstr "Нет записи на данный момент." @@ -313,14 +325,21 @@ msgstr "" msgid "December" msgstr "" -#: views.py:202 +#: views.py:232 msgid "You need to sign in to submit a comment" msgstr "Для того чтобы оставить комментарий, зайдите в свою учетную запись" -#: views.py:204 +#: views.py:234 msgid "Error submitting comment: Invalid data" msgstr "Ошибка: неправильный формат данных" +#~ msgid "Published on %(publish_date)s" +#~ msgstr "Опубликовано %(publish_date)s" + +#~ msgctxt "Written by (Author)" +#~ msgid ", by %(author)s" +#~ msgstr ". %(author)s" + #~ msgid "English" #~ msgstr "Английский" diff --git a/weblog/static/weblog/css/weblog.css b/weblog/static/weblog/css/weblog.css index 5efe008..7adb7bd 100755 --- a/weblog/static/weblog/css/weblog.css +++ b/weblog/static/weblog/css/weblog.css @@ -108,17 +108,19 @@ hr{ .weblog-categories li a{ display: block; padding: 0.5em 1em; - color: #3e3e3e; + /*color: #3e3e3e;*/ } .weblog-categories li a:hover{ - background-color: #0080a0; - color: #dedede; + /*background-color: #0080a0; + color: #dedede;*/ } .weblog-categories li a.active{ - background-color: #0055a0; - color: #dedede; + color: #3e3e3e; + font-weight: 600; + /*background-color: #0055a0; + color: #dedede;*/ } .breadcrumb{ @@ -234,27 +236,21 @@ hr{ .blog-wrapper{ display: flex; flex-wrap: wrap; + max-width: 45em; justify-content: center; - padding-bottom: 2em; } .blog-content{ flex: 3; padding: 1em; + padding-bottom: 3em; } .weblog-sidebar{ padding: 1em 2em; + padding-bottom: 3em; } -.blog-content{ - max-width: 45em; -} - -.blogpost{ -} - -.post-publish-date, .post-author{ font-style: italic; } -- cgit v1.2.3