This commit is contained in:
Rick Falkvinge
2017-11-23 16:24:01 +01:00
parent e497cafa2a
commit 135063e550
3 changed files with 18 additions and 6 deletions
+11 -2
View File
@@ -61,7 +61,16 @@ namespace Resources.Pages {
}
/// <summary>
/// Looks up a localized string similar to This is a QR code for bitcoin echo testing for this entire Swarmops installation, not just for {0}. Read it from your phone&apos;s bitcoin wallet to perform the echo test, or donate from your computer directly to [{1}] (that&apos;s a Bitcoin Cash address). The amount (less miner fees) will be sent back to you in the next few seconds..
/// Looks up a localized string similar to &lt;strong&gt;DUST COLLECTED&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;The amount sent is smaller than the expected fee for returning it to you, which is {0} satoshis ({1} {2:N2}). The money you sent is now so-called &quot;dust&quot; on the bitcoin network, and won&apos;t be moved again.&lt;br/&gt;&lt;br/&gt;Send a higher amount to perform an echo test..
/// </summary>
internal static string BitcoinEchoTest_DustCollected {
get {
return ResourceManager.GetString("BitcoinEchoTest_DustCollected", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to This is a QR code for bitcoin echo testing for this entire Swarmops installation, not just for {0}. Read it from your phone&apos;s bitcoin wallet to perform the echo test, or donate from your computer directly to [{1}] (that&apos;s a Bitcoin Cash address). The amount (less miner fees of {2:N2} microcoins) will be sent back to you in the next few seconds..
/// </summary>
internal static string BitcoinEchoTest_Explain {
get {
@@ -88,7 +97,7 @@ namespace Resources.Pages {
}
/// <summary>
/// Looks up a localized string similar to This is a bitcoin echo test. It tests the hotwallet. If you send a small amount here, it will be sent back to you, minus the sendback transaction fee..
/// Looks up a localized string similar to This is a bitcoin echo test. It tests the hotwallet. If you send a small amount here, it will be sent back to you, minus the sendback transaction fee (currently {0:N2} microcoins)..
/// </summary>
internal static string BitcoinEchoTest_Info {
get {
+5 -2
View File
@@ -118,7 +118,7 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="BitcoinEchoTest_Explain" xml:space="preserve">
<value>This is a QR code for bitcoin echo testing for this entire Swarmops installation, not just for {0}. Read it from your phone's bitcoin wallet to perform the echo test, or donate from your computer directly to [{1}] (that's a Bitcoin Cash address). The amount (less miner fees) will be sent back to you in the next few seconds.</value>
<value>This is a QR code for bitcoin echo testing for this entire Swarmops installation, not just for {0}. Read it from your phone's bitcoin wallet to perform the echo test, or donate from your computer directly to [{1}] (that's a Bitcoin Cash address). The amount (less miner fees of {2:N2} microcoins) will be sent back to you in the next few seconds.</value>
<comment>The {0} is the organization name. {1} is the bitcoin address for donations.</comment>
</data>
<data name="BitcoinEchoTest_FundsReceived" xml:space="preserve">
@@ -130,7 +130,7 @@
<comment>Used if Bitcoin Cash is the org native currency.</comment>
</data>
<data name="BitcoinEchoTest_Info" xml:space="preserve">
<value>This is a bitcoin echo test. It tests the hotwallet. If you send a small amount here, it will be sent back to you, minus the sendback transaction fee.</value>
<value>This is a bitcoin echo test. It tests the hotwallet. If you send a small amount here, it will be sent back to you, minus the sendback transaction fee (currently {0:N2} microcoins).</value>
</data>
<data name="BitcoinEchoTest_PageTitle" xml:space="preserve">
<value>Bitcoin Cash Hotwallet Echo Test</value>
@@ -370,4 +370,7 @@
<data name="CreateOrganization_Titles_Government" xml:space="preserve">
<value>Government</value>
</data>
<data name="BitcoinEchoTest_DustCollected" xml:space="preserve">
<value>&lt;strong&gt;DUST COLLECTED&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;The amount sent is smaller than the expected fee for returning it to you, which is {0} satoshis ({1} {2:N2}). The money you sent is now so-called "dust" on the bitcoin network, and won't be moved again.&lt;br/&gt;&lt;br/&gt;Send a higher amount to perform an echo test.</value>
</data>
</root>
+2 -2
View File
@@ -34,7 +34,7 @@
$('#paraStatus').text(verifyingText);
var donatedSatoshis = data.vout[index][outAddress];
console.log(donatedSatoshis);
sentFunds += Math.floor((donatedSatoshis * conversionRateSatoshisToCents) / 100.0);
sentFunds += (Math.floor(donatedSatoshis * conversionRateSatoshisToCents) / 100.0;
odoSentCents.innerHTML = sentFunds; // looks weird but $('#id') not used with odo
var json = {};
@@ -49,7 +49,7 @@
minerFees -= minerFeeCents;
console.log(donatedSatoshis);
console.log("Miner fee is " + minerFeeSatoshis + " satoshis, translating to " + minerFeeCents + " cents");
returnedFunds += (Math.floor(((donatedSatoshis - minerFeeSatoshis) * conversionRateSatoshisToCents) / 100.0));
returnedFunds += ((Math.floor(((donatedSatoshis - minerFeeSatoshis) * conversionRateSatoshisToCents)) / 100.0);
odoMinerFeeCents.innerHTML = minerFees;
odoReturnedCents.innerHTML = returnedFunds;