Merge pull request #3589 from Diapolo/english-reason

Jeff Garzik · Jeff Garzik · commit 12e1fcc34e6c · 2014-01-27T23:58:24.000-08:00
use english for all reason strings in IsStandardTx()
diff --git a/src/main.cpp b/src/main.cpp
@@ -429,7 +429,7 @@ bool IsStandardTx(const CTransaction& tx, string& reason)
 
     // only one OP_RETURN txout is permitted
     if (nDataOut > 1) {
-        reason = "mucho-data";
+        reason = "multi-op-return";
         return false;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -429,7 +429,7 @@ bool IsStandardTx(const CTransaction& tx, string& reason)`
`429`	`429`
`430`	`430`	`// only one OP_RETURN txout is permitted`
`431`	`431`	`if (nDataOut > 1) {`
`432`		`- reason = "mucho-data";`
	`432`	`+ reason = "multi-op-return";`
`433`	`433`	`return false;`
`434`	`434`	`}`
`435`	`435`