Merge pull request #55 from beregovoy68/devel

Messages improved and duplicate identifiers fixed

css/style.css

@@ -784,7 +784,7 @@ input.tabs-radio:checked + label img {
     -webkit-transform: translate(-50%, -55%);
     transform: translate(-50%, -55%);
 }
-#wHistory {
+#full-transaction-history, #wallet-transaction-history {
     width: 100%;
     padding: .5rem;
     padding-bottom: 1rem;
@@ -886,7 +886,7 @@ input.tabs-radio:checked + label img {
         opacity: 1;
     }
 }
-#wHistory tbody,
+#full-transaction-history tbody, #wallet-transaction-history tbody,
 #latestBlocksUnconfirmed,
 #latestBlocksTable {
     font-family: 'Lekton';
@@ -1548,7 +1548,7 @@ input.tabs-radio:checked + label img {
     .wB-buttons {
         height: 22.5%;
     }
-    #wHistory {
+    #full-transaction-history, #wallet-transaction-history {
         display: none;
     }
 }

index.html

@@ -108,7 +108,7 @@ <h2>NEW ACCOUNT - NOTICE</h2>
                                             The procedure consists of complex cryptographic operations that use a <b>SEED</b> (a series of random words) to create a unique address for your account.
                                             <br/><br/>
                                             This SEED is extremely important and must be kept in safe place, since it's the only way to recover your account in case of lost, corrupted data or hardware failure. 
-                                            <br/>   
+                                            <br/>
                                             Your SEED will also allow you to IMPORT your account to other devices.
                                             <br/><br/>
                                             <i>NOTE: Make sure that you select the entire SEED length before keeping it.  It's suggested to use the copy-to-clipboard button located the right side of the SEED box.</i>
@@ -122,12 +122,13 @@ <h2>NEW ACCOUNT - NOTICE</h2>
                                         <img class="wPop-header" src="img/modal-header-round.svg" />
                                         <div class="wPop-content">
                                             <h2>SEED NOTICE</h2>
-                                            <p>Your wallet seed contains trailing whitespace character(s).
+                                            <p>
+                                                Your wallet seed contains one or more trailing whitespace characters.
                                                 <br/><br/>
-                                                A seed with a whitespace at the end and a seed without it are different seeds and lead to different generated addresses.
+                                                A seed with a whitespace at the end and a seed without one are different, and will result in different addresses generated.
                                                 <br/><br/>
-                                                It is strongly recommended to avoid trailing whitespaces in the seed. If you understand all the implications of having a seed with trailing whitespace(s) press <b>PROCEED</b>.
-                                                Press <b>CANCEL</b> or close the dialog to edit the seed.<br/>
+                                                It is strongly recommended that you avoid trailing whitespaces in the seed. If you understand the implications of including a trailing whitespace in your seed, press <b>PROCEED</b>.
+                                                Press <b>CANCEL</b> or close the dialog box to edit your seed.<br/>
                                             </p>
                                             <div class="wPop-content-buttons">
                                                 <a id="close-seed-whitespace-modal" href="#" class="wButton paymentForm-but fade">PROCEED</a><span class="divider-2"></span>
@@ -651,7 +652,7 @@ <h2>SEND PAYMENT</h2>
                     </div>
 
             </div>
-                    <div id="wHistory" class="wavesTable">
+                    <div id="wallet-transaction-history" class="wavesTable">
                     <table>
                         <thead>
                             <div class="wTMainHeader">
@@ -745,7 +746,7 @@ <h1>DECENTRALIZED VOTING</h1>
         <!-- HISTORY TAB -->
             <div id="mBB-history" class="mBB-content">
 
-                <div id="wHistory" class="wavesTable">
+                <div id="full-transaction-history" class="wavesTable">
                     <table>
                         <thead>
                             <div class="wTMainHeader">

js/waves.ui.wallet.js

@@ -71,7 +71,7 @@ var Waves = (function(Waves, $, undefined) {
                         },
                         wavessendamount : {
                             required : 'Amount to send is required',
-                            decimal : 'Amount to send must be a decimal number with dot (.) as a decimal separator with no more than {0} fraction digits',
+                            decimal : 'The amount to send must be a number with no more than {0} digits after the decimal point (.)',
                             min : 'Payment amount is too small. It should be greater or equal to ' +
                                 Waves.UI.constants.MINIMUM_PAYMENT_AMOUNT.toFixed(Waves.UI.constants.AMOUNT_DECIMAL_PLACES)
                         }
@@ -111,9 +111,8 @@ var Waves = (function(Waves, $, undefined) {
             }
 
             if (!$.validator.methods.decimal.call(this.validator, value, element[0], Currency.WAV.precision)) {
-                $.growl.error({ message: 'Transaction fee must be a decimal number with dot (.) as ' +
-                    'a decimal separator with no more than ' + Currency.WAV.precision +
-                    ' fraction digits' });
+                $.growl.error({ message: 'Transaction fee must be with no more than ' +
+                    Currency.WAV.precision + ' digits after the decimal point (.)' });
                 element.parent().addClass(this.errorClass);
 
                 return false;