Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(i18n): allow page.lang to override site.lang #1586

Merged
merged 5 commits into from
Mar 4, 2024

Conversation

neilboyd
Copy link
Contributor

@neilboyd neilboyd commented Mar 2, 2024

Type of change

  • New feature (non-breaking change which adds functionality)

Description

Allow lang on page/post to override site.lang.

This is useful to create folders (collections) of different languages. For example, I have folders _en, _ru and _tr (relative urls en, ru and tr), and then define these as collections in _config.xml:

collections:
  en:
    output: true
  ru:
    output: true
  tr:
    output: true

defaults:
  - scope:
      path: ""
      type: en
    values:
      lang: en
  - scope:
      path: ""
      type: tr
    values:
      lang: tr-TR
  - scope:
      path: ""
      type: ru
    values:
      lang: ru-RU

It's also possible to just put lang: ru-RU directly into the page front matter.

Additional context

I removed usage of site.alt_lang in the html lang tag of default layout because I'm not sure what that was for. If there's a reason for it then I could put it back.

I don't exactly know what js-selector.html is doing with lang, so I couldn't test it, but the change seems obvious.

neilboyd added a commit to neilboyd/learn-abkhazian that referenced this pull request Mar 2, 2024
@neilboyd neilboyd marked this pull request as ready for review March 2, 2024 16:52
@cotes2020 cotes2020 changed the title allow page.lang to override site.lang feat(i18n): allow page.lang to override site.lang Mar 3, 2024
Copy link
Owner

@cotes2020 cotes2020 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for adding this feature. I understand your motivation and it makes sense.

  • site.alt_lang is a trick to get the site to use a different lang attribute than the language on the UI.

  • The lang of the js-selector.html is used to specify the datetime format of the tooltip, which is what is inside the floating window when the mouse hovers over the date.
    Screen Shot 2024-03-03 at 15 47 47

_layouts/default.html Outdated Show resolved Hide resolved
_layouts/default.html Show resolved Hide resolved
_layouts/default.html Outdated Show resolved Hide resolved
_includes/lang.html Show resolved Hide resolved
_includes/js-selector.html Show resolved Hide resolved
_layouts/default.html Outdated Show resolved Hide resolved
_layouts/default.html Outdated Show resolved Hide resolved
_includes/lang.html Show resolved Hide resolved
neilboyd and others added 4 commits March 5, 2024 02:15
Co-authored-by: Cotes Chung <11371340+cotes2020@users.noreply.github.com>
Signed-off-by: Neil Boyd <NeilBoyd@gmail.com>
@cotes2020 cotes2020 merged commit 547b95c into cotes2020:master Mar 4, 2024
3 of 5 checks passed
mill413 pushed a commit to mill413/mill413.github.io that referenced this pull request Mar 6, 2024
@cotes2020 cotes2020 added this to the v7.0.0 milestone Mar 9, 2024
@neilboyd neilboyd deleted the page-lang branch March 13, 2024 17:45
github-actions bot pushed a commit that referenced this pull request May 11, 2024
## [7.0.0](v6.5.5...v7.0.0) (2024-05-11)

### ⚠ BREAKING CHANGES

* optimize the resource hints (#1717)
* rename media-url file and related parameters (#1651)
* rename comment setting parameter (#1563)
* **analytics:** add post pageviews for GoatCounter (#1543)

### Features

* add cloudflare web analytics ([#1723](#1723)) ([c17fba4](c17fba4))
* add support for embed video files ([#1558](#1558)) ([9592146](9592146))
* add support for giscus strict title matching ([#1614](#1614)) ([700fd5b](700fd5b))
* **analytics:** add post pageviews for GoatCounter ([#1543](#1543)) ([b641b3f](b641b3f))
* **analytics:** add Umami and Matomo tracking codes ([#1658](#1658)) ([61bdca2](61bdca2))
* change site verification settings ([#1561](#1561)) ([e436387](e436387))
* **deps:** move `MathJax` configuration to a separate file ([#1670](#1670)) ([44f552c](44f552c))
* display theme version in footer ([#1611](#1611)) ([8349314](8349314))
* **i18n:** allow `page.lang` to override `site.lang` ([#1586](#1586)) ([547b95c](547b95c))
* make post description customizable ([#1602](#1602)) ([f865336](f865336))
* **media:** support audio and video tag with multi sources ([#1618](#1618)) ([23be416](23be416))

### Bug Fixes

* make TOC title and entries visible at the same time ([#1711](#1711)) ([e0950fc](e0950fc))
* mode toggle not outlined when receiving keyboard focus ([#1690](#1690)) ([cd37f63](cd37f63))
* prevent footnote back arrow from becoming an emoji ([#1716](#1716)) ([8608147](8608147))
* **pwa:** skip range requests in service worker ([#1672](#1672)) ([76d58fe](76d58fe))
* search result prompt is empty ([#1583](#1583)) ([8a2afae](8a2afae))
* use `https` for Weibo sharing URL ([#1612](#1612)) ([8e5fbb7](8e5fbb7))

### Improvements

* improve <hr> visibility in dark mode ([#1565](#1565)) ([4ddd5c4](4ddd5c4))
* lean bootstrap javascript ([#1734](#1734)) ([ddb48ed](ddb48ed))
* rename comment setting parameter ([#1563](#1563)) ([f8390d4](f8390d4))
* replace jQuery with Vanilla JS ([#1681](#1681)) ([fe7afa3](fe7afa3))
* simplify mode toggle script ([#1692](#1692)) ([d4a6d64](d4a6d64))
* tree shaking Bootstrap CSS ([#1736](#1736)) ([363a3d9](363a3d9))

### Changes

* optimize the resource hints ([#1717](#1717)) ([dcb0add](dcb0add))
* rename media-url file and related parameters ([#1651](#1651)) ([9f8aeaa](9f8aeaa))
Copy link

🎉 This PR is included in version 7.0.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

kimbob13 pushed a commit to kimbob13/kimbob13.github.io that referenced this pull request May 25, 2024
kimbob13 pushed a commit to kimbob13/kimbob13.github.io that referenced this pull request May 25, 2024
## [7.0.0](cotes2020/jekyll-theme-chirpy@v6.5.5...v7.0.0) (2024-05-11)

### ⚠ BREAKING CHANGES

* optimize the resource hints (cotes2020#1717)
* rename media-url file and related parameters (cotes2020#1651)
* rename comment setting parameter (cotes2020#1563)
* **analytics:** add post pageviews for GoatCounter (cotes2020#1543)

### Features

* add cloudflare web analytics ([cotes2020#1723](cotes2020#1723)) ([c17fba4](cotes2020@c17fba4))
* add support for embed video files ([cotes2020#1558](cotes2020#1558)) ([9592146](cotes2020@9592146))
* add support for giscus strict title matching ([cotes2020#1614](cotes2020#1614)) ([700fd5b](cotes2020@700fd5b))
* **analytics:** add post pageviews for GoatCounter ([cotes2020#1543](cotes2020#1543)) ([b641b3f](cotes2020@b641b3f))
* **analytics:** add Umami and Matomo tracking codes ([cotes2020#1658](cotes2020#1658)) ([61bdca2](cotes2020@61bdca2))
* change site verification settings ([cotes2020#1561](cotes2020#1561)) ([e436387](cotes2020@e436387))
* **deps:** move `MathJax` configuration to a separate file ([cotes2020#1670](cotes2020#1670)) ([44f552c](cotes2020@44f552c))
* display theme version in footer ([cotes2020#1611](cotes2020#1611)) ([8349314](cotes2020@8349314))
* **i18n:** allow `page.lang` to override `site.lang` ([cotes2020#1586](cotes2020#1586)) ([547b95c](cotes2020@547b95c))
* make post description customizable ([cotes2020#1602](cotes2020#1602)) ([f865336](cotes2020@f865336))
* **media:** support audio and video tag with multi sources ([cotes2020#1618](cotes2020#1618)) ([23be416](cotes2020@23be416))

### Bug Fixes

* make TOC title and entries visible at the same time ([cotes2020#1711](cotes2020#1711)) ([e0950fc](cotes2020@e0950fc))
* mode toggle not outlined when receiving keyboard focus ([cotes2020#1690](cotes2020#1690)) ([cd37f63](cotes2020@cd37f63))
* prevent footnote back arrow from becoming an emoji ([cotes2020#1716](cotes2020#1716)) ([8608147](cotes2020@8608147))
* **pwa:** skip range requests in service worker ([cotes2020#1672](cotes2020#1672)) ([76d58fe](cotes2020@76d58fe))
* search result prompt is empty ([cotes2020#1583](cotes2020#1583)) ([8a2afae](cotes2020@8a2afae))
* use `https` for Weibo sharing URL ([cotes2020#1612](cotes2020#1612)) ([8e5fbb7](cotes2020@8e5fbb7))

### Improvements

* improve <hr> visibility in dark mode ([cotes2020#1565](cotes2020#1565)) ([4ddd5c4](cotes2020@4ddd5c4))
* lean bootstrap javascript ([cotes2020#1734](cotes2020#1734)) ([ddb48ed](cotes2020@ddb48ed))
* rename comment setting parameter ([cotes2020#1563](cotes2020#1563)) ([f8390d4](cotes2020@f8390d4))
* replace jQuery with Vanilla JS ([cotes2020#1681](cotes2020#1681)) ([fe7afa3](cotes2020@fe7afa3))
* simplify mode toggle script ([cotes2020#1692](cotes2020#1692)) ([d4a6d64](cotes2020@d4a6d64))
* tree shaking Bootstrap CSS ([cotes2020#1736](cotes2020#1736)) ([363a3d9](cotes2020@363a3d9))

### Changes

* optimize the resource hints ([cotes2020#1717](cotes2020#1717)) ([dcb0add](cotes2020@dcb0add))
* rename media-url file and related parameters ([cotes2020#1651](cotes2020#1651)) ([9f8aeaa](cotes2020@9f8aeaa))
gudtldn pushed a commit to gudtldn/gudtldn.github.io that referenced this pull request Jul 26, 2024
gudtldn pushed a commit to gudtldn/gudtldn.github.io that referenced this pull request Jul 26, 2024
## [7.0.0](cotes2020/jekyll-theme-chirpy@v6.5.5...v7.0.0) (2024-05-11)

### ⚠ BREAKING CHANGES

* optimize the resource hints (cotes2020#1717)
* rename media-url file and related parameters (cotes2020#1651)
* rename comment setting parameter (cotes2020#1563)
* **analytics:** add post pageviews for GoatCounter (cotes2020#1543)

### Features

* add cloudflare web analytics ([cotes2020#1723](cotes2020#1723)) ([c17fba4](cotes2020@c17fba4))
* add support for embed video files ([cotes2020#1558](cotes2020#1558)) ([9592146](cotes2020@9592146))
* add support for giscus strict title matching ([cotes2020#1614](cotes2020#1614)) ([700fd5b](cotes2020@700fd5b))
* **analytics:** add post pageviews for GoatCounter ([cotes2020#1543](cotes2020#1543)) ([b641b3f](cotes2020@b641b3f))
* **analytics:** add Umami and Matomo tracking codes ([cotes2020#1658](cotes2020#1658)) ([61bdca2](cotes2020@61bdca2))
* change site verification settings ([cotes2020#1561](cotes2020#1561)) ([e436387](cotes2020@e436387))
* **deps:** move `MathJax` configuration to a separate file ([cotes2020#1670](cotes2020#1670)) ([44f552c](cotes2020@44f552c))
* display theme version in footer ([cotes2020#1611](cotes2020#1611)) ([8349314](cotes2020@8349314))
* **i18n:** allow `page.lang` to override `site.lang` ([cotes2020#1586](cotes2020#1586)) ([547b95c](cotes2020@547b95c))
* make post description customizable ([cotes2020#1602](cotes2020#1602)) ([f865336](cotes2020@f865336))
* **media:** support audio and video tag with multi sources ([cotes2020#1618](cotes2020#1618)) ([23be416](cotes2020@23be416))

### Bug Fixes

* make TOC title and entries visible at the same time ([cotes2020#1711](cotes2020#1711)) ([e0950fc](cotes2020@e0950fc))
* mode toggle not outlined when receiving keyboard focus ([cotes2020#1690](cotes2020#1690)) ([cd37f63](cotes2020@cd37f63))
* prevent footnote back arrow from becoming an emoji ([cotes2020#1716](cotes2020#1716)) ([8608147](cotes2020@8608147))
* **pwa:** skip range requests in service worker ([cotes2020#1672](cotes2020#1672)) ([76d58fe](cotes2020@76d58fe))
* search result prompt is empty ([cotes2020#1583](cotes2020#1583)) ([8a2afae](cotes2020@8a2afae))
* use `https` for Weibo sharing URL ([cotes2020#1612](cotes2020#1612)) ([8e5fbb7](cotes2020@8e5fbb7))

### Improvements

* improve <hr> visibility in dark mode ([cotes2020#1565](cotes2020#1565)) ([4ddd5c4](cotes2020@4ddd5c4))
* lean bootstrap javascript ([cotes2020#1734](cotes2020#1734)) ([ddb48ed](cotes2020@ddb48ed))
* rename comment setting parameter ([cotes2020#1563](cotes2020#1563)) ([f8390d4](cotes2020@f8390d4))
* replace jQuery with Vanilla JS ([cotes2020#1681](cotes2020#1681)) ([fe7afa3](cotes2020@fe7afa3))
* simplify mode toggle script ([cotes2020#1692](cotes2020#1692)) ([d4a6d64](cotes2020@d4a6d64))
* tree shaking Bootstrap CSS ([cotes2020#1736](cotes2020#1736)) ([363a3d9](cotes2020@363a3d9))

### Changes

* optimize the resource hints ([cotes2020#1717](cotes2020#1717)) ([dcb0add](cotes2020@dcb0add))
* rename media-url file and related parameters ([cotes2020#1651](cotes2020#1651)) ([9f8aeaa](cotes2020@9f8aeaa))
ryo-wijaya pushed a commit to ryo-wijaya/blog that referenced this pull request Sep 9, 2024
## [7.0.0](cotes2020/jekyll-theme-chirpy@v6.5.5...v7.0.0) (2024-05-11)

### ⚠ BREAKING CHANGES

* optimize the resource hints (#1717)
* rename media-url file and related parameters (#1651)
* rename comment setting parameter (#1563)
* **analytics:** add post pageviews for GoatCounter (#1543)

### Features

* add cloudflare web analytics ([#1723](cotes2020/jekyll-theme-chirpy#1723)) ([ce53717](cotes2020/jekyll-theme-chirpy@ce53717))
* add support for embed video files ([#1558](cotes2020/jekyll-theme-chirpy#1558)) ([ec6fbc8](cotes2020/jekyll-theme-chirpy@ec6fbc8))
* add support for giscus strict title matching ([#1614](cotes2020/jekyll-theme-chirpy#1614)) ([49fc3a7](cotes2020/jekyll-theme-chirpy@49fc3a7))
* **analytics:** add post pageviews for GoatCounter ([#1543](cotes2020/jekyll-theme-chirpy#1543)) ([a19a00d](cotes2020/jekyll-theme-chirpy@a19a00d))
* **analytics:** add Umami and Matomo tracking codes ([#1658](cotes2020/jekyll-theme-chirpy#1658)) ([795f477](cotes2020/jekyll-theme-chirpy@795f477))
* change site verification settings ([#1561](cotes2020/jekyll-theme-chirpy#1561)) ([2240821](cotes2020/jekyll-theme-chirpy@2240821))
* **deps:** move `MathJax` configuration to a separate file ([#1670](cotes2020/jekyll-theme-chirpy#1670)) ([f13cfb3](cotes2020/jekyll-theme-chirpy@f13cfb3))
* display theme version in footer ([#1611](cotes2020/jekyll-theme-chirpy#1611)) ([9b30364](cotes2020/jekyll-theme-chirpy@9b30364))
* **i18n:** allow `page.lang` to override `site.lang` ([#1586](cotes2020/jekyll-theme-chirpy#1586)) ([615af0a](cotes2020/jekyll-theme-chirpy@615af0a))
* make post description customizable ([#1602](cotes2020/jekyll-theme-chirpy#1602)) ([8fc6757](cotes2020/jekyll-theme-chirpy@8fc6757))
* **media:** support audio and video tag with multi sources ([#1618](cotes2020/jekyll-theme-chirpy#1618)) ([30a6617](cotes2020/jekyll-theme-chirpy@30a6617))

### Bug Fixes

* make TOC title and entries visible at the same time ([#1711](cotes2020/jekyll-theme-chirpy#1711)) ([d6461d0](cotes2020/jekyll-theme-chirpy@d6461d0))
* mode toggle not outlined when receiving keyboard focus ([#1690](cotes2020/jekyll-theme-chirpy#1690)) ([b480ce2](cotes2020/jekyll-theme-chirpy@b480ce2))
* prevent footnote back arrow from becoming an emoji ([#1716](cotes2020/jekyll-theme-chirpy#1716)) ([68b9caa](cotes2020/jekyll-theme-chirpy@68b9caa))
* **pwa:** skip range requests in service worker ([#1672](cotes2020/jekyll-theme-chirpy#1672)) ([94a1401](cotes2020/jekyll-theme-chirpy@94a1401))
* search result prompt is empty ([#1583](cotes2020/jekyll-theme-chirpy#1583)) ([24eaef4](cotes2020/jekyll-theme-chirpy@24eaef4))
* use `https` for Weibo sharing URL ([#1612](cotes2020/jekyll-theme-chirpy#1612)) ([8ed2bb7](cotes2020/jekyll-theme-chirpy@8ed2bb7))

### Improvements

* improve <hr> visibility in dark mode ([#1565](cotes2020/jekyll-theme-chirpy#1565)) ([ece9ae0](cotes2020/jekyll-theme-chirpy@ece9ae0))
* lean bootstrap javascript ([#1734](cotes2020/jekyll-theme-chirpy#1734)) ([05341c8](cotes2020/jekyll-theme-chirpy@05341c8))
* rename comment setting parameter ([#1563](cotes2020/jekyll-theme-chirpy#1563)) ([30b3972](cotes2020/jekyll-theme-chirpy@30b3972))
* replace jQuery with Vanilla JS ([#1681](cotes2020/jekyll-theme-chirpy#1681)) ([99efa1e](cotes2020/jekyll-theme-chirpy@99efa1e))
* simplify mode toggle script ([#1692](cotes2020/jekyll-theme-chirpy#1692)) ([90ce15f](cotes2020/jekyll-theme-chirpy@90ce15f))
* tree shaking Bootstrap CSS ([#1736](cotes2020/jekyll-theme-chirpy#1736)) ([3892198](cotes2020/jekyll-theme-chirpy@3892198))

### Changes

* optimize the resource hints ([#1717](cotes2020/jekyll-theme-chirpy#1717)) ([ac3eb35](cotes2020/jekyll-theme-chirpy@ac3eb35))
* rename media-url file and related parameters ([#1651](cotes2020/jekyll-theme-chirpy#1651)) ([787cbeb](cotes2020/jekyll-theme-chirpy@787cbeb))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants