🔀 Merge branch 'dev' into v2

CHANGELOG.md

@@ -30,6 +30,21 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Improved JSON-LD structured data
 - Minor style and layout improvements
 
+## [1.6.4] - 2022-01-24
+
+### Added
+
+- Turkish translation ([#90](https://github.com/jpanther/congo/pull/90))
+
+### Changed
+
+- Article updated date formatting and i18n ([#91](https://github.com/jpanther/congo/pull/91))
+- Upgrade to Mermaid v8.13.10
+
+### Fixed
+
+- Article metadata not wrapping at small viewports ([#91](https://github.com/jpanther/congo/pull/91))
+
 ## [1.6.3] - 2022-01-19
 
 ### Added
@@ -260,7 +275,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Advanced customisation using simple Tailwind colour definitions and styles
 - Fully documented
 
-[unreleased]: https://github.com/jpanther/congo/compare/v1.6.3...HEAD
+[unreleased]: https://github.com/jpanther/congo/compare/v1.6.4...HEAD
+[1.6.4]: https://github.com/jpanther/congo/compare/v1.6.3...v1.6.4
 [1.6.3]: https://github.com/jpanther/congo/compare/v1.6.2...v1.6.3
 [1.6.2]: https://github.com/jpanther/congo/compare/v1.6.1...v1.6.2
 [1.6.1]: https://github.com/jpanther/congo/compare/v1.6.0...v1.6.1

assets/css/compiled/main.css

@@ -1,4 +1,4 @@
-/*! Congo v1.6.3 | MIT License | https://github.com/jpanther/congo */
+/*! Congo v1.6.4 | MIT License | https://github.com/jpanther/congo */
 
 /*! tailwindcss v3.0.15 | MIT License | https://tailwindcss.com */
 

assets/css/main.css

@@ -1,4 +1,4 @@
-/*! Congo v1.6.3 | MIT License | https://github.com/jpanther/congo */
+/*! Congo v1.6.4 | MIT License | https://github.com/jpanther/congo */
 
 @tailwind base;
 @tailwind components;

config/_default/config.toml

@@ -5,9 +5,7 @@
 # baseURL = "https://your_domain.com/"
 defaultContentLanguage = "en"
 
-enableEmoji = true
 enableRobotsTXT = true
-
 summaryLength = 0
 
 [outputs]

exampleSite/content/docs/configuration.md

@@ -36,7 +36,6 @@ Note that the variable names provided in this table use dot notation to simplify
 |`defaultContentLanguage`|string|`"en"`|This value determines the language of theme components."|
 |`title`|string|`"Congo"`|The title of the website. This will be displayed in the site header and footer.|
 |`copyright`|string|_Not set_|A Markdown string containing the copyright message to be displayed in the site footer. If none is provided, Congo will automatically generate a copyright string using the site `title`.
-|`enableEmoji`|boolean|`true`|Whether emoji strings in content should be converted to emoji symbols.|
 |`enableRobotsTXT`|boolean|`true`|When enabled a `robots.txt` file will be created in the site root that allows search engines to crawl the entire site. Set to `false` if you wish to provide your own file.|
 |`summaryLength`|integer|`0`|The number of words that are used to generate the article summary when one is not provided in the [front matter]({{< ref "front-matter" >}}). A value of `0` will use the first sentence. This value has no effect when summaries are hidden.|
 |`author.name`|string|_Not set_|The author's name. This will be displayed in article footers, and on the homepage when the profile layout is used.|

exampleSite/content/samples/emoji.md

@@ -12,7 +12,7 @@ Emoji is supported throughout Congo by default. Emoji can be used in titles, men
 **Note:** The rendering of these glyphs depends on the browser and the platform. To style the emoji you can either use a third party emoji font or a font stack.
 {{< /alert >}}
 
-Emoji replacements are controlled via the `enableEmoji` parameter in your [site configuration]({{< ref "configuration#site-configuration" >}}). Set it to `true` and then you can type Emoji shorthand codes directly in content files.
+Emoji replacements are automatic throughout Congo, so you can use shorthand codes in your content and front matter and they will be converted to their corresponding symbols at build time.
 
 **Example:** `see_no_evil` :see_no_evil:, `hear_no_evil` :hear_no_evil:, `speak_no_evil` :speak_no_evil:.
 

exampleSite/content/samples/placeholder-text.md

@@ -1,9 +1,11 @@
 ---
 title: "Placeholder Text"
 date: "2019-03-09"
+lastmod: "2022-01-24"
 draft: true
 description: "Lorem Ipsum Dolor Si Amet"
 tags: ["markdown", "text", "sample", "latin"]
+showDateUpdated: true
 xml: false
 ---
 

i18n/de.yaml

@@ -7,6 +7,7 @@ article:
     other: "{{ .Count }} min"
   reading_time_title: "Lesezeit"
   # table_of_contents: "Table of Contents"
+  # updated: "Updated"
   # word_count:
   # one: "{{ .Count }} word"
   # other: "{{ .Count }} words"

i18n/en.yaml

@@ -7,6 +7,7 @@ article:
     other: "{{ .Count }} mins"
   reading_time_title: "Reading time"
   table_of_contents: "Table of Contents"
+  updated: "Updated"
   word_count:
     one: "{{ .Count }} word"
     other: "{{ .Count }} words"

i18n/es.yaml

@@ -7,9 +7,10 @@ article:
     other: "{{ .Count }} mins"
   reading_time_title: "Tiempo de lectura"
   # table_of_contents: "Table of Contents"
-  # word_count:
+  updated: "Actualizado"
-  # one: "{{ .Count }} word"
+  word_count:
-  # other: "{{ .Count }} words"
+    one: "{{ .Count }} palabra"
+    other: "{{ .Count }} palabras"
 
 author:
   byline_title: "Autor"

i18n/fr.yaml

@@ -7,6 +7,7 @@ article:
     other: "{{ .Count }} mins"
   reading_time_title: "Temps de lecture"
   # table_of_contents: "Table of Contents"
+  # updated: "Updated"
   # word_count:
   # one: "{{ .Count }} word"
   # other: "{{ .Count }} words"

i18n/pt-BR.yaml

@@ -7,6 +7,7 @@ article:
     other: "{{ .Count }} minutos"
   reading_time_title: "Tempo de leitura"
   # table_of_contents: "Table of Contents"
+  # updated: "Updated"
   # word_count:
   # one: "{{ .Count }} word"
   # other: "{{ .Count }} words"

i18n/tr.yaml

@@ -0,0 +1,41 @@
+article:
+  anchor_label: "Anchor"
+  draft: "Taslak"
+  edit_title: "İçeriği düzenle"
+  reading_time:
+    one: "{{ .Count }} dk"
+    other: "{{ .Count }} dk"
+  reading_time_title: "Okuma süresi"
+  # updated: "Updated"
+  word_count:
+    one: "{{ .Count }} kelime"
+    other: "{{ .Count }} kelime"
+
+author:
+  byline_title: "Yazar"
+
+error:
+  404_title: "Sayfa Bulunamadı :confused:"
+  404_error: "Hata 404"
+  404_description: "Görünüşe göre istediğiniz sayfa mevcut değil."
+
+footer:
+  dark_appearance: "Koyu görünüme geç"
+  light_appearance: "Açık görünüme geç"
+  powered_by: "{{ .Hugo }} & {{ .Congo }} tarafından desteklenmektedir"
+
+list:
+  externalurl_title: "Harici siteye bağlantı"
+  no_articles: "Henüz burada listelenecek bir makale yok."
+
+sharing:
+  email: "Email ile gönder"
+  facebook: "Facebook'ta paylaş"
+  linkedin: "LinkedIn'te paylaş"
+  pinterest: "Pinterest'te pinle"
+  reddit: "Reddit'te gönder"
+  twitter: "Twitter'da Tweetle"
+
+shortcode:
+  recent_articles: "Güncel"
+  icon_none: "Icon bulunamadı."

i18n/zh.yaml

@@ -6,6 +6,7 @@ article:
     other: "{{ .Count }} 分钟"
   reading_time_title: "预计阅读"
   # table_of_contents: "Table of Contents"
+  # updated: "Updated"
   word_count:
     one: "{{ .Count }} 字"
     other: "{{ .Count }} 字"

layouts/partials/article-meta.html

@@ -13,7 +13,11 @@
 
   {{/* Gather partials for this context */}}
   {{ if .Params.showDate | default (.Site.Params.article.showDate | default true) }}
-    {{ $meta.Add "partials" (slice (partial "meta/date.html" .)) }}
+    {{ $meta.Add "partials" (slice (partial "meta/date.html" .Date)) }}
+  {{ end }}
+
+  {{ if .Params.showDateUpdated | default (.Site.Params.article.showDateUpdated | default false) }}
+    {{ $meta.Add "partials" (slice (partial "meta/date-updated.html" .Lastmod)) }}
   {{ end }}
 
   {{ if and (.Params.showWordCount | default (.Site.Params.article.showWordCount | default false)) (ne .WordCount 0) }}
@@ -29,7 +33,7 @@
   {{ end }}
 
 
-  <div class="flex flex-row items-center">
+  <div class="flex flex-row flex-wrap items-center">
     {{/* Output partials */}}
     {{ with ($meta.Get "partials") }}
       {{ delimit . "<span class=\"px-2 text-primary-500\">&middot;</span>" }}

layouts/partials/article-pagination.html

@@ -20,7 +20,7 @@
                 >
                 <span class="mt-[0.1rem] text-xs text-neutral-500 dark:text-neutral-400">
                   {{ if .Params.showDate | default (.Site.Params.article.showDate | default true) }}
-                    {{ partial "meta/date.html" .NextInSection }}
+                    {{ partial "meta/date.html" .NextInSection.Date }}
                   {{ end }}
                 </span>
               </span>
@@ -36,7 +36,7 @@
                 >
                 <span class="mt-[0.1rem] text-xs text-neutral-500 dark:text-neutral-400">
                   {{ if .Params.showDate | default (.Site.Params.article.showDate | default true) }}
-                    {{ partial "meta/date.html" .PrevInSection }}
+                    {{ partial "meta/date.html" .PrevInSection.Date }}
                   {{ end }}
                 </span>
               </span>

layouts/partials/meta/date-updated.html

@@ -0,0 +1,3 @@
+{{- i18n "article.updated" -}}: 
+{{ partial "meta/date.html" . }}
+{{- /* Trim EOF */ -}}

layouts/partials/meta/date.html

@@ -1,11 +1,4 @@
-<time datetime="{{ .Date }}">
+<time datetime="{{ . }}">
-  {{- .Date | time.Format (.Site.Language.Params.dateFormat | default ":date_long") -}}
+  {{- . | time.Format (site.Language.Params.dateFormat | default ":date_long") -}}
 </time>
-{{ if .Params.showDateUpdated | default (.Site.Params.article.showDateUpdated | default false) }}
-  &nbsp;(Updated:&nbsp;
-  <time datetime="{{ .Lastmod }}">
-    {{- .Date | time.Format (.Site.Language.Params.dateFormat | default ":date_long") -}}
-  </time>
-  )
-{{ end }}
 {{- /* Trim EOF */ -}}

package-lock.json

@@ -14,7 +14,7 @@
         "chart.js": "^3.7.0",
         "fuse.js": "^6.5.3",
         "katex": "^0.15.2",
-        "mermaid": "^8.13.9",
+        "mermaid": "^8.13.10",
         "prettier": "^2.3.2",
         "prettier-plugin-go-template": "^0.0.11",
         "rimraf": "^3.0.2",
@@ -1685,9 +1685,9 @@
       }
     },
     "node_modules/mermaid": {
-      "version": "8.13.9",
+      "version": "8.13.10",
-      "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-8.13.9.tgz",
+      "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-8.13.10.tgz",
-      "integrity": "sha512-kMH676xEomSe/gzxMpDx91L+z9L+9iB3lvtPFA8aeOPRNNrfd3ZDvDCGFnuqQaJvPRCxs3Me2JDaVVNOZjojrg==",
+      "integrity": "sha512-2ANep359uML87+wiYaWSu83eg9Qc0xCLnNJdCh100m4v0orS3fp8SScsZLcDSElRGHi+1zuVJsEEVEWH05+COQ==",
       "dev": true,
       "dependencies": {
         "@braintree/sanitize-url": "^3.1.0",
@@ -3625,9 +3625,9 @@
       "dev": true
     },
     "mermaid": {
-      "version": "8.13.9",
+      "version": "8.13.10",
-      "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-8.13.9.tgz",
+      "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-8.13.10.tgz",
-      "integrity": "sha512-kMH676xEomSe/gzxMpDx91L+z9L+9iB3lvtPFA8aeOPRNNrfd3ZDvDCGFnuqQaJvPRCxs3Me2JDaVVNOZjojrg==",
+      "integrity": "sha512-2ANep359uML87+wiYaWSu83eg9Qc0xCLnNJdCh100m4v0orS3fp8SScsZLcDSElRGHi+1zuVJsEEVEWH05+COQ==",
       "dev": true,
       "requires": {
         "@braintree/sanitize-url": "^3.1.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hugo-congo-theme",
-  "version": "1.6.3",
+  "version": "1.6.4",
   "description": "Congo theme for Hugo",
   "main": "index.js",
   "scripts": {
@@ -33,7 +33,7 @@
     "chart.js": "^3.7.0",
     "fuse.js": "^6.5.3",
     "katex": "^0.15.2",
-    "mermaid": "^8.13.9",
+    "mermaid": "^8.13.10",
     "prettier": "^2.3.2",
     "prettier-plugin-go-template": "^0.0.11",
     "rimraf": "^3.0.2",