From 2ea145068b4f2c2add6d0fbaafed456827687f9f Mon Sep 17 00:00:00 2001 From: JesperDramsch Date: Wed, 2 Sep 2026 20:21:38 +0000 Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=94=84=20synced=20local=20'.github/wo?= =?UTF-8?q?rkflows/'=20with=20remote=20'workflows/code-quality/'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/codeql.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 3b51566f43..09f3a813ae 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -4,14 +4,8 @@ name: CodeQL Analysis on: push: branches: [ main, master ] - paths-ignore: - - '_data/**' - - .all-contributorsrc pull_request: branches: [ main, master ] - paths-ignore: - - '_data/**' - - .all-contributorsrc schedule: - cron: '0 0 * * 0' @@ -22,7 +16,7 @@ jobs: security-events: write steps: - - uses: actions/checkout@v7 + - uses: actions/checkout@v7.0.1 - name: Initialize CodeQL uses: github/codeql-action/init@v4.37.9 with: From b3e23243d8669b92349d05e9bfcf382126577cdf Mon Sep 17 00:00:00 2001 From: JesperDramsch Date: Wed, 2 Sep 2026 20:21:38 +0000 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=94=84=20synced=20local=20'./'=20with?= =?UTF-8?q?=20remote=20'configs/python/'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 20 -------------------- .pre-commit-config.yaml | 18 +----------------- ruff.toml | 3 --- 3 files changed, 1 insertion(+), 40 deletions(-) diff --git a/.gitignore b/.gitignore index 1113a5eac1..74d610e9fc 100644 --- a/.gitignore +++ b/.gitignore @@ -5,15 +5,6 @@ vendor .DS_Store .idea .tmp -.jekyll-metadata -.playwright-mcp/ - -# Claude Code configuration -.claude/ -CLAUDE.md - -# Temporary workflow files -.github/enrichment_review.md # Byte-compiled / optimized / DLL files __pycache__/ @@ -67,13 +58,6 @@ coverage.xml .hypothesis/ .pytest_cache/ cover/ -coverage/ -test-results/ - -# Test files -test-*.html -*.test.html -static/test-*.html # Translations *.mo @@ -161,7 +145,6 @@ venv.bak/ # mkdocs documentation /site -/playwright-report # mypy .mypy_cache/ @@ -188,6 +171,3 @@ utils/tidy_conf/data/.tmp/ # pixi environments .pixi *.egg-info - -# Node modules -node_modules/ diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0f0fa0fb60..0cf98ed6e4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,5 +1,3 @@ ---- -exclude: '.*[\\/]pretty_.*\.html$' repos: - repo: https://github.com/pre-commit/pre-commit-hooks rev: v4.6.0 @@ -7,9 +5,7 @@ repos: - id: check-yaml # Check YAML files for syntax errors - id: debug-statements # Check for debugger imports and py37+ breakpoint() - id: end-of-file-fixer # Ensure files end in a newline - exclude: '^pretty_.*\.html$' - id: trailing-whitespace # Trailing whitespace checker - exclude: '^pretty_.*\.html$' - id: check-added-large-files # Check for large files added to git - id: check-merge-conflict # Check for files that contain merge conflict strings - repo: https://github.com/pre-commit/pygrep-hooks @@ -27,7 +23,7 @@ repos: - --force-single-line-imports - --profile black - repo: https://github.com/asottile/pyupgrade # Upgrade Python syntax - rev: v3.21.2 + rev: v3.15.2 hooks: - id: pyupgrade args: @@ -58,15 +54,3 @@ repos: - --check-protected # Check protected methods - --check-class # Check class docstrings - --disable=E113 # Disable empty docstrings - - --summary # Print a summary - -ci: - autofix_commit_msg: | - [pre-commit.ci] auto fixes from pre-commit.com hooks - - for more information, see https://pre-commit.ci - autofix_prs: true - autoupdate_branch: 'automated/pre-commit-autoupdate' - autoupdate_commit_msg: '[pre-commit.ci] pre-commit autoupdate' - autoupdate_schedule: monthly - submodules: false diff --git a/ruff.toml b/ruff.toml index f96ca32da2..3e7557b7c3 100644 --- a/ruff.toml +++ b/ruff.toml @@ -56,9 +56,6 @@ ignore = [ ] -[lint.per-file-ignores] -# S603: subprocess with validated URL input for lynx text extraction -"utils/enrich_tba.py" = ["S603"] [lint.pydocstyle] convention = "numpy" From 7ccfcd23b2198fb3bc8eea6c12e5dff254bf597a Mon Sep 17 00:00:00 2001 From: JesperDramsch Date: Wed, 2 Sep 2026 20:21:38 +0000 Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=94=84=20synced=20local=20'.github/wo?= =?UTF-8?q?rkflows/labeler.yml'=20with=20remote=20'workflows/issue-pr/labe?= =?UTF-8?q?ler.yml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/labeler.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index 593821d10d..bf2103b2e0 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -9,4 +9,4 @@ jobs: pull-requests: write runs-on: ubuntu-latest steps: - - uses: actions/labeler@v7 + - uses: actions/labeler@v7.0.0 From f93519620feeaed102c1447a78df594e214d4327 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 2 Sep 2026 20:21:57 +0000 Subject: [PATCH 4/4] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- _i18n/de/dates/pretty_dates.html | 10 +++++----- _i18n/en/dates/pretty_dates.html | 10 +++++----- _i18n/es/dates/pretty_dates.html | 10 +++++----- _i18n/fr/dates/pretty_dates.html | 10 +++++----- _i18n/hi/dates/pretty_dates.html | 10 +++++----- _i18n/id/dates/pretty_dates.html | 10 +++++----- _i18n/pt-br/dates/pretty_dates.html | 10 +++++----- _i18n/ru/dates/pretty_dates.html | 10 +++++----- _i18n/zh-cn/dates/pretty_dates.html | 10 +++++----- 9 files changed, 45 insertions(+), 45 deletions(-) diff --git a/_i18n/de/dates/pretty_dates.html b/_i18n/de/dates/pretty_dates.html index a00ecd79a9..964b9b3722 100644 --- a/_i18n/de/dates/pretty_dates.html +++ b/_i18n/de/dates/pretty_dates.html @@ -15,20 +15,20 @@ {% else -%} {% assign start_date = include.start | date: "%Y-%m-%d" -%} {% assign end_date = include.end | date: "%Y-%m-%d" -%} - + {% if start_date == end_date -%} {% assign day = start_date | date: "%-d" -%} {% assign year = start_date | date: "%Y" -%} {% capture month %}{% t "times.months.{{ start_date | date: '%B' }}" %}{% endcapture -%} {% capture pretty_date %}{{ day }}. {{ month }} {{ year }}{% endcapture -%} - + {% elsif start_date | date: "%Y-%m" == end_date | date: "%Y-%m" -%} {% assign start_day = start_date | date: "%-d" -%} {% assign end_day = end_date | date: "%-d" -%} {% capture month %}{% t "times.months.{{ start_date | date: '%B' }}" %}{% endcapture -%} {% assign year = start_date | date: "%Y" -%} {% capture pretty_date %}{{ start_day }}. – {{ end_day }}. {{ month }} {{ year }}{% endcapture -%} - + {% elsif start_date | date: "%Y" == end_date | date: "%Y" -%} {% assign start_day = start_date | date: "%-d" -%} {% assign end_day = end_date | date: "%-d" -%} @@ -36,7 +36,7 @@ {% capture end_month %}{% t "times.months.{{ end_date | date: '%B' }}" %}{% endcapture -%} {% assign year = start_date | date: "%Y" -%} {% capture pretty_date %}{{ start_day }}. {{ start_month }} – {{ end_day }}. {{ end_month }} {{ year }}{% endcapture -%} - + {% else -%} {% assign start_day = start_date | date: "%-d" -%} {% assign end_day = end_date | date: "%-d" -%} @@ -46,4 +46,4 @@ {% assign end_year = end_date | date: "%Y" -%} {% capture pretty_date %}{{ start_day }}. {{ start_month }} {{ start_year }} – {{ end_day }}. {{ end_month }} {{ end_year }}{% endcapture -%} {% endif -%} -{% endif -%}{{ pretty_date | strip }} \ No newline at end of file +{% endif -%}{{ pretty_date | strip }} diff --git a/_i18n/en/dates/pretty_dates.html b/_i18n/en/dates/pretty_dates.html index aa7863a87d..9086024244 100644 --- a/_i18n/en/dates/pretty_dates.html +++ b/_i18n/en/dates/pretty_dates.html @@ -15,14 +15,14 @@ {% else %} {% assign start_date = include.start | date: "%Y-%m-%d" %} {% assign end_date = include.end | date: "%Y-%m-%d" %} - + {% if start_date == end_date %} {%- comment -%}When start and end dates are the same{%- endcomment -%} {% assign day = start_date | date: "%-d" %} {% assign year = start_date | date: "%Y" %} {% capture month %}{% t "times.months.{{ start_date | date: '%B' }}" %}{% endcapture %} {% capture pretty_date %}{{ month }} {{ day }}, {{ year }}{% endcapture %} - + {% elsif start_date | date: "%Y-%m" == end_date | date: "%Y-%m" %} {%- comment -%}When start and end dates are in the same month{% endcomment %} {% assign start_day = start_date | date: "%-d" %} @@ -30,7 +30,7 @@ {% capture month %}{% t "times.months.{{ start_date | date: '%B' }}" %}{% endcapture %} {% assign year = start_date | date: "%Y" %} {% capture pretty_date %}{{ month }} {{ start_day }} – {{ end_day }}, {{ year }}{% endcapture %} - + {% elsif start_date | date: "%Y" == end_date | date: "%Y" %} {%- comment -%}When start and end dates are in the same year{%- endcomment -%} {% assign start_day = start_date | date: "%-d" %} @@ -39,7 +39,7 @@ {% capture end_month %}{% t "times.months.{{ end_date | date: '%B' }}" %}{% endcapture %} {% assign year = start_date | date: "%Y" %} {% capture pretty_date %}{{ start_month }} {{ start_day }} – {{ end_month }} {{ end_day }}, {{ year }}{% endcapture %} - + {% else %} {%- comment -%}When start and end dates are in different years{%- endcomment -%} {% assign start_day = start_date | date: "%-d" %} @@ -50,4 +50,4 @@ {% assign end_year = end_date | date: "%Y" %} {% capture pretty_date %}{{ start_month}} {{start_day}}, {{ start_year }} – {{ end_month }} {{ end_day }}, {{ end_year }}{% endcapture %} {% endif %} -{% endif %}{{pretty_date | strip }} \ No newline at end of file +{% endif %}{{pretty_date | strip }} diff --git a/_i18n/es/dates/pretty_dates.html b/_i18n/es/dates/pretty_dates.html index 7620e02599..42bebc20c9 100644 --- a/_i18n/es/dates/pretty_dates.html +++ b/_i18n/es/dates/pretty_dates.html @@ -15,20 +15,20 @@ {% else -%} {% assign start_date = include.start | date: "%Y-%m-%d" -%} {% assign end_date = include.end | date: "%Y-%m-%d" -%} - + {% if start_date == end_date -%} {% assign day = start_date | date: "%-d" -%} {% assign year = start_date | date: "%Y" -%} {% capture month %}{% t "times.months.{{ start_date | date: '%B' }}" %}{% endcapture -%} {% capture pretty_date %}{{ day }} de {{ month }} de {{ year }}{% endcapture -%} - + {% elsif start_date | date: "%Y-%m" == end_date | date: "%Y-%m" -%} {% assign start_day = start_date | date: "%-d" -%} {% assign end_day = end_date | date: "%-d" -%} {% capture month %}{% t "times.months.{{ start_date | date: '%B' }}" %}{% endcapture -%} {% assign year = start_date | date: "%Y" -%} {% capture pretty_date %}del {{ start_day }} al {{ end_day }} de {{ month }} de {{ year }}{% endcapture -%} - + {% elsif start_date | date: "%Y" == end_date | date: "%Y" -%} {% assign start_day = start_date | date: "%-d" -%} {% assign end_day = end_date | date: "%-d" -%} @@ -36,7 +36,7 @@ {% capture end_month %}{% t "times.months.{{ end_date | date: '%B' }}" %}{% endcapture -%} {% assign year = start_date | date: "%Y" -%} {% capture pretty_date %}del {{ start_day }} de {{ start_month }} al {{ end_day }} de {{ end_month }} de {{ year }}{% endcapture -%} - + {% else -%} {% assign start_day = start_date | date: "%-d" -%} {% assign end_day = end_date | date: "%-d" -%} @@ -46,4 +46,4 @@ {% assign end_year = end_date | date: "%Y" -%} {% capture pretty_date %}del {{ start_day }} de {{ start_month }} de {{ start_year }} al {{ end_day }} de {{ end_month }} de {{ end_year }}{% endcapture -%} {% endif -%} -{% endif -%}{{ pretty_date | strip }} \ No newline at end of file +{% endif -%}{{ pretty_date | strip }} diff --git a/_i18n/fr/dates/pretty_dates.html b/_i18n/fr/dates/pretty_dates.html index 85668e97fe..14374bd21c 100644 --- a/_i18n/fr/dates/pretty_dates.html +++ b/_i18n/fr/dates/pretty_dates.html @@ -15,20 +15,20 @@ {% else %} {% assign start_date = include.start | date: "%Y-%m-%d" %} {% assign end_date = include.end | date: "%Y-%m-%d" %} - + {% if start_date == end_date %} {% assign day = start_date | date: "%-d" %} {% assign year = start_date | date: "%Y" %} {% capture month %}{% t "times.months.{{ start_date | date: '%B' }}" %}{% endcapture %} {% capture pretty_date %}{{ day }} {{ month }} {{ year }}{% endcapture %} - + {% elsif start_date | date: "%Y-%m" == end_date | date: "%Y-%m" %} {% assign start_day = start_date | date: "%-d" %} {% assign end_day = end_date | date: "%-d" %} {% capture month %}{% t "times.months.{{ start_date | date: '%B' }}" %}{% endcapture %} {% assign year = start_date | date: "%Y" %} {% capture pretty_date %}{{ start_day }} – {{ end_day }} {{ month }} {{ year }}{% endcapture %} - + {% elsif start_date | date: "%Y" == end_date | date: "%Y" %} {% assign start_day = start_date | date: "%-d" %} {% assign end_day = end_date | date: "%-d" %} @@ -36,7 +36,7 @@ {% capture end_month %}{% t "times.months.{{ end_date | date: '%B' }}" %}{% endcapture %} {% assign year = start_date | date: "%Y" %} {% capture pretty_date %}{{ start_day }} {{ start_month }} – {{ end_day }} {{ end_month }} {{ year }}{% endcapture %} - + {% else %} {% assign start_day = start_date | date: "%-d" %} {% assign end_day = end_date | date: "%-d" %} @@ -46,4 +46,4 @@ {% assign end_year = end_date | date: "%Y" %} {% capture pretty_date %}{{ start_day }} {{ start_month }} {{ start_year }} – {{ end_day }} {{ end_month }} {{ end_year }}{% endcapture %} {% endif %} -{% endif %}{{ pretty_date | strip }} \ No newline at end of file +{% endif %}{{ pretty_date | strip }} diff --git a/_i18n/hi/dates/pretty_dates.html b/_i18n/hi/dates/pretty_dates.html index 33f0b0f579..6579dff8af 100644 --- a/_i18n/hi/dates/pretty_dates.html +++ b/_i18n/hi/dates/pretty_dates.html @@ -15,20 +15,20 @@ {% else %} {% assign start_date = include.start | date: "%Y-%m-%d" %} {% assign end_date = include.end | date: "%Y-%m-%d" %} - + {% if start_date == end_date %} {% assign day = start_date | date: "%-d" %} {% assign year = start_date | date: "%Y" %} {% capture month %}{% t "times.months.{{ start_date | date: '%B' }}" %}{% endcapture %} {% capture pretty_date %}{{ day }} {{ month }} {{ year }}{% endcapture %} - + {% elsif start_date | date: "%Y-%m" == end_date | date: "%Y-%m" %} {% assign start_day = start_date | date: "%-d" %} {% assign end_day = end_date | date: "%-d" %} {% capture month %}{% t "times.months.{{ start_date | date: '%B' }}" %}{% endcapture %} {% assign year = start_date | date: "%Y" %} {% capture pretty_date %}{{ start_day }} {% t "times.from" %} {{ end_day }} {{ month }} {{ year }}{% endcapture %} - + {% elsif start_date | date: "%Y" == end_date | date: "%Y" %} {% assign start_day = start_date | date: "%-d" %} {% assign end_day = end_date | date: "%-d" %} @@ -36,7 +36,7 @@ {% capture end_month %}{% t "times.months.{{ end_date | date: '%B' }}" %}{% endcapture %} {% assign year = start_date | date: "%Y" %} {% capture pretty_date %}{{ start_day }} {{ start_month }} {% t "times.from" %} {{ end_day }} {{ end_month }} {{ year }}{% endcapture %} - + {% else %} {% assign start_day = start_date | date: "%-d" %} {% assign end_day = end_date | date: "%-d" %} @@ -46,4 +46,4 @@ {% assign end_year = end_date | date: "%Y" %} {% capture pretty_date %}{{ start_day }} {{ start_month }} {{ start_year }} {% t "times.from" %} {{ end_day }} {{ end_month }} {{ end_year }}{% endcapture %} {% endif %} -{% endif %}{{ pretty_date | strip }} \ No newline at end of file +{% endif %}{{ pretty_date | strip }} diff --git a/_i18n/id/dates/pretty_dates.html b/_i18n/id/dates/pretty_dates.html index 5200552ca4..ca05d50413 100644 --- a/_i18n/id/dates/pretty_dates.html +++ b/_i18n/id/dates/pretty_dates.html @@ -15,20 +15,20 @@ {% else %} {% assign start_date = include.start | date: "%Y-%m-%d" %} {% assign end_date = include.end | date: "%Y-%m-%d" %} - + {% if start_date == end_date %} {% assign day = start_date | date: "%-d" %} {% assign year = start_date | date: "%Y" %} {% capture month %}{% t "times.months.{{ start_date | date: '%B' }}" %}{% endcapture %} {% capture pretty_date %}{{ day }} {{ month }} {{ year }}{% endcapture %} - + {% elsif start_date | date: "%Y-%m" == end_date | date: "%Y-%m" %} {% assign start_day = start_date | date: "%-d" %} {% assign end_day = end_date | date: "%-d" %} {% capture month %}{% t "times.months.{{ start_date | date: '%B' }}" %}{% endcapture %} {% assign year = start_date | date: "%Y" %} {% capture pretty_date %}{{ start_day }} - {{ end_day }} {{ month }} {{ year }}{% endcapture %} - + {% elsif start_date | date: "%Y" == end_date | date: "%Y" %} {% assign start_day = start_date | date: "%-d" %} {% assign end_day = end_date | date: "%-d" %} @@ -36,7 +36,7 @@ {% capture end_month %}{% t "times.months.{{ end_date | date: '%B' }}" %}{% endcapture %} {% assign year = start_date | date: "%Y" %} {% capture pretty_date %}{{ start_day }} {{ start_month }} - {{ end_day }} {{ end_month }} {{ year }}{% endcapture %} - + {% else %} {% assign start_day = start_date | date: "%-d" %} {% assign end_day = end_date | date: "%-d" %} @@ -46,4 +46,4 @@ {% assign end_year = end_date | date: "%Y" %} {% capture pretty_date %}{{ start_day }} {{ start_month }} {{ start_year }} - {{ end_day }} {{ end_month }} {{ end_year }}{% endcapture %} {% endif %} -{% endif %}{{ pretty_date | strip }} \ No newline at end of file +{% endif %}{{ pretty_date | strip }} diff --git a/_i18n/pt-br/dates/pretty_dates.html b/_i18n/pt-br/dates/pretty_dates.html index cdaf56a8bd..f29450f150 100644 --- a/_i18n/pt-br/dates/pretty_dates.html +++ b/_i18n/pt-br/dates/pretty_dates.html @@ -15,20 +15,20 @@ {% else %} {% assign start_date = include.start | date: "%Y-%m-%d" %} {% assign end_date = include.end | date: "%Y-%m-%d" %} - + {% if start_date == end_date %} {% assign day = start_date | date: "%-d" %} {% assign year = start_date | date: "%Y" %} {% capture month %}{% t "times.months.{{ start_date | date: '%B' }}" %}{% endcapture %} {% capture pretty_date %}{{ day }} de {{ month }} de {{ year }}{% endcapture %} - + {% elsif start_date | date: "%Y-%m" == end_date | date: "%Y-%m" %} {% assign start_day = start_date | date: "%-d" %} {% assign end_day = end_date | date: "%-d" %} {% capture month %}{% t "times.months.{{ start_date | date: '%B' }}" %}{% endcapture %} {% assign year = start_date | date: "%Y" %} {% capture pretty_date %}{{ start_day }} a {{ end_day }} de {{ month }} de {{ year }}{% endcapture %} - + {% elsif start_date | date: "%Y" == end_date | date: "%Y" %} {% assign start_day = start_date | date: "%-d" %} {% assign end_day = end_date | date: "%-d" %} @@ -36,7 +36,7 @@ {% capture end_month %}{% t "times.months.{{ end_date | date: '%B' }}" %}{% endcapture %} {% assign year = start_date | date: "%Y" %} {% capture pretty_date %}{{ start_day }} de {{ start_month }} a {{ end_day }} de {{ end_month }} de {{ year }}{% endcapture %} - + {% else %} {% assign start_day = start_date | date: "%-d" %} {% assign end_day = end_date | date: "%-d" %} @@ -46,4 +46,4 @@ {% assign end_year = end_date | date: "%Y" %} {% capture pretty_date %}{{ start_day }} de {{ start_month }} de {{ start_year }} a {{ end_day }} de {{ end_month }} de {{ end_year }}{% endcapture %} {% endif %} -{% endif %}{{ pretty_date | strip }} \ No newline at end of file +{% endif %}{{ pretty_date | strip }} diff --git a/_i18n/ru/dates/pretty_dates.html b/_i18n/ru/dates/pretty_dates.html index 67d206df29..36d1cea7ce 100644 --- a/_i18n/ru/dates/pretty_dates.html +++ b/_i18n/ru/dates/pretty_dates.html @@ -15,20 +15,20 @@ {% else %} {% assign start_date = include.start | date: "%Y-%m-%d" %} {% assign end_date = include.end | date: "%Y-%m-%d" %} - + {% if start_date == end_date %} {% assign day = start_date | date: "%-d" %} {% assign year = start_date | date: "%Y" %} {% capture month %}{% t "times.months.{{ start_date | date: '%B' }}" %}{% endcapture %} {% capture pretty_date %}{{ day }} {{ month }} {{ year }}{% endcapture %} - + {% elsif start_date | date: "%Y-%m" == end_date | date: "%Y-%m" %} {% assign start_day = start_date | date: "%-d" %} {% assign end_day = end_date | date: "%-d" %} {% capture month %}{% t "times.months.{{ start_date | date: '%B' }}" %}{% endcapture %} {% assign year = start_date | date: "%Y" %} {% capture pretty_date %}{{ start_day }}–{{ end_day }} {{ month }} {{ year }}{% endcapture %} - + {% elsif start_date | date: "%Y" == end_date | date: "%Y" %} {% assign start_day = start_date | date: "%-d" %} {% assign end_day = end_date | date: "%-d" %} @@ -36,7 +36,7 @@ {% capture end_month %}{% t "times.months.{{ end_date | date: '%B' }}" %}{% endcapture %} {% assign year = start_date | date: "%Y" %} {% capture pretty_date %}{{ start_day }} {{ start_month }} – {{ end_day }} {{ end_month }} {{ year }}{% endcapture %} - + {% else %} {% assign start_day = start_date | date: "%-d" %} {% assign end_day = end_date | date: "%-d" %} @@ -46,4 +46,4 @@ {% assign end_year = end_date | date: "%Y" %} {% capture pretty_date %}{{ start_day }} {{ start_month }} {{ start_year }} – {{ end_day }} {{ end_month }} {{ end_year }}{% endcapture %} {% endif %} -{% endif %}{{ pretty_date | strip }} \ No newline at end of file +{% endif %}{{ pretty_date | strip }} diff --git a/_i18n/zh-cn/dates/pretty_dates.html b/_i18n/zh-cn/dates/pretty_dates.html index a4694e7da9..ac497643d0 100644 --- a/_i18n/zh-cn/dates/pretty_dates.html +++ b/_i18n/zh-cn/dates/pretty_dates.html @@ -15,20 +15,20 @@ {% else %} {% assign start_date = include.start | date: "%Y-%m-%d" %} {% assign end_date = include.end | date: "%Y-%m-%d" %} - + {% if start_date == end_date %} {% assign day = start_date | date: "%-d" %} {% assign year = start_date | date: "%Y" %} {% capture month %}{% t "times.months.{{ start_date | date: '%B' }}" %}{% endcapture %} {% capture pretty_date %}{{ year }}年{{ month }}{{ day }}日{% endcapture %} - + {% elsif start_date | date: "%Y-%m" == end_date | date: "%Y-%m" %} {% assign start_day = start_date | date: "%-d" %} {% assign end_day = end_date | date: "%-d" %} {% capture month %}{% t "times.months.{{ start_date | date: '%B' }}" %}{% endcapture %} {% assign year = start_date | date: "%Y" %} {% capture pretty_date %}{{ year }}年{{ month }}{{ start_day }}日至{{ end_day }}日{% endcapture %} - + {% elsif start_date | date: "%Y" == end_date | date: "%Y" %} {% assign start_day = start_date | date: "%-d" %} {% assign end_day = end_date | date: "%-d" %} @@ -36,7 +36,7 @@ {% capture end_month %}{% t "times.months.{{ end_date | date: '%B' }}" %}{% endcapture %} {% assign year = start_date | date: "%Y" %} {% capture pretty_date %}{{ year }}年{{ start_month }}{{ start_day }}日至{{ end_month }}{{ end_day }}日{% endcapture %} - + {% else %} {% assign start_day = start_date | date: "%-d" %} {% assign end_day = end_date | date: "%-d" %} @@ -46,4 +46,4 @@ {% assign end_year = end_date | date: "%Y" %} {% capture pretty_date %}{{ start_year }}年{{ start_month }}{{ start_day }}日至{{ end_year }}年{{ end_month }}{{ end_day }}日{% endcapture %} {% endif %} -{% endif %}{{ pretty_date | strip }} \ No newline at end of file +{% endif %}{{ pretty_date | strip }}