backport: merge bitcoin#18952,18817#5013
Merged
PastaPastaPasta merged 2 commits intodashpay:developfrom Apr 2, 2023
Merged
Conversation
vijaydasmp
force-pushed
the
bp21_3
branch
2 times, most recently
from
52e1f2a to
cedecaf
Compare
vijaydasmp
changed the title
vijaydasmp
force-pushed
the
bp21_3
branch
6 times, most recently
from
d2d9976 to
4e3da39
Compare
|
This pull request has conflicts, please rebase. |
vijaydasmp
changed the title
|
This pull request has conflicts, please rebase. |
vijaydasmp
changed the title
|
This pull request has conflicts, please rebase. |
vijaydasmp
force-pushed
the
bp21_3
branch
4 times, most recently
from
e1b620d to
e13a676
Compare
vijaydasmp
force-pushed
the
bp21_3
branch
5 times, most recently
from
94dbd5f to
e65edb4
Compare
|
This pull request has conflicts, please rebase. |
vijaydasmp
force-pushed
the
bp21_3
branch
3 times, most recently
from
75b9806 to
6ff27f2
Compare
vijaydasmp
changed the title
|
This pull request has conflicts, please rebase. |
vijaydasmp
force-pushed
the
bp21_3
branch
2 times, most recently
from
75b9806 to
18d2ae6
Compare
Author
|
Hello @PastaPastaPasta , please review |
1 similar comment
Author
|
Hello @PastaPastaPasta , please review |
PastaPastaPasta
approved these changes
Apr 2, 2023
Member
PastaPastaPasta
left a comment
PastaPastaPasta
left a comment
There was a problem hiding this comment.
utACK for merge via merge commit
added 2 commits
April 2, 2023 17:00
…n-qt locale handling ca185cf doc: Document differences in bitcoind and bitcoin-qt locale handling (practicalswift) Pull request description: Document differences in `bitcoind` and `bitcoin-qt` locale handling. Since this seems to be the root cause to the locale dependency issues we've seen over the years I thought it was worth documenting :) Note that 1.) `QLocale` (used by Qt), 2.) C locale (used by locale-sensitive C standard library functions/POSIX functions and some parts of the C++ standard library such as `std::to_string`) and 3.) C++ locale (used by the C++ input/output library) are three separate things. This comment is about the perhaps surprising interference with the C locale (2) that takes place as part of the Qt initialization. ACKs for top commit: hebasto: re-ACK ca185cf Tree-SHA512: e51c32f3072c506b0029a001d8b108125e1acb4f2b6a48a6be721ddadda9da0ae77a9b39ff33f9d9eebabe2244c1db09e8502e3e7012d7a5d40d98e96da0dc44
8a22fd0 avoided os-dependant path (Ferdinando M. Ametrano) Pull request description: The current code fails on windows because of the forward slashes; using os.path.join solves the problem and it is in general more robust ACKs for top commit: MarcoFalke: ACK 8a22fd0 Tree-SHA512: 813f27aea33f97c8afac52e716a55fc5d7fb69621023aba99d40df7e1d145e0ec8d1eee49ddd403b219bf0e0e168e0e987b05c78eaef611f744d99bf2fc8bc91
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.