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

Handle new added plurals in bitcoin_en.ts #406

Merged
merged 1 commit into from
Aug 23, 2021

Conversation

hebasto
Copy link
Member

@hebasto hebasto commented Aug 21, 2021

This step was missed. See translation_process.md.

Transifex is smart enough to handle %n in strings as a plural form. Therefore, only two English strings are broken in the GUI on master (and in 22.0).

This step was missed. See translation_process.md
Copy link
Contributor

@shaavan shaavan left a comment

Choose a reason for hiding this comment

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

Concept ACK

This PR adds the plural translation for the two strings that use plurals but hitherto didn’t had a plural translation. Adding screenshots to compare the difference between the master and the PR.

Screenshots (taken from QT Linguistic):

Master PR
Screenshot from 2021-08-23 11-40-05 Screenshot from 2021-08-23 11-41-28
Screenshot from 2021-08-23 11-40-32 Screenshot from 2021-08-23 11-42-00

@laanwj
Copy link
Member

laanwj commented Aug 23, 2021

I don't understand, bitcoin_en.ts is auto-generated by make translate, right?

@hebasto
Copy link
Member Author

hebasto commented Aug 23, 2021

I don't understand, bitcoin_en.ts is auto-generated by make translate, right?

Yes. But make translate does not create plural forms (and, I guess, never did it).

That's why we have "Handling Plurals (in source files)" in translation_process.md, no?

@laanwj
Copy link
Member

laanwj commented Aug 23, 2021

Yes. But make translate does not create plural forms (and, I guess, never did it).

Ok, so bitcoin_en.ts is updated, not recreated. This is slightly unexpected to me but makes sense.

ACK 2b3d8f3

@laanwj laanwj merged commit b1c4a4e into bitcoin-core:master Aug 23, 2021
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Aug 23, 2021
2b3d8f3 qt: Handle new added plurals in bitcoin_en.ts (Hennadii Stepanov)

Pull request description:

  This step was missed. See [`translation_process.md`](https://github.com/bitcoin/bitcoin/blob/master/doc/translation_process.md#handling-plurals-in-source-files).

  Transifex is smart enough to handle `%n` in strings as a plural form. Therefore, only two English strings are broken in the GUI on master (and in 22.0).

ACKs for top commit:
  laanwj:
    ACK 2b3d8f3

Tree-SHA512: d39c0da8a295fd7a42e7f2ca3cf5b4f7704c2bdeccdeb10392b37e06dc8577295c9fefbdd5442824639f31c3d014b025a9b937f0b3f630a8ebc977451a5f14f5
@hebasto hebasto deleted the 210821-plurals branch August 23, 2021 18:57
hebasto added a commit to hebasto/bitcoin that referenced this pull request Aug 23, 2021
This step was missed. See translation_process.md

Github-Pull: bitcoin-core/gui#406
Rebased-From: 2b3d8f3
@hebasto
Copy link
Member Author

hebasto commented Aug 23, 2021

Backported in bitcoin/bitcoin#22629.

laanwj added a commit to bitcoin/bitcoin that referenced this pull request Aug 26, 2021
32e1424 Fix build with Boost 1.77.0 (Rafael Sadowski)
cb34a0a qt: Handle new added plurals in bitcoin_en.ts (Hennadii Stepanov)
068985c doc: Mention the flat directory structure for uploads (Andrew Chow)
27d43e5 guix: Don't include directory name in SHA256SUMS (Andrew Chow)
88fb7e3 test: fix bug in 22686 (S3RK)
63fec7e clientversion: No suffix #if CLIENT_VERSION_IS_RELEASE (Carl Dong)
dfaffbe test: Test for ApproximateBestSubset edge case with too little fees (Andrew Chow)
e86b023 wallet: Assert that enough was selected to cover the fees (Andrew Chow)
ffc81e2 wallet: Use GetSelectionAmount for target value calculations (Andrew Chow)
ce77b45 release: Release with separate SHA256SUMS and sig files (Carl Dong)
cb491bd guix-verify: Non-zero exit code when anything fails (Carl Dong)
6a611d2 gui: ensure external signer option remains disabled without signers (Andrew Chow)
e9b4487 qt: Fix regression in "Encrypt Wallet" menu item (Hennadii Stepanov)
57fce06 consensus/params: simplify ValidDeployment check to avoid gcc warning (Anthony Towns)
e9d30fb ci: Run fuzzer task for the master branch only (Hennadii Stepanov)

Pull request description:

  Backported:

  1) #22730
  1) bitcoin-core/gui#393
  1) #22597
  1) bitcoin-core/gui#396
  1) #22643
  1) #22642
  1) #22685
  1) #22686
  1) #22654
  1) #22742
  1) bitcoin-core/gui#406
  1) #22713

ACKs for top commit:
  laanwj:
    Code list-of-backported-PRs review ACK 32e1424

Tree-SHA512: f5e2dd1be6cdcd39368eeb5d297b3ff4418d0bf2e70c90e59ab4ba1dbf16f773045d877b4997511de58c3aca75a978dcf043e338bad23951557e2a27ccc845f6
gwillen pushed a commit to gwillen/elements that referenced this pull request Jul 27, 2022
This step was missed. See translation_process.md

Github-Pull: bitcoin-core/gui#406
Rebased-From: 2b3d8f3
gwillen pushed a commit to gwillen/elements that referenced this pull request Aug 1, 2022
This step was missed. See translation_process.md

Github-Pull: bitcoin-core/gui#406
Rebased-From: 2b3d8f3
@bitcoin-core bitcoin-core locked as resolved and limited conversation to collaborators Aug 23, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants