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

Patch 1 #11

Closed
wants to merge 3 commits into from
Closed

Patch 1 #11

wants to merge 3 commits into from

Conversation

RnoHach
Copy link

@RnoHach RnoHach commented Jun 27, 2022

Hi Patrick, this is my first ever pull request so it'll most likely not be all proper. That being said, I want this to be its very best, so if you notice any issues please let me know and I will try to correct them.
My main concern is that I may have translated things that should not have been translated, such as commands or whatnot. If you notice anything like that, feel free to correct things or inform me on what line is the issue so I can fix it.
I will continue translating today, hoping to finish the first pass and start on QC.

Thanks, cheers, much love and Dogecoing to the Moon! :-

@patricklodder
Copy link
Owner

Hi! Awesome ❤️

Like we expected earlier when we were talking on Reddit, there are some conflicts because of the update I did to the new strings that came between you starting work on this and now. I propose we fix these and any command changes, and then you should be able to do a real pull request on dogecoin/dogecoin directly (so that others can help you too and you don't depend just on me).

Let me know when you're done for today, and I will have a look at what exactly changed (the conflicts are displayed to be greater than reality), and will get you a non-conflicted work branch and go over any possible command translations and highlight those for you.

@RnoHach
Copy link
Author

RnoHach commented Jun 27, 2022

Okay, that sounds good! I may need some guidance with the real pull request, as I don't fully understand this process, but everything else sounds good and reasonable, and wow!
I will comment here when done for today. Thanks again!!

@RnoHach
Copy link
Author

RnoHach commented Jun 27, 2022

First pass (rough draft) is now complete.

Awaiting instructions... (most responsive on twitter)

Thanks! Much Wow!

@patricklodder
Copy link
Owner

patricklodder commented Jun 27, 2022

I have resolved the conflicts and annotated your commits with my conflict resolutions. Because some source strings have changed, I have retained the unfinished tags on these whilst retaining your translations, so we can easily identify them in case you want to change something because the translation doesn't cover the new source string.

I have also added one more commit that removes all the sources marked as vanished, because those don't need to be translated - save work 😁

The following lines now have unfinished tags: 927, 1414, 1418, 1426, 1438, 1442, 1446, 1549, 1758, 1770, 2218, 2372, 3114, 3654, 3690, 3710, 3826

I will now look at the commands you mentioned.

Edit: line numbers changed after taking care of some additional technical issues - updated them

@patricklodder
Copy link
Owner

I have fixed 3 technical errors:

  • Cyrillic char in a tag on line 380
  • = in a tag on line 590
  • "numerous form" wasn't needed because the translation already takes care of plurality intrinsically.

And have fixed 4 issues with command translations:

  • help as a command doesn't get translated.
  • -proxy was translated
  • 2 times, -discardthreshold had C&P errors, fixed those too

One last thing: on line 3786 there is a translation from MiB into ?? - probably needs a look

@patricklodder
Copy link
Owner

Fixed the technical errors that were causing exceptions. Waiting for build to finish to provide binary.

@CHANDRAMA2
Copy link

CHANDRAMA2 commented Oct 11, 2022 via email

patricklodder added a commit that referenced this pull request Feb 28, 2024
a44caf65f Merge bitcoin-core/univalue-subtree#28: Import fixes for sanitizer reported issues
135254331 Import fixes for sanitizer reported issues
d5fb86940 refactor: use c++11 range based for loop in checkObject
ff9c37930 refactor: Use nullptr (c++11) instead of NULL
08a99754d build: use ax_cxx_compile_stdcxx.m4 to check for C++11 support
66d3713ce Merge bitcoin-core/univalue-subtree#29: ci: travis -> cirrus
808d48729 ci: travis -> cirrus
c390ac375 Merge bitcoin-core/univalue-subtree#19: Split sources for easier buildsystem integration
4a5b0a1c6 build: Move source entries out to sources.mk
6c7d94b33 build: cleanup wonky gen usage
a222637 Merge dogecoin#23: Merge changes from jgarzik/univalue@1ae6a23
98fadc0 Merge dogecoin#24: Push bool into array correctly
5f03f1f Push bool into array correctly
f77d0f7 Merge commit '1ae6a231a0169938eb3972c1d48dd17cba5947e1' into HEAD
98261b1 Merge dogecoin#22: Clamp JSON object depth to PHP limit
54c4015 Clamp JSON object depth to PHP limit
5a58a46 Merge dogecoin#21: Remove hand-coded UniValue destructor.
b4cdfc4 Remove hand-coded UniValue destructor.
1ae6a23 Merge pull request dogecoin#57 from MarcoFalke/test_fix
92bdd11 univalue_write: remove unneeded sstream.h include
ffb621c Merge pull request dogecoin#56 from drodil/remove_sstream_header
f33acf9 Merge commit '7890db9~' into HEAD
7fba60b Merge dogecoin#17: [docs] Update readme
4577454 Merge dogecoin#13: Fix typo
66e0ade Remove unnecessary sstream header from univalue.h
ac7e73c [docs] Update readme
7890db9 Merge #11: Remove deprecated std pair wrappers
88967f6 Version 1.0.4
40e3485 Merge dogecoin#14: Cleaned up namespace imports to reduce symbol collisions
1dc113d Merge pull request dogecoin#50 from luke-jr/pushKV_bool
72392fb [tests] test pushKV for boolean values
c23132b Pushing boolean value to univalue correctly
4a49647 Fix typo
85052a4 Remove deprecated std::pair wrappers
81faab2 Merge pull request dogecoin#48 from fwolfst/47-UPDATE_MIT_LINK_TO_HTTPS
b17634e Update URLs to MIT license.
51d3ab3 Merge #10: Add pushKV(key, boolean) function (replaces #5)
129bad9 [tests] test pushKV for boolean values
b3c44c9 Pushing boolean value to univalue correctly
07947ff Merge #9: [tests] Fix BOOST_CHECK_THROW macro
ec849d9 [tests] Fix BOOST_CHECK_THROW macro
88ab64f Merge pull request dogecoin#46 from jasonbcox/master
35ed96d Merge pull request dogecoin#44 from MarcoFalke/Mf1709-univalue-cherrypick-explicit
420c226 Merge pull request dogecoin#45 from MarcoFalke/Mf1710-univalue-revert-test
d208f98 Cleaned up namespace imports to reduce symbol collisions
31bc9f5 Merge #8: Remove unused Homebrew workaround
fa04209 Remove HomeBrew workaround
a523e08 Merge #7: Declare single-argument (non-converting) constructors "explicit"
a9e53b3 Merge #4: Pull upstream
fe805ea Declare single-argument (non-converting) constructors "explicit"
8a2d6f1 Merge pull request dogecoin#41 from jgarzik/get-obj-map
ba341a2 Add getObjMap() helper method.  Also, constify checkObject().
ceb1194 Handle .pushKV() and .checkObject() edge cases.
107db98 Add ::push_back(double) method for feature parity.
d415300 Move one-line implementation of UniValue::read() to header.
52e85b3 Move exception-throwing get_* methods into separate implementation module.
dac5296 README.md: update code quotes
3e31dcf README.md: close code quote
d09b842 Update README.md
f1b86ed Convert README to markdown style.
1dfe464 Import UniValue class unit tests from bitcoin project.
0d3e74d operator[] takes size_t index parameter (versus unsigned int)
640158f Private findKey() method becomes size_t clean, and returns bool on failure.
7099135 Merge pull request dogecoin#36 from ryanofsky/pr/end-str
a31231b Version 1.0.3
4fd5444 Reject unterminated strings
81eba33 Merge pull request dogecoin#26 from isle2983/pushBackHelpers
3640541 Merge PR dogecoin#32 from branch 'nul-not-special' of git://github.com/ryanofsky/univalue into merge
89bb073 Merge pull request dogecoin#31 from ryanofsky/raw-literals
511008c Merge pull request dogecoin#30 from ryanofsky/test-driver
77974f3 Merge pull request dogecoin#34 from paveljanik/20161116_Wshadow_codepoint
a38fcd3 Do not shadow member variable codepoint.
fd32d1a Don't require nul-terminated string inputs
0bb1439 Support parsing raw literals in UniValue
28876d0 Merge pull request dogecoin#29 from btcdrak/exportspace
839ccd7 Add test driver for JSONTestSuite
26ef3ff Remove trailing whitespace from JSON export
cfa0384 Convenience wrappers for push_back-ing integer types

git-subtree-dir: src/univalue
git-subtree-split: a44caf65fe55b9dd8ddb08f04c0f70409efd53b3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants