From 6a5ac3c4db8fffb79aac49e9361baf85fb3d757a Mon Sep 17 00:00:00 2001 From: Rafael Fontenelle Date: Sun, 24 Nov 2024 15:48:27 -0300 Subject: [PATCH 1/3] Merge translations from newer branch --- .github/workflows/sync.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index e1b83b047..bb56aa323 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -98,6 +98,14 @@ jobs: env: TX_TOKEN: ${{ secrets.TX_TOKEN }} + - name: Merge translations from newer branch + if: inputs.tx_project != 'python-newest' # python-newest doesn't have a newer branch + run: | + newer_branch=${PYDOC_VERSION%%.*}.$((${PYDOC_VERSION##*.}+1)) + git clone --depth 1 --single-branch --branch $newer_branch https://github.com/python/python-docs-pt-br ${newer_branch}-dir + pomerge --from ./${newer_branch}-dir/**/*.po --to ./${{ env.LANGUAGE_DIR }}/**/*.po + rm -rf ./${newer_branch}-dir + - name: powrap if: steps.pull.outcome == 'success' run: | From d8d9d628bb059b9bca50eea8bd403c4b053dfaf2 Mon Sep 17 00:00:00 2001 From: Rafael Fontenelle Date: Sun, 24 Nov 2024 21:00:07 -0300 Subject: [PATCH 2/3] Add pomerge to requirements.txt --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index baf7c5bfd..1ba2d5832 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ +pomerge==0.1.4 potodo==0.21.3 powrap==1.0.2 sphinx-intl==2.3.0 From e7e03f64fd7d96932c1737ec8c54972fd31acbed Mon Sep 17 00:00:00 2001 From: Rafael Fontenelle Date: Sun, 24 Nov 2024 21:16:31 -0300 Subject: [PATCH 3/3] Exclude Language header field from git add --- scripts/commit.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/commit.sh b/scripts/commit.sh index 7c3e2d5ae..fb1b752e2 100755 --- a/scripts/commit.sh +++ b/scripts/commit.sh @@ -20,7 +20,7 @@ set -u git status -s | grep '^ D ' | cut -d' ' -f3 | xargs -r git rm # Add only updates that do not consist only of 'POT-Creation-Date' header change -git diff -I'^"POT-Creation-Date: ' --numstat *.po **/*.po | cut -f3 | xargs -r git add -v +git diff -I'^"POT-Creation-Date: ' -I'^"Language: pt_BR' --numstat *.po **/*.po | cut -f3 | xargs -r git add -v # Add currently untracked PO files, and update other helper files untracked_files=$(git ls-files -o --exclude-standard *.po **/*.po) pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy