pending->unconfirmed
This commit is contained in:
parent
4db45ac789
commit
f1822a9603
|
@ -127,10 +127,10 @@ class HistoryScreen(CScreen):
|
||||||
except Exception:
|
except Exception:
|
||||||
time_str = _("error")
|
time_str = _("error")
|
||||||
if conf == -1:
|
if conf == -1:
|
||||||
time_str = _('unverified')
|
time_str = _('Not Verified')
|
||||||
icon = "atlas://gui/kivy/theming/light/close"
|
icon = "atlas://gui/kivy/theming/light/close"
|
||||||
elif conf == 0:
|
elif conf == 0:
|
||||||
time_str = _('pending')
|
time_str = _('Unconfirmed')
|
||||||
icon = "atlas://gui/kivy/theming/light/unconfirmed"
|
icon = "atlas://gui/kivy/theming/light/unconfirmed"
|
||||||
elif conf < 6:
|
elif conf < 6:
|
||||||
conf = max(1, conf)
|
conf = max(1, conf)
|
||||||
|
|
|
@ -44,10 +44,10 @@ class HistoryWidget(MyTreeWidget):
|
||||||
if conf > 0:
|
if conf > 0:
|
||||||
time_str = format_time(timestamp)
|
time_str = format_time(timestamp)
|
||||||
if conf == -1:
|
if conf == -1:
|
||||||
time_str = 'unverified'
|
time_str = _('Not Verified')
|
||||||
icon = QIcon(":icons/unconfirmed.png")
|
icon = QIcon(":icons/unconfirmed.png")
|
||||||
elif conf == 0:
|
elif conf == 0:
|
||||||
time_str = 'pending'
|
time_str = _('Unconfirmed')
|
||||||
icon = QIcon(":icons/unconfirmed.png")
|
icon = QIcon(":icons/unconfirmed.png")
|
||||||
elif conf < 6:
|
elif conf < 6:
|
||||||
icon = QIcon(":icons/clock%d.png"%conf)
|
icon = QIcon(":icons/clock%d.png"%conf)
|
||||||
|
|
|
@ -2477,7 +2477,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
|
||||||
else:
|
else:
|
||||||
time_string = "unknown"
|
time_string = "unknown"
|
||||||
else:
|
else:
|
||||||
time_string = "pending"
|
time_string = "unconfirmed"
|
||||||
|
|
||||||
if value is not None:
|
if value is not None:
|
||||||
value_string = format_satoshis(value, True)
|
value_string = format_satoshis(value, True)
|
||||||
|
|
|
@ -94,7 +94,7 @@ class ElectrumGui:
|
||||||
except Exception:
|
except Exception:
|
||||||
time_str = "unknown"
|
time_str = "unknown"
|
||||||
else:
|
else:
|
||||||
time_str = 'pending'
|
time_str = 'unconfirmed'
|
||||||
|
|
||||||
label = self.wallet.get_label(tx_hash)
|
label = self.wallet.get_label(tx_hash)
|
||||||
messages.append( format_str%( time_str, label, format_satoshis(value, whitespaces=True), format_satoshis(balance, whitespaces=True) ) )
|
messages.append( format_str%( time_str, label, format_satoshis(value, whitespaces=True), format_satoshis(balance, whitespaces=True) ) )
|
||||||
|
|
|
@ -115,7 +115,7 @@ class ElectrumGui:
|
||||||
except Exception:
|
except Exception:
|
||||||
time_str = "------"
|
time_str = "------"
|
||||||
else:
|
else:
|
||||||
time_str = 'pending'
|
time_str = 'unconfirmed'
|
||||||
|
|
||||||
label = self.wallet.get_label(tx_hash)
|
label = self.wallet.get_label(tx_hash)
|
||||||
if len(label) > 40:
|
if len(label) > 40:
|
||||||
|
|
Loading…
Reference in New Issue