Cosmetics

This commit is contained in:
Rick Falkvinge
2017-11-23 15:23:29 +01:00
parent e29bf6a038
commit e497cafa2a
3 changed files with 13 additions and 12 deletions
+4 -4
View File
@@ -61,7 +61,7 @@ namespace Resources.Pages {
}
/// <summary>
/// Looks up a localized string similar to This is a QR code for bitcoin echo testing 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 auto-payment cycle which runs every five minutes..
/// 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..
/// </summary>
internal static string BitcoinEchoTest_Explain {
get {
@@ -70,7 +70,7 @@ namespace Resources.Pages {
}
/// <summary>
/// Looks up a localized string similar to Received {0} {1:N2} ({2:N0} microcoins or &quot;bits&quot;). They will be sent back shortly (less miner fee)..
/// Looks up a localized string similar to Received {2:N2} microcoins ({0} {1:N2}). Returning..
/// </summary>
internal static string BitcoinEchoTest_FundsReceived {
get {
@@ -79,7 +79,7 @@ namespace Resources.Pages {
}
/// <summary>
/// Looks up a localized string similar to Received {0} microcoins (&quot;bits&quot;). They will be sent back shortly (less miner fee)..
/// Looks up a localized string similar to Received {0} microcoins (&quot;bits&quot;). Returning..
/// </summary>
internal static string BitcoinEchoTest_FundsReceivedNative {
get {
@@ -124,7 +124,7 @@ namespace Resources.Pages {
}
/// <summary>
/// Looks up a localized string similar to Bitcoin Echo Test for {0}.
/// Looks up a localized string similar to Swarmops Bitcoin Echo Test.
/// </summary>
internal static string BitcoinEchoTest_TxLabel {
get {
+5 -6
View File
@@ -118,16 +118,16 @@
<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 {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 auto-payment cycle which runs every five minutes.</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) 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">
<value>Received {0} {1:N2} ({2:N0} microcoins or "bits"). They will be sent back shortly (less miner fee).</value>
<value>Received {2:N2} microcoins ({0} {1:N2}). Returning.</value>
<comment>{0} is native currency, {1} is amount in native currency</comment>
</data>
<data name="BitcoinEchoTest_FundsReceivedNative" xml:space="preserve">
<value>Received {0} microcoins ("bits"). They will be sent back shortly (less miner fee).</value>
<comment>Used if BTC is the org native currency.</comment>
<value>Received {0} microcoins ("bits"). Returning.</value>
<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>
@@ -142,8 +142,7 @@
<value>Transaction detected, verifying...</value>
</data>
<data name="BitcoinEchoTest_TxLabel" xml:space="preserve">
<value>Bitcoin Echo Test for {0}</value>
<comment>The {0} is the organization name</comment>
<value>Swarmops Bitcoin Echo Test</value>
</data>
<data name="CreateOrganization_ActivistTitle" xml:space="preserve">
<value>Activists will be called</value>
+4 -2
View File
@@ -45,8 +45,10 @@
json,
function (data) {
if (data.Success) {
minerFees += (-Math.floor(minerFeeSatoshis * conversionRateSatoshisToCents) / 100.0);
console.log(minerFees);
var minerFeeCents = (Math.floor(minerFeeSatoshis * conversionRateSatoshisToCents) / 100.0);
minerFees -= minerFeeCents;
console.log(donatedSatoshis);
console.log("Miner fee is " + minerFeeSatoshis + " satoshis, translating to " + minerFeeCents + " cents");
returnedFunds += (Math.floor(((donatedSatoshis - minerFeeSatoshis) * conversionRateSatoshisToCents) / 100.0));
odoMinerFeeCents.innerHTML = minerFees;