Details

Reviewers

Group Reviewers

Restricted Project

Commits

rSTAGING48cb6ae0ba83: core -> ABC in extract_strings_qt.py
rABC48cb6ae0ba83: core -> ABC in extract_strings_qt.py

Summary

make translate deletes nearly the whole src/qt/bitcoinstrings.cpp file because it's
looking for bitcoin-core and not bitcoin-abc.

Apparently we've never regenerated this file ever?

Test Plan

../configure
make -j8
cd src
make translate
arc lint

Not committed with this patch, but there should be some sane output in bitcoinstrings.cpp

Diff Detail

Repository

rABC Bitcoin ABC

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

jasonbcox created this revision.Apr 21 2020, 00:04

Herald added a reviewer: Restricted Project. · View Herald TranscriptApr 21 2020, 00:04

Build Bitcoin-ABC / Diffs / Diff Testing (build-diff) started.

Do you have a sane output? Because I clearly don't.

green anyway because this is obviously a step in the right direction.

This revision is now accepted and ready to land.Apr 21 2020, 00:08

jasonbcox added a child revision: D5791: Merge #17068: qt: Always generate `bitcoinstrings.cpp` on `make translate`.Apr 21 2020, 00:14

Build Bitcoin-ABC / Diffs / Diff Testing (build-diff) passed.

Harbormaster completed remote builds in B10322: Diff 18983.Apr 21 2020, 00:22

Please regenrate src/qt/bitcoinstrings.cpp

This revision now requires changes to proceed.Apr 21 2020, 00:27

deadalnix added inline comments.Apr 21 2020, 00:27

share/qt/extract_strings_qt.py
77 ↗	(On Diff #18983)	`@generated`

Merged in changes from D5792

Generating these files depends on D5791 as far as I can tell, so I landed it first.

jasonbcox mentioned this in D5792: Mark translation files as @generated and update them.Apr 21 2020, 00:44

Build Bitcoin-ABC / Diffs / Diff Testing (build-diff) started.

Look good except the overzealous interpretation of @generated.

You may want to splice it in in a way phab understands.

share/qt/extract_strings_qt.py
77 ↗	(On Diff #18987)	lol. You got to do somethign here so that this file doesn't not appear generated by phabricator. `contrib/seeds/generate-seeds.py` is a good exemple. I bet it is due to the multiline string that is used here.

This revision now requires changes to proceed.Apr 21 2020, 00:52

Fix up @generated string

Build Bitcoin-ABC / Diffs / Diff Testing (build-diff) started.

Build Bitcoin-ABC / Diffs / Diff Testing (build-diff) passed.

Harbormaster completed remote builds in B10325: Diff 18987.Apr 21 2020, 01:08

Harbormaster completed remote builds in B10326: Diff 18988.Apr 21 2020, 01:17

Build Bitcoin-ABC / Diffs / Diff Testing (build-diff) passed.

Both are still tagged as generated. As it turns out generate-seeds is too, so this is worth fixing: https://reviews.bitcoinabc.org/D3772#change-QXy06wMdqeAy

This revision now requires changes to proceed.Apr 21 2020, 01:26

Actually mark the file as non-generated....

Build Bitcoin-ABC / Diffs / Diff Testing (build-diff) started.

In D5790#141730, @deadalnix wrote:

Both are still tagged as generated. As it turns out generate-seeds is too, so this is worth fixing: https://reviews.bitcoinabc.org/D3772#change-QXy06wMdqeAy

Fixed for generate-seeds: D5793

Build Bitcoin-ABC / Diffs / Diff Testing (build-diff) passed.

Harbormaster completed remote builds in B10327: Diff 18989.Apr 21 2020, 01:41

deadalnix accepted this revision.Apr 21 2020, 14:13

This revision is now accepted and ready to land.Apr 21 2020, 14:13

deadalnix added a child revision: D5798: gui: Stop translating PACKAGE_NAME.Apr 21 2020, 15:35

Closed by commit rABC48cb6ae0ba83: core -> ABC in extract_strings_qt.py (authored by jasonbcox). · Explain WhyApr 21 2020, 16:29

This revision was automatically updated to reflect the committed changes.

jasonbcox added a commit: rABC48cb6ae0ba83: core -> ABC in extract_strings_qt.py.

jasonbcox added a commit: rSTAGING48cb6ae0ba83: core -> ABC in extract_strings_qt.py.May 5 2020, 19:04