Merge 98892944c4 into 18e1edcf59

CHANGELOG.md

@@ -6,23 +6,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
-## [2.7.5] - 2023-11-25
-
-### Added
-
-- Ukrainian translation ([#703](https://github.com/jpanther/congo/pull/703))
-- Bulgarian translation ([#718](https://github.com/jpanther/congo/pull/718))
-
-### Changed
-
-- Updated Dutch translation ([#696](https://github.com/jpanther/congo/pull/696))
-- Upgrade to Mermaid v10.6.1 ([#697](https://github.com/jpanther/congo/pull/697))
-
-### Fixed
-
-- Some files have unnecessary execute permissions ([#714](https://github.com/jpanther/congo/pull/714))
-- Empty block is output when locale switcher is hidden ([#699](https://github.com/jpanther/congo/pull/699))
-
 ## [2.7.4] - 2023-11-05
 
 ### Fixed
@@ -798,8 +781,7 @@ 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/v2.7.5...HEAD
+[Unreleased]: https://github.com/jpanther/congo/compare/v2.7.4...HEAD
-[2.7.5]: https://github.com/jpanther/congo/compare/v2.7.4...v2.7.5
 [2.7.4]: https://github.com/jpanther/congo/compare/v2.7.3...v2.7.4
 [2.7.3]: https://github.com/jpanther/congo/compare/v2.7.2...v2.7.3
 [2.7.2]: https://github.com/jpanther/congo/compare/v2.7.1...v2.7.2

assets/css/compiled/main.css

@@ -1,4 +1,4 @@
-/*! Congo v2.7.5 | MIT License | https://github.com/jpanther/congo */
+/*! Congo v2.7.4 | MIT License | https://github.com/jpanther/congo */
 
 /*! tailwindcss v3.3.5 | MIT License | https://tailwindcss.com */
 

assets/css/main.css

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

exampleSite/content/docs/configuration/index.ja.md

@@ -53,7 +53,6 @@ Congoは現在、以下の言語に対応しています:
 | :gb: **English (default)**              | `en`    |
 | :egypt: Arabic                          | `ar`    |
 | :bangladesh: Bengali                    | `bn`    |
-| :bulgaria: Bulgarian                    | `bg`    |
 | :cn: Chinese - Simplified (China)       | `zh-cn` |
 | :taiwan: Chinese - Traditional (Taiwan) | `zh-tw` |
 | :flag-cz: Czech                         | `cs`    |
@@ -74,7 +73,6 @@ Congoは現在、以下の言語に対応しています:
 | :slovakia: Slovak                       | `sk`    |
 | :es: Spanish (Spain)                    | `es`    |
 | :tr: Turkish                            | `tr`    |
-| :ukraine: Ukrainian                     | `uk`    |
 
 翻訳文字列を含むカスタムファイルを `i18n/[code].yaml` に作成することでデフォルトの翻訳をオーバーライドできます。このメソッドを使って新しい言語を追加することもできます。新しい翻訳をコミュニティと共有したい場合、[Pull Request](https://github.com/jpanther/congo/pulls)を作ってください。
 

exampleSite/content/docs/configuration/index.md

@@ -53,7 +53,6 @@ The theme currently supports the following languages out of the box:
 | :gb: **English (default)**              | `en`    |
 | :egypt: Arabic                          | `ar`    |
 | :bangladesh: Bengali                    | `bn`    |
-| :bulgaria: Bulgarian                    | `bg`    |
 | :cn: Chinese - Simplified (China)       | `zh-cn` |
 | :taiwan: Chinese - Traditional (Taiwan) | `zh-tw` |
 | :flag-cz: Czech                         | `cs`    |
@@ -74,7 +73,6 @@ The theme currently supports the following languages out of the box:
 | :slovakia: Slovak                       | `sk`    |
 | :es: Spanish (Spain)                    | `es`    |
 | :tr: Turkish                            | `tr`    |
-| :ukraine: Ukrainian                     | `uk`    |
 
 The default translations can be overridden by creating a custom file in `i18n/[code].yaml` that contains the translation strings. You can also use this method to add new languages. If you'd like to share a new translation with the community, please [open a pull request](https://github.com/jpanther/congo/pulls).
 

i18n/bg.yaml

@@ -1,56 +0,0 @@
-article:
-  anchor_label: "Котва"
-  date: "{{ .Date }}"
-  date_updated: "Обновено: {{ .Date }}"
-  draft: "Чернова"
-  edit_title: "Редактиране на съдържание"
-  reading_time:
-    one: "{{ .Count }} минута"
-    other: "{{ .Count }} минути"
-  reading_time_title: "Време за четене"
-  table_of_contents: "Съдържание"
-  word_count:
-    one: "{{ .Count }} дума"
-    other: "{{ .Count }} думи"
-
-author:
-  byline_title: "Автор"
-
-code:
-  copy: "Копирай"
-  copied: "Копирано"
-
-error:
-  404_title: "Страницата не е намерена :confused:"
-  404_error: "Грешка 404"
-  404_description: "Изглежда, че страницата, която търсите не съществува."
-
-footer:
-  dark_appearance: "Превключи към тъмна тема"
-  light_appearance: "Превключи към светла тема"
-  powered_by: "Осъществено чрез {{ .Hugo }} & {{ .Congo }}"
-
-list:
-  externalurl_title: "Връзка към външен сайт"
-  no_articles: "Тук няма статии за прелистване."
-
-nav:
-  scroll_to_top_title: "Превърти до началото"
-  skip_to_main: "Преминаване към основното съдържание"
-
-search:
-  open_button_title: "Търсене (/)"
-  close_button_title: "Затвори (Esc)"
-  input_placeholder: "Търси"
-
-sharing:
-  email: "Изпращане по имейл"
-  facebook: "Споделяне във Facebook"
-  linkedin: "Споделяне в LinkedIn"
-  mastodon: "Публикуване в Mastodon"
-  pinterest: "Пин в Pinterest"
-  reddit: "Публикуване в Reddit"
-  twitter: "Туит в Twitter"
-
-shortcode:
-  recent_articles: "Последни"

i18n/nl.yaml

@@ -1,7 +1,7 @@
 article:
   anchor_label: "Anker"
   date: "{{ .Date }}"
-  date_updated: "Bijgewerkt: {{ .Date }}"
+  date_updated: "Bijgwerkt: {{ .Date }}"
   draft: "Concept"
   edit_title: "Bewerk inhoud"
   reading_time:

i18n/uk.yaml

@@ -1,60 +0,0 @@
-article:
-  anchor_label: "Закладка"
-  date: "{{ .Date }}"
-  date_updated: "Оновлено {{ .Date }}"
-  draft: "Чернетка"
-  edit_title: "Редагувати"
-  reading_time:
-    one: "{{ .Count }} хвилину"
-    few: "{{ .Count }} хвилини"
-    many: "{{ .Count }} хвилин"
-    other: "{{ .Count }} хвилини"
-  reading_time_title: "Прочитаєте за"
-  table_of_contents: "Зміст"
-  word_count:
-    one: "{{ .Count }} слово"
-    few: "{{ .Count }} слова"
-    many: "{{ .Count }} слів"
-    other: "{{ .Count }} слова"
-
-author:
-  byline_title: "Автор"
-
-code:
-  copy: "Копіювати"
-  copied: "Скопійовано"
-
-error:
-  404_title: "Немає такої сторінки :confused:"
-  404_error: "Помилка 404"
-  404_description: "Здається, сторінки, яка вам потрібна, не існує."
-
-footer:
-  dark_appearance: "Увімкнути темний режим"
-  light_appearance: "Увімкнути світлий режим"
-  powered_by: "Сайт працює на рушії {{ .Hugo }} зі стилем {{ .Congo }}"
-
-list:
-  externalurl_title: "Зовнішнє посилання"
-  no_articles: "Дописів поки що немає"
-
-nav:
-  scroll_to_top_title: "Повернутися на початок сторінки"
-  skip_to_main: "До тексту"
-
-search:
-  open_button_title: "Шукати (/)"
-  close_button_title: "Закрити (Esc)"
-  input_placeholder: "Введіть запит тут"
-
-sharing:
-  email: "Надіслати електронною поштою"
-  facebook: "Поширити на Facebook"
-  linkedin: "Поширити на LinkedIn"
-  mastodon: "Поширити на Mastodon"
-  pinterest: "Зберегти на Pinterest"
-  reddit: "Опублікувати на Reddit"
-  twitter: "Поширити на Twitter"
-
-shortcode:
-  recent_articles: "Недавні дописи"

layouts/partials/footer.html

@@ -4,7 +4,7 @@
     <nav class="pb-4 text-base font-medium text-neutral-500 dark:text-neutral-400">
       <ul class="flex flex-col list-none sm:flex-row">
         {{ range .Site.Menus.footer }}
-          {{ if and (eq .Params.action "locale") (or (not page.IsTranslated) (not site.IsMultiLingual)) }}
+          {{ if and (eq .Params.action "locale") (and (not page.IsTranslated) (not site.IsMultiLingual)) }}
             {{ continue }}
           {{ end }}
           <li class="mb-1 group text-end sm:mb-0 sm:me-7 sm:last:me-0">

layouts/partials/header/basic.html

@@ -9,7 +9,7 @@
       <ul class="flex flex-col list-none text-end sm:flex-row">
         {{ if .Site.Menus.main }}
           {{ range .Site.Menus.main }}
-            {{ if and (eq .Params.action "locale") (or (not page.IsTranslated) (not site.IsMultiLingual)) }}
+            {{ if and (eq .Params.action "locale") (and (not page.IsTranslated) (not site.IsMultiLingual)) }}
               {{ continue }}
             {{ end }}
             <li class="group mb-1 sm:mb-0 sm:me-7 sm:last:me-0.5">

layouts/partials/header/hamburger.html

@@ -25,7 +25,7 @@
             </li>
             {{ if .Site.Menus.main }}
               {{ range .Site.Menus.main }}
-                {{ if and (eq .Params.action "locale") (or (not page.IsTranslated) (not site.IsMultiLingual)) }}
+                {{ if and (eq .Params.action "locale") (and (not page.IsTranslated) (not site.IsMultiLingual)) }}
                   {{ continue }}
                 {{ end }}
                 <li class="mb-1 group">

layouts/partials/header/hybrid.html

@@ -25,7 +25,7 @@
             </li>
             {{ if .Site.Menus.main }}
               {{ range .Site.Menus.main }}
-                {{ if and (eq .Params.action "locale") (or (not page.IsTranslated) (not site.IsMultiLingual)) }}
+                {{ if and (eq .Params.action "locale") (and (not page.IsTranslated) (not site.IsMultiLingual)) }}
                   {{ continue }}
                 {{ end }}
                 <li class="mb-1 group">
@@ -129,7 +129,7 @@
       <ul class="flex-row hidden list-none text-end sm:flex">
         {{ if .Site.Menus.main }}
           {{ range .Site.Menus.main }}
-            {{ if and (eq .Params.action "locale") (or (not page.IsTranslated) (not site.IsMultiLingual)) }}
+            {{ if and (eq .Params.action "locale") (and (not page.IsTranslated) (not site.IsMultiLingual)) }}
               {{ continue }}
             {{ end }}
             <li class="mb-1 group sm:mb-0 sm:me-7 sm:last:me-0">

package-lock.json

@@ -14,7 +14,7 @@
         "chart.js": "^4.4.0",
         "fuse.js": "^7.0.0",
         "katex": "^0.16.9",
-        "mermaid": "^10.6.1",
+        "mermaid": "^10.6.0",
         "prettier": "^3.1.0",
         "prettier-plugin-go-template": "^0.0.15",
         "prettier-plugin-tailwindcss": "^0.5.7",
@@ -1489,9 +1489,9 @@
       }
     },
     "node_modules/mermaid": {
-      "version": "10.6.1",
+      "version": "10.6.0",
-      "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-10.6.1.tgz",
+      "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-10.6.0.tgz",
-      "integrity": "sha512-Hky0/RpOw/1il9X8AvzOEChfJtVvmXm+y7JML5C//ePYMy0/9jCEmW1E1g86x9oDfW9+iVEdTV/i+M6KWRNs4A==",
+      "integrity": "sha512-Hcti+Q2NiWnb2ZCijSX89Bn2i7TCUwosBdIn/d+u63Sz7y40XU6EKMctT4UX4qZuZGfKGZpfOeim2/KTrdR7aQ==",
       "dev": true,
       "dependencies": {
         "@braintree/sanitize-url": "^6.0.1",
@@ -4221,9 +4221,9 @@
       "dev": true
     },
     "mermaid": {
-      "version": "10.6.1",
+      "version": "10.6.0",
-      "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-10.6.1.tgz",
+      "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-10.6.0.tgz",
-      "integrity": "sha512-Hky0/RpOw/1il9X8AvzOEChfJtVvmXm+y7JML5C//ePYMy0/9jCEmW1E1g86x9oDfW9+iVEdTV/i+M6KWRNs4A==",
+      "integrity": "sha512-Hcti+Q2NiWnb2ZCijSX89Bn2i7TCUwosBdIn/d+u63Sz7y40XU6EKMctT4UX4qZuZGfKGZpfOeim2/KTrdR7aQ==",
       "dev": true,
       "requires": {
         "@braintree/sanitize-url": "^6.0.1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hugo-congo-theme",
-  "version": "2.7.5",
+  "version": "2.7.4",
   "description": "Congo theme for Hugo",
   "scripts": {
     "preinstall": "rimraf assets/lib",
@@ -33,7 +33,7 @@
     "chart.js": "^4.4.0",
     "fuse.js": "^7.0.0",
     "katex": "^0.16.9",
-    "mermaid": "^10.6.1",
+    "mermaid": "^10.6.0",
     "prettier": "^3.1.0",
     "prettier-plugin-go-template": "^0.0.15",
     "prettier-plugin-tailwindcss": "^0.5.7",