Merge pull request #223 from isocolsky/email_templates

spend proposal -> payment proposal

lib/templates/new_tx_proposal.plain

@@ -1,2 +1,2 @@
-<%= subjectPrefix %>New spend proposal
-A new spend proposal has been created in your wallet <%= walletName %> by <%= creatorName %>.
+<%= subjectPrefix %>New payment proposal
+A new payment proposal has been created in your wallet <%= walletName %> by <%= creatorName %>.

lib/templates/txp_finally_rejected.plain

@@ -1,2 +1,2 @@
-<%= subjectPrefix %>Spend proposal rejected
-A spend proposal in your wallet <%= walletName %> has been rejected by <%= creatorName %>.
+<%= subjectPrefix %>Payment proposal rejected
+A payment proposal in your wallet <%= walletName %> has been rejected by <%= creatorName %>.

test/integration/server.js

@@ -3220,7 +3220,7 @@ describe('Wallet service', function() {
           _.difference(['copayer1@domain.com', 'copayer2@domain.com'], _.pluck(emails, 'to')).should.be.empty;
           var one = emails[0];
           one.from.should.equal('bws@dummy.net');
-          one.subject.should.contain('New spend proposal');
+          one.subject.should.contain('New payment proposal');
           one.text.should.contain(wallet.name);
           one.text.should.contain(wallet.copayers[0].name);
           server.storage.fetchUnsentEmails(function(err, unsent) {