new translation strategy,prepare config for series

2023-01-21 21:42:56 +01:00
parent 55e8fe2422
commit e0d12fd404
7 changed files with 30 additions and 160 deletions
--- a/blueprints.yaml
+++ b/blueprints.yaml
@@ -8,11 +8,11 @@ author:
  name: Tymoteusz Jóźwiak
  email: tymoteusz@jozwiak.top
  url: https://jozwiak.top
-homepage: https://github.com/tymoteuszjozwiak/paxover
+homepage: https://codeberg.org/tymoteuszjozwiak/paxover
 demo: https://jozwiak.top
 keywords: paxover
-bugs: https://github.com/tymoteuszjozwiak/paxover/issues
-license: MIT
+bugs: https://codeberg.org/tymoteuszjozwiak/paxover/issues
+license:

 dependencies:
  - { name: grav, version: ">=1.6.0" }
@@ -38,7 +38,21 @@ form:
      label: Tag title
      help: Title displayed on tag view page
      size: medium
-      default: "Tag:"
+      default: "Tag"
+
+    blog.tags_title:
+      type: text
+      label: Tags title
+      help: Title displayed on tag list
+      size: medium
+      default: "Tagi"
+
+    blog.series_title:
+      type: text
+      label: Series title
+      help: Title displayed on series field
+      size: medium
+      default: "Seria"

    blog.pagination_limit:
      type: text
@@ -52,14 +66,7 @@ form:
      label: Pagination "newer"
      help: Title displayed on "newer" button
      size: medium
-      default: ""
-
-    blog.pagination_newer_en:
-      type: text
-      label: Pagination "newer" EN
-      help: English translation of the previous field
-      size: medium
-      default: "Newer"
+      default: "Nowsze"

    blog.pagination_older:
      type: text
@@ -68,25 +75,11 @@ form:
      size: medium
      default: "Starsze"

-    blog.pagination_older_en:
-      type: text
-      label: Pagination "older" EN
-      help: English translation of the previous field
-      size: medium
-      default: "Older"
-
    blog.share:
      type: text
      label: Share section title
      size: medium
-      default: ""
-
-    blog.share_en:
-      type: text
-      label: Share section title EN
-      help: English translation of the previous field
-      size: medium
-      default: "Share"
+      default: "Udostępnij"

    blog.share_buttons:
      type: list
@@ -202,19 +195,19 @@ form:
      label: Footer year
      help: Website start year displayed in footer
      size: medium
-      default: ""
+      default: "2022"

    owner_title:
      type: text
      label: Owner title
      size: medium
-      default: ""
+      default: "Owner"

    wordcount_title:
      type: text
      label: Word count title
      size: medium
-      default: ""
+      default: "słów"

    analytics:
      type: textarea
@@ -246,41 +239,14 @@ form:
      type: text
      label: Comments section title
      size: medium
-      default: ""
-
-    cusdis.title_en:
-      type: text
-      label: Comments section title EN
-      help: English translation of the previous field
-      size: medium
-      default: "Comments"
+      default: "Komentarze"

    cusdis.disable_comments:
      type: text
      label: Disable comments info text
      help: Information displayed where the comments are disabled
      size: medium
-      default: ""
-
-    cusdis.disable_comments_en:
-      type: text
-      label: Disable comments info text EN
-      help: English version of the previous field
-      size: medium
-      default: ""
-
-    cusdis.legal_info:
-      type: textarea
-      label: Cusdis legal info
-      size: big
-      default: ""
-
-    cusdis.legal_info_en:
-      type: textarea
-      label: Cusdis legal info EN
-      help: English version of the previous field
-      size: big
-      default: ""
+      default: "Komentarze są wyłączone dla tego artykułu"

    cusdis.lang:
      type: textarea
@@ -288,10 +254,3 @@ form:
      help: More info at https://cusdis.com/doc#/advanced/i18n?id=contributing-more-languages
      size: big
      default: ""
-
-    cusdis.lang_en:
-      type: textarea
-      label: Cusdis language override EN
-      help: English version of the previous field
-      size: big
-      default: ""
--- a/paxover.yaml
+++ b/paxover.yaml
@@ -7,15 +7,14 @@ contact:
 contact_en:
 lang_title_en:
 blog:
-  slug: /blog
-  tag_title: "Tag:"
-  pagination_limit: 7
+  slug:
+  tag_title:
+  tags_title:
+  series_title:
+  pagination_limit:
  pagination_newer:
-  pagination_newer_en:
  pagination_older:
-  pagination_older_en:
  share:
-  share_en:
  share_buttons:
 footer:
  title:
@@ -26,10 +25,5 @@ cusdis:
  domain:
  app_id:
  title:
-  title_en:
  disable_comments:
-  disable_comments_en:
  lang:
-  lang_en:
-  legal_info:
-  legal_info_en:
--- a/templates/en/blog.html.twig
+++ b/templates/en/blog.html.twig
@@ -1,44 +0,0 @@
-
-{% extends 'partials/base.html.twig' %}
-
-{% if uri.param('tag') %}
-	{% set page_title = theme_config.blog.tag_title | default('Tag: ') ~ uri.param('tag') %}
-{% else %}
-	{% set page_title = theme_config.blog.title | default('Blog') %}
-{% endif %}
-
-{% block content %}
-
-{% set collection = page.collection({
-    'items': '@self.children', 
-    'pagination': true, 
-    'order': {'by': 'date', 'dir': 'desc'}, 
-    'limit': theme_config.blog.pagination_limit})
-%}
-{% set itemsInCollection = page.collection({'items': collection.params.items})|length %}
-{% set currentPage = uri.param('page')|default('1') %}
-{% set itemsPerPage = collection.params.limit %}
-{% set pagesInCollection = (itemsInCollection / itemsPerPage)|round(0, 'ceil') %}
-
-		{% if page_title == 'Blog' %}
-		{{ page.content | raw }} 
-		{% else %}
-		<h2>{{ page_title }}</h2>
-		{% endif %}
-		<div class="blog">
-			{% for child in collection %}
-			    {% include 'partials/blog-list-item.html.twig' with {blog: page, page: child} %}
-			{% endfor %}      
-		</div>
-
-		{% if itemsInCollection > itemsPerPage %}
-			<div class="pagination">
-				{% if currentPage != '1' %}
-                    <span class="pagination-newer"><a href="{{ page.url(true) ~ '/page' ~ system.param_sep ~ (currentPage - 1) }}">{{ theme_config.blog.pagination_newer_en }}</a></span>
-				{% endif %}
-				{% if (currentPage + 1) <= pagesInCollection %}
-                    <span class="pagination-older"><a href="{{ page.url(true) ~ '/page' ~ system.param_sep ~ (currentPage + 1) }}">{{ theme_config.blog.pagination_older_en}}</a></span>
-				{% endif %}
-			</div>
-		{% endif %}
-{% endblock %}
--- a/templates/en/error.html.twig
+++ b/templates/en/error.html.twig
@@ -1,6 +0,0 @@
-{% extends 'partials/base.html.twig' %}
-{% set page_title = 'Error 404' %}
-{% block content %}
-    <h2>Error 404</h2>
-    <p>This page doesn't exist</p>
-{% endblock %}
--- a/templates/en/partials/comments.html.twig
+++ b/templates/en/partials/comments.html.twig
@@ -1,22 +0,0 @@
-{% if theme_config.cusdis.domain %}
-<h2 class="left">{{ theme_config.cusdis.title_en|raw }}</h2>
-    {% if page.header.disableComments %}
-        <p class="left">{{ theme_config.cusdis.disable_comments_en|raw }}</p> 
-    {% else %}
-        {% if theme_config.cusdis.lang_en %}
-        <script>{{ theme_config.cusdis.lang_en|raw }}</script>
-        {% endif %}
-                <div id="cusdis_thread"
-                data-host="https://{{ theme_config.cusdis.domain }}"
-                data-app-id="{{ theme_config.cusdis.app_id }}"
-                data-page-id="{{ page.slug }}"
-                data-page-url="{{ page.url(true) }}"
-                data-page-title="{{ page.title }}"
-                data-theme="auto"
-                ></div>
-                <script async defer src="https://{{ theme_config.cusdis.domain }}/js/cusdis.es.js"></script>
-                {% if theme_config.cusdis.legal_info_en %}
-                <p class="annotation">{{ theme_config.cusdis.legal_info_en|raw }}</p>
-                {% endif %}
-    {% endif %}
-{% endif %} 
--- a/templates/en/partials/share.html.twig
+++ b/templates/en/partials/share.html.twig
@@ -1,8 +0,0 @@
-<div class="left">
-    <h2>{{ theme_config.blog.share_en|raw }}</h2>
-    <div class="share">
-      {% for button in theme_config.blog.share_buttons %}
-            <a class="btn {{ button.class }}" target="_blank" rel="nofollow noopener noreferrer" href="{{ button.link }}?{{ button.url_param }}={{ page.url(true) }}" title="{{ button.title_en }}">{{ button.name }}</a>
-      {% endfor %}
-    </div>
-</div>
--- a/templates/partials/comments.html.twig
+++ b/templates/partials/comments.html.twig
@@ -15,8 +15,5 @@
                data-theme="auto"
                ></div>
                <script async defer src="https://{{ theme_config.cusdis.domain }}/js/cusdis.es.js"></script>
-                {% if theme_config.cusdis.legal_info %}
-                <p class="annotation">{{ theme_config.cusdis.legal_info|raw }}</p>
-                {% endif %}
    {% endif %}
 {% endif %}