Browse Source

Merge pull request #4208

6a5c124 [Qt] don't allow translation of our example btc address (Philip Kaufmann)
0.10
Wladimir J. van der Laan 10 years ago
parent
commit
4684c883bb
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 2
      src/qt/forms/sendcoinsentry.ui
  2. 4
      src/qt/forms/signverifymessagedialog.ui
  3. 4
      src/qt/guiutil.cpp
  4. 1
      src/qt/signverifymessagedialog.cpp

2
src/qt/forms/sendcoinsentry.ui

@ -51,7 +51,7 @@
<item> <item>
<widget class="QValidatedLineEdit" name="payTo"> <widget class="QValidatedLineEdit" name="payTo">
<property name="toolTip"> <property name="toolTip">
<string>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</string> <string>The Bitcoin address to send the payment to</string>
</property> </property>
</widget> </widget>
</item> </item>

4
src/qt/forms/signverifymessagedialog.ui

@ -45,7 +45,7 @@
<item> <item>
<widget class="QValidatedLineEdit" name="addressIn_SM"> <widget class="QValidatedLineEdit" name="addressIn_SM">
<property name="toolTip"> <property name="toolTip">
<string>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</string> <string>The Bitcoin address to sign the message with</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -255,7 +255,7 @@
<item> <item>
<widget class="QValidatedLineEdit" name="addressIn_VM"> <widget class="QValidatedLineEdit" name="addressIn_VM">
<property name="toolTip"> <property name="toolTip">
<string>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</string> <string>The Bitcoin address the message was signed with</string>
</property> </property>
</widget> </widget>
</item> </item>

4
src/qt/guiutil.cpp

@ -91,7 +91,9 @@ void setupAddressWidget(QValidatedLineEdit *widget, QWidget *parent)
widget->setFont(bitcoinAddressFont()); widget->setFont(bitcoinAddressFont());
#if QT_VERSION >= 0x040700 #if QT_VERSION >= 0x040700
widget->setPlaceholderText(QObject::tr("Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)")); // We don't want translators to use own addresses in translations
// and this is the only place, where this address is supplied.
widget->setPlaceholderText(QObject::tr("Enter a Bitcoin address (e.g. %1)").arg("1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L"));
#endif #endif
widget->setValidator(new BitcoinAddressEntryValidator(parent)); widget->setValidator(new BitcoinAddressEntryValidator(parent));
widget->setCheckValidator(new BitcoinAddressCheckValidator(parent)); widget->setCheckValidator(new BitcoinAddressCheckValidator(parent));

1
src/qt/signverifymessagedialog.cpp

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

Loading…
Cancel
Save