From dbcce7f34b5473abc1447e82dc2ad7abef81a8fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=92=D0=BE=D1=80?= =?UTF-8?q?=D0=BE=D0=BD?= Date: Mon, 14 Nov 2022 07:46:55 +0300 Subject: [PATCH 1/4] Create ru.yaml --- i18n/ru.yaml | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 i18n/ru.yaml diff --git a/i18n/ru.yaml b/i18n/ru.yaml new file mode 100644 index 00000000..f8ff7b07 --- /dev/null +++ b/i18n/ru.yaml @@ -0,0 +1,64 @@ +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 }} слов" + views: + one: "{{ .Count }} просмотр" + other: "{{ .Count }} просмотров" + likes: + one: "{{ .Count }} нравится" + other: "{{ .Count }} нравится" + +author: + byline_title: "Автор" + +code: + copy: "Копировать" + copied: "Скопировано" + +error: + 404_title: "Страница не найдена: в замешательстве:" + 404_error: "Ошибка 404" + 404_description: "Похоже, запрошенная вами страница не существует." + +footer: + dark_appearance: "Переключить на темный вид" + light_appearance: "Переключить на светлый вид" + powered_by: "Работает на {{ .Hugo }} & {{ .Theme }}" + +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" + pinterest: "PДобавить в Pinterest" + reddit: "Отправить в Reddit" + twitter: "Твитнуть в Twitter" + +shortcode: + recent_articles: "Недавние" + +recent: + show_more: "Показать еще" From de2d75eee97e88de9085cdcf3b1b187a5a6c1c46 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Nov 2022 05:12:02 +0000 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=93=8C=20Bump=20tailwindcss=20from=20?= =?UTF-8?q?3.2.3=20to=203.2.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [tailwindcss](https://github.com/tailwindlabs/tailwindcss) from 3.2.3 to 3.2.4. - [Release notes](https://github.com/tailwindlabs/tailwindcss/releases) - [Changelog](https://github.com/tailwindlabs/tailwindcss/blob/master/CHANGELOG.md) - [Commits](https://github.com/tailwindlabs/tailwindcss/compare/v3.2.3...v3.2.4) --- updated-dependencies: - dependency-name: tailwindcss dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 18 +++++++++--------- package.json | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 36f9d5b1..dcc74d84 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "hugo-blowfish-theme", - "version": "2.11.0", + "version": "2.12.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "hugo-blowfish-theme", - "version": "2.11.0", + "version": "2.12.1", "hasInstallScript": true, "license": "MIT", "dependencies": { @@ -25,7 +25,7 @@ "prettier-plugin-go-template": "^0.0.13", "prettier-plugin-tailwindcss": "^0.1.13", "rimraf": "^3.0.2", - "tailwindcss": "^3.2.3", + "tailwindcss": "^3.2.4", "vendor-copy": "^3.0.1" } }, @@ -1900,9 +1900,9 @@ } }, "node_modules/tailwindcss": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.3.tgz", - "integrity": "sha512-Xt9D4PK4zuuQCEB8bwK9JUCKmTgUwyac/6b0/42Vqhgl6YJkep+Wf5wq+5uXYfmrupdAD0YY2NY1hyZp1HjRrg==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.4.tgz", + "integrity": "sha512-AhwtHCKMtR71JgeYDaswmZXhPcW9iuI9Sp2LvZPo9upDZ7231ZJ7eA9RaURbhpXGVlrjX4cFNlB4ieTetEb7hQ==", "dependencies": { "arg": "^5.0.2", "chokidar": "^3.5.3", @@ -3439,9 +3439,9 @@ "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==" }, "tailwindcss": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.3.tgz", - "integrity": "sha512-Xt9D4PK4zuuQCEB8bwK9JUCKmTgUwyac/6b0/42Vqhgl6YJkep+Wf5wq+5uXYfmrupdAD0YY2NY1hyZp1HjRrg==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.4.tgz", + "integrity": "sha512-AhwtHCKMtR71JgeYDaswmZXhPcW9iuI9Sp2LvZPo9upDZ7231ZJ7eA9RaURbhpXGVlrjX4cFNlB4ieTetEb7hQ==", "requires": { "arg": "^5.0.2", "chokidar": "^3.5.3", diff --git a/package.json b/package.json index a81639b4..31e4e38f 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "prettier-plugin-go-template": "^0.0.13", "prettier-plugin-tailwindcss": "^0.1.13", "rimraf": "^3.0.2", - "tailwindcss": "^3.2.3", + "tailwindcss": "^3.2.4", "vendor-copy": "^3.0.1" }, "vendorCopy": [], From cc1c2d70e02b0f8c051babee2c7f0f9431dcbb09 Mon Sep 17 00:00:00 2001 From: Chris Banes Date: Mon, 14 Nov 2022 09:53:48 +0000 Subject: [PATCH 3/4] Allow overwriting of sharing links This PR changes this by grouping the links within an object key: `Site.Data.sharing.links`. This means that sites can provide their own `data/sharing.json` file and overwrite the `links` key, to provide links of their own links. --- data/sharing.json | 60 +++++++++++++++-------------- layouts/partials/sharing-links.html | 5 +-- 2 files changed, 33 insertions(+), 32 deletions(-) diff --git a/data/sharing.json b/data/sharing.json index 34e60899..7a43b491 100644 --- a/data/sharing.json +++ b/data/sharing.json @@ -1,32 +1,34 @@ { - "email": { - "icon": "email", - "title": "sharing.email", - "url": "mailto:?body=%s&subject=%s" - }, - "facebook": { - "icon": "facebook", - "title": "sharing.facebook", - "url": "https://www.facebook.com/sharer/sharer.php?u=%s"e=%s" - }, - "linkedin": { - "icon": "linkedin", - "title": "sharing.linkedin", - "url": "https://www.linkedin.com/shareArticle?mini=true&url=%s&title=%s" - }, - "pinterest": { - "icon": "pinterest", - "title": "sharing.pinterest", - "url": "https://pinterest.com/pin/create/bookmarklet/?url=%s&description=%s" - }, - "reddit": { - "icon": "reddit", - "title": "sharing.reddit", - "url": "https://reddit.com/submit/?url=%s&resubmit=true&title=%s" - }, - "twitter": { - "icon": "twitter", - "title": "sharing.twitter", - "url": "https://twitter.com/intent/tweet/?url=%s&text=%s" + "links": { + "email": { + "icon": "email", + "title": "sharing.email", + "url": "mailto:?body=%s&subject=%s" + }, + "facebook": { + "icon": "facebook", + "title": "sharing.facebook", + "url": "https://www.facebook.com/sharer/sharer.php?u=%s"e=%s" + }, + "linkedin": { + "icon": "linkedin", + "title": "sharing.linkedin", + "url": "https://www.linkedin.com/shareArticle?mini=true&url=%s&title=%s" + }, + "pinterest": { + "icon": "pinterest", + "title": "sharing.pinterest", + "url": "https://pinterest.com/pin/create/bookmarklet/?url=%s&description=%s" + }, + "reddit": { + "icon": "reddit", + "title": "sharing.reddit", + "url": "https://reddit.com/submit/?url=%s&resubmit=true&title=%s" + }, + "twitter": { + "icon": "twitter", + "title": "sharing.twitter", + "url": "https://twitter.com/intent/tweet/?url=%s&text=%s" + } } } diff --git a/layouts/partials/sharing-links.html b/layouts/partials/sharing-links.html index ca0162c6..923cd6e6 100644 --- a/layouts/partials/sharing-links.html +++ b/layouts/partials/sharing-links.html @@ -1,8 +1,7 @@ {{ with .Params.sharingLinks | default (.Site.Params.article.sharingLinks | default false) }} - {{ $links := site.Data.sharing }}
- {{ range . }} - {{ with index $links . }} + {{ range $.Site.Data.sharing.links }} + {{ with . }} Date: Mon, 14 Nov 2022 20:53:56 +0000 Subject: [PATCH 4/4] tested and prepd release version --- assets/css/compiled/main.css | 2 +- exampleSite/config/_default/params.toml | 2 +- layouts/partials/sharing-links.html | 1 + package.json | 3 ++- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/assets/css/compiled/main.css b/assets/css/compiled/main.css index 355af29c..c4312d9d 100644 --- a/assets/css/compiled/main.css +++ b/assets/css/compiled/main.css @@ -1,6 +1,6 @@ /*! Blowfish | MIT License | https://github.com/nunocoracao/blowfish */ -/*! tailwindcss v3.2.3 | MIT License | https://tailwindcss.com */ +/*! tailwindcss v3.2.4 | MIT License | https://tailwindcss.com */ /* 1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4) diff --git a/exampleSite/config/_default/params.toml b/exampleSite/config/_default/params.toml index e4c5d919..d713fb3b 100644 --- a/exampleSite/config/_default/params.toml +++ b/exampleSite/config/_default/params.toml @@ -97,7 +97,7 @@ mainSections = ["docs"] [buymeacoffee] identifier = "nunocoracao" globalWidget = true - globalWidgetMessage = "Thank you for visiting." + globalWidgetMessage = "" globalWidgetColor = "#FFDD00" globalWidgetPosition = "Right" diff --git a/layouts/partials/sharing-links.html b/layouts/partials/sharing-links.html index 923cd6e6..7decbcf8 100644 --- a/layouts/partials/sharing-links.html +++ b/layouts/partials/sharing-links.html @@ -3,6 +3,7 @@ {{ range $.Site.Data.sharing.links }} {{ with . }}