From 8859d4062ed59f66adeba893bd6ff590952ac4ac Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Thu, 23 Nov 2017 19:57:15 +0100 Subject: [PATCH] Cosmetics and strings --- Site/App_GlobalResources/Pages.Admin.designer.cs | 2 +- Site/App_GlobalResources/Pages.Admin.resx | 2 +- Site/Pages/v5/Admin/BitcoinEchoTest.aspx.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Site/App_GlobalResources/Pages.Admin.designer.cs b/Site/App_GlobalResources/Pages.Admin.designer.cs index 9673a9bc..ad000f26 100644 --- a/Site/App_GlobalResources/Pages.Admin.designer.cs +++ b/Site/App_GlobalResources/Pages.Admin.designer.cs @@ -70,7 +70,7 @@ namespace Resources.Pages { } /// - /// 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'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.. + /// 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's bitcoin wallet to perform the echo test, or send 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.. /// internal static string BitcoinEchoTest_Explain { get { diff --git a/Site/App_GlobalResources/Pages.Admin.resx b/Site/App_GlobalResources/Pages.Admin.resx index 3db3f9e3..231798c0 100644 --- a/Site/App_GlobalResources/Pages.Admin.resx +++ b/Site/App_GlobalResources/Pages.Admin.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 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. + 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 send 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. The {0} is the organization name. {1} is the bitcoin address for donations. diff --git a/Site/Pages/v5/Admin/BitcoinEchoTest.aspx.cs b/Site/Pages/v5/Admin/BitcoinEchoTest.aspx.cs index 773ccca8..54048c13 100644 --- a/Site/Pages/v5/Admin/BitcoinEchoTest.aspx.cs +++ b/Site/Pages/v5/Admin/BitcoinEchoTest.aspx.cs @@ -60,7 +60,7 @@ namespace Swarmops.Frontend.Pages.v5.Admin this.BoxTitle.Text = Resources.Pages.Admin.BitcoinEchoTest_PageTitle; this.LabelExplainBitcoinEchoTest.Text = String.Format (Resources.Pages.Admin.BitcoinEchoTest_Explain, - CurrentOrganization.Name, address.Address); + CurrentOrganization.Name, address.Address, BitcoinUtility.EchoFeeSatoshis / 100.0); this.ImageBitcoinQr.ImageUrl = "https://chart.googleapis.com/chart?cht=qr&chs=400x400&chl=bitcoincash:" +