Skip to content

Conversation

@jonatack
Copy link
Member

Document how to update settings on and for the transifex website before and after branch-off of a new release.

(This is #21440, updated with the review feedback.)

@jonatack
Copy link
Member Author

Opened as I reckon the PR author has other cats to herd at the moment. To be closed if #21440 is merged, and vice-versa.

@fanquake fanquake added the Docs label Jun 29, 2021
Copy link
Contributor

@jarolrod jarolrod left a comment

Choose a reason for hiding this comment

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

ACK 92b8fdf9a1a4c2ae16198e2dfd29678ac6779e9b

The doc change looks good to me 👍

The following diff shows that this PR has applied the review suggestions from #21440. Specifically: (1, 2, 3)

diff --git a/./old/bitcoin/doc/release-process.md b/./new/bitcoin/doc/release-process.md
index c4ba5da..94bd75b 100644
--- a/./old/bitcoin/doc/release-process.md
+++ b/./new/bitcoin/doc/release-process.md
@@ -38,11 +38,11 @@ Release Process
      that causes rejection of blocks in the past history.
 - Clear the release notes and move them to the wiki (see "Write the release notes" below).
 - Translations on Transifex
-    - Create [a new resource](https://www.transifex.com/bitcoin/bitcoin/content/) named after the major version with slug `[bitcoin.qt-translation-<RRR>x]` where `RRR` is the major branch number padded with zeros. Use `src/qt/locale/bitcoin_en.ts` to create it.
+    - Create [a new resource](https://www.transifex.com/bitcoin/bitcoin/content/) named after the major version with the slug `[bitcoin.qt-translation-<RRR>x]`, where `RRR` is the major branch number padded with zeros. Use `src/qt/locale/bitcoin_en.ts` to create it.
     - Copy over the translations of the previous version using [transifex-migrate-resource](https://github.com/bitcoin-core/bitcoin-maintainer-tools#transifex-migrate-resource).
-    - Update the transifex slug in [`.tx/config`](/.tx/config) to the slug of the resource created in first step. This identifies which resource translations will be synchronized from.
+    - Update the Transifex slug in [`.tx/config`](/.tx/config) to the slug of the resource created in the first step. This identifies which resource the translations will be synchronized from.
     - Make an announcement that translators can start translating for the new version. You can use one of the [previous announcements](https://www.transifex.com/bitcoin/bitcoin/announcements/) as a template.
-    - Change the resource auto-update URL for the resource to `master`, e.g. `https://raw.githubusercontent.com/bitcoin/bitcoin/<branch>/src/qt/locale/bitcoin_en.ts`. (Do this only after the previous steps to prevent an auto-update from interfering.
+    - Change the auto-update URL for the resource to `master`, e.g. `https://raw.githubusercontent.com/bitcoin/bitcoin/master/src/qt/locale/bitcoin_en.ts`. (Do this only after the previous steps, to prevent an auto-update from interfering.)
 
 #### After branch-off (on master)
 
@@ -53,7 +53,7 @@ Release Process
 - Update the versions.
 - Create a pinned meta-issue for testing the release candidate (see [this issue](https://github.com/bitcoin/bitcoin/issues/17079) for an example) and provide a link to it in the release announcements where useful.
 - Translations on Transifex
-    - Change the auto-update URL for the new major version's resource away from `master` and to the branch e.g. `https://raw.githubusercontent.com/bitcoin/bitcoin/<branch>/src/qt/locale/bitcoin_en.ts`. Do not forget this or it will keep tracking master's translations instead, drifting away from the specific major release.
+    - Change the auto-update URL for the new major version's resource away from `master` and to the branch, e.g. `https://raw.githubusercontent.com/bitcoin/bitcoin/<branch>/src/qt/locale/bitcoin_en.ts`. Do not forget this or it will keep tracking the translations on master instead, drifting away from the specific major release.

@fanquake fanquake requested a review from hebasto June 30, 2021 01:27
Copy link
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

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

Approach ACK 92b8fdf9a1a4c2ae16198e2dfd29678ac6779e9b.

laanwj added 2 commits July 3, 2021 21:31
Document how to update settings on and for the transifex website before
and after branch-off of a new release.
These have been integrated into the script long ago.
@jonatack jonatack force-pushed the update-transifex-release-process branch from 92b8fdf to a16378e Compare July 3, 2021 19:36
@jonatack
Copy link
Member Author

jonatack commented Jul 3, 2021

Thanks for the feedback @hebasto. LMK if I got it right, happy to update.

Copy link
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

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

ACK a16378e

@laanwj
Copy link
Member

laanwj commented Jul 15, 2021

ACK a16378e

@laanwj laanwj merged commit d86e662 into bitcoin:master Jul 15, 2021
laanwj added a commit to bitcoin-core/bitcoin-maintainer-tools that referenced this pull request Jul 15, 2021
This script is no longer used as part of the translation process.
See discussion here: bitcoin/bitcoin#22369 (comment)
laanwj added a commit to bitcoin-core/bitcoin-maintainer-tools that referenced this pull request Jul 15, 2021
This script is no longer used as part of the translation process.
See discussion here: bitcoin/bitcoin#22369 (comment)
@jonatack jonatack deleted the update-transifex-release-process branch July 15, 2021 13:10
fanquake added a commit to bitcoin-core/bitcoin-maintainer-tools that referenced this pull request Jul 18, 2021
01ccc22 Remove transifex-migrate-resource.py (W. J. van der Laan)

Pull request description:

  This script is no longer used as part of the translation process.
  See discussion here: bitcoin/bitcoin#22369 (comment)

ACKs for top commit:
  jonatack:
    ACK 01ccc22
  hebasto:
    ACK 01ccc22, I have reviewed the code and it looks OK, I agree it can be merged.

Tree-SHA512: b855ee2fd3542dd6471bb1fb5d3759f81bd70657a4b19908b9ed58aa5aef1f9bd21b833d659e810fa50926af65efda36a5edb3d1d7bec27f503cc74a8409962a
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Jul 23, 2021
gwillen pushed a commit to ElementsProject/elements that referenced this pull request Jun 1, 2022
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Aug 18, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants