[Qt] don't allow translation of our example btc address #4208

Diapolo commented at 1:23 PM on May 21, 2014: none

No description provided.

Diapolo referenced this in commit 6fcdad787f on May 21, 2014

in src/qt/guiutil.cpp:None in 788f2e1df8 outdated

  85 | @@ -86,7 +86,7 @@ void setupAddressWidget(QValidatedLineEdit *widget, QWidget *parent)
  86 |  
  87 |      widget->setFont(bitcoinAddressFont());
  88 |  #if QT_VERSION >= 0x040700
  89 | -    widget->setPlaceholderText(QObject::tr("Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"));
  90 | +    widget->setPlaceholderText(QObject::tr("Enter a Bitcoin address") + getExampleBitcoinAddressString());

laanwj commented at 1:27 PM on May 21, 2014:

Seems like the correct direction, though I'd personally prefer

widget->setPlaceholderText(QObject::tr("Enter a Bitcoin address (e.g. %1)").arg(BITCOIN_EXAMPLE_ADDRESS));

This makes it clearer to the translators what the entire message is, instead of having to translate a fragment like 'e,g,'.

Diapolo commented at 1:30 PM on May 21, 2014:

As this seems to be the only once place left where we need to set the example address, I agree :).

Diapolo commented at 1:38 PM on May 21, 2014:

@laanwj Updated :).

ghost commented at 9:41 PM on May 21, 2014: none

Yes, much better. This is good use of placeholders.

wtogami commented at 12:30 AM on May 22, 2014: contributor

Do not merge until after 0.9.2 is released.

laanwj commented at 1:51 AM on May 22, 2014: member

@wtogami well we can merge, no problem, we just can't update the English translations from master. I'm not going to do that until there is some solution in place to make Transifex work with two different branches for example my proposal in #4006.

wtogami commented at 2:01 AM on May 22, 2014: contributor

Transifex auto-grabs English strings from https://raw.github.com/bitcoin/bitcoin/master/src/qt/locale/bitcoin_en.ts I assume you mean merging string changes is OK as long as bitcoin_en.ts is not modified?

laanwj commented at 2:03 AM on May 22, 2014: member

That's exactly what I mean by not updating the English translation.

grue0 commented at 2:52 AM on June 2, 2014: none

This does not localize well with other non-Latin languages, since "e.g." is left untranslated.

laanwj commented at 1:23 PM on June 2, 2014: member

@gruez No it isn't? It uses QObject::tr("Enter a Bitcoin address (e.g. %1)"). so the entire sentence apart from the bitcoin address can be translated.

Diapolo commented at 3:52 PM on June 5, 2014: none

@laanwj To understand, you block this until official 0.9.2 is out? But AFAIK there were also string change-related pulls merged, e.g. the one which allows max orphan block size.

laanwj commented at 4:11 PM on June 5, 2014: member

@Diapolo No, not really. Once this is tested it can be merged IMO. We're blocking English language updates for now (so of bitcoin_en.ts). Strings in the source code in master can be changed, no problem.

[Qt] don't allow translation of our example btc address 6a5c124b84

Diapolo commented at 1:25 PM on June 23, 2014: none

I fixed a merge-conflict, if @BitcoinPullTester is happy this can get in IMHO.

in src/qt/signverifymessagedialog.cpp:None in 6a5c124b84

  26 | @@ -27,7 +27,6 @@ SignVerifyMessageDialog::SignVerifyMessageDialog(QWidget *parent) :
  27 |  
  28 |  #if QT_VERSION >= 0x040700
  29 |      ui->signatureOut_SM->setPlaceholderText(tr("Click \"Sign Message\" to generate signature"));
  30 | -    ui->addressIn_VM->setPlaceholderText(tr("Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"));

laanwj commented at 1:56 PM on June 23, 2014:

Keep this placeholder text please (minus the address)

Diapolo commented at 6:42 AM on June 24, 2014:

This is done via GUIUtil::setupAddressWidget(ui->addressIn_VM, this);.

laanwj commented at 10:42 AM on June 27, 2014:

OK

BitcoinPullTester commented at 2:18 PM on June 23, 2014: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/p4208_6a5c124b849ac1e9e5cfb99e72ae483eeb3e8cad/ for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.

Diapolo commented at 9:03 AM on June 27, 2014: none

@laanwj Guess this can be merged now also?

laanwj merged this on Jun 27, 2014

laanwj closed this on Jun 27, 2014

laanwj referenced this in commit 4684c883bb on Jun 27, 2014

Diapolo deleted the branch on Jun 27, 2014

DrahtBot locked this on Sep 8, 2021