Skip to content

fix some double-spaces in strings#1830

Merged
laanwj merged 1 commit intobitcoin:masterfrom
Diapolo:trans_rem_spaces
Nov 5, 2012
Merged

fix some double-spaces in strings#1830
laanwj merged 1 commit intobitcoin:masterfrom
Diapolo:trans_rem_spaces

Conversation

@Diapolo
Copy link

@Diapolo Diapolo commented Sep 18, 2012

  • remove some unneeded stuff in sendcoinsentry.ui
  • harmonize some "Error:"-messages

Copy link
Member

Choose a reason for hiding this comment

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

I don't really care that much, but why the punctuation change? Just makes more work for the translators IMO.

Copy link
Member

Choose a reason for hiding this comment

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

I tend to agree.

The cost of changing messages is n * m, where n is the number of changed
messages and m the number of translations. Please handle accordingly.

Fixing messages for significant imrpovements in clarity and
user-friendlyless is good, but please stop this "fixing spaces".

Luke-jr cleaned up the mess (lost translations) last time, but I can
understand that he gets annoyed.

Copy link
Author

Choose a reason for hiding this comment

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

If all who contribute translatable strings to the source would be a little more straight there would be no need for this.
It really annoys me, that we have strings that have incorrect grammar or punctuation.

At least for the string "Error: Transaction creation failed." we currently already have 2 strings in the translations, this pull makes one out of them.

You are free to close such pulls you consider not valuable, even if I don't agree here, as a good overall string handling was needed badly and this covers the last things I could find!

Copy link
Member

Choose a reason for hiding this comment

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

I agree that more consistent punctuation is nice.

What we really need to make this kind of changes feasible is a script that takes the old and new English message and updates all the translations on Transifex.

@BitcoinPullTester
Copy link

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/397a527c1e9c334564668e18e48d875d29eca787 for binaries and test log.

@sipa
Copy link
Member

sipa commented Oct 7, 2012

ACK for 0.8

@BitcoinPullTester
Copy link

Automatic sanity-testing: FAILED BUILD/TEST, see http://jenkins.bluematt.me/pull-tester/b38fd5d5a4e4babec207dda033a5c95ada29047b for binaries and test log.

This could happen for one of several reasons:

  1. It chanages paths in makefile.linux-mingw or otherwise changes build scripts in a way that made them incompatible with the automated testing scripts
  2. It does not build on either Linux i386 or Win32 (via MinGW cross compile)
  3. The test suite fails on either Linux i386 or Win32
  4. The block test-cases failed (lookup the first bNN identifier which failed in https://github.com/TheBlueMatt/test-scripts/blob/master/FullBlockTestGenerator.java)

src/init.cpp Outdated
Copy link
Member

Choose a reason for hiding this comment

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

You cut off a .c_str() here

Copy link
Author

Choose a reason for hiding this comment

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

Fixed, thanks for noticing.

- remove some unneeded stuff in sendcoinsentry.ui
- harmonize some "Error:"-messages
@BitcoinPullTester
Copy link

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/6b3783a9c9cc47afcf72aa0a86ea26122392efdb for binaries and test log.

@Diapolo
Copy link
Author

Diapolo commented Nov 5, 2012

IMHO the time to do such a pull is NOW, as we have much time left for translators catching up. If this pull is considered useless (which at least sipa doesn't think ^^) just close it.

laanwj added a commit that referenced this pull request Nov 5, 2012
fix some double-spaces in strings
@laanwj laanwj merged commit 86406da into bitcoin:master Nov 5, 2012
laudney pushed a commit to reddcoin-project/reddcoin-3.10 that referenced this pull request Mar 19, 2014
KolbyML pushed a commit to KolbyML/bitcoin that referenced this pull request Dec 5, 2020
e7eb446 [Cleanup] Fix unneeded constructions before emplace_back (random-zebra)
7a09d7c [Refactoring] Emplace classes/structs construction in vectors (random-zebra)
7db5b3b [Refactoring] Introduce constructors for AddedNodeInfo (random-zebra)
5b7eeed [Refactoring] emplace std::pair in maps and vectors (random-zebra)

Pull request description:

  With C++11, variadic templates and perfect forwarding offer a new way of adding elements into a container by means of emplacing (creating in place).

  - https://en.cppreference.com/w/cpp/container/map/emplace
  - https://en.cppreference.com/w/cpp/container/vector/emplace_back

  This is particularly useful.
  With the traditional `insert()`/`push_back()` we are likely to make unnecessary copies (or move); for example, with maps, first the `std::pair<const K, V>` is created, and then it's copied to the container.
  With `emplace()`, instead, references to the key/value objects are forwarded directly to the constructor of the `value_type` inside the data structure without making any copy of `std::pair<const K,V>`.

  This PR replaces most instances of:
  - `.insert(std::make_pair(K,V))` with `.emplace(K, V)`
  - `.push_back(Class(Args...))` with `.emplace_back(Args...)`

  in the whole code base.
  It touches many files (therefore is surely conflicting with many open pull requests), but changes are trivial.

ACKs for top commit:
  furszy:
    utACK e7eb446
  Fuzzbawls:
    utACK e7eb446

Tree-SHA512: 84b757e34b5808da4ecc3169e894e33e77d40a412a04d7f0e7df58e6c0f2e1907d8865289cad35da91813bfaf27350b26bc1b417235aacc7279e47416e717849
KolbyML pushed a commit to KolbyML/bitcoin that referenced this pull request Dec 5, 2020
…aking scripts

9d40ace [BUG] Fix regression with emplace_back on cold-staking scripts (random-zebra)

Pull request description:

  Bug introduced in bitcoin#1830 (hunted down with @furszy ).

  Emplacing `uint160(key1)` into a vector of `CTxDestination` makes it construct the destination as a `CScriptID` instead of `CKeyID`. Therefore `ExtractDestinations` returns wrong addresses for cold staking scripts.

ACKs for top commit:
  furszy:
    obvious ACK 9d40ace 🍺 .
  Fuzzbawls:
    ACK 9d40ace

Tree-SHA512: 6d816500a3e5fcf1ed615c2adebe0f1cd04a61677e9b8d9a7b3055446bf295aef2a1cd898ab391c463298119f34a1bcd2bc72a5daeda37afd6b2115d1a3ab448
KolbyML pushed a commit to KolbyML/bitcoin that referenced this pull request Dec 5, 2020
… extraction.

b189cc3 Created coldstaking_tests unit test, checking cold staking script keys proper extraction. (furszy)

Pull request description:

  Essentially proving bitcoin#1830 bug and bitcoin#1888 subsequent fix.

ACKs for top commit:
  Fuzzbawls:
    ACK b189cc3
  random-zebra:
    ACK b189cc3 (failing on master, passing on bitcoin#1888). Merging...

Tree-SHA512: 9af3975fe099a0e26feddf2fd52abee12864bf77bb511b2fbed6f39a9ea029cdc057d15157fafe842cd7e2b438447a08dc455c763feeecdc1378af637541eaf1
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants