Merge branch 'master' into mohammad/stylelint

Author: ashkanx

src/javascript/binary/websocket_pages/user/account/settings/financial_assessment.js

@@ -50,7 +50,7 @@ var FinancialAssessmentws = (function(){
         var isValid = true,
             errors = {};
         $('#assessment_form select').each(function(){
-            if($(this).val() === ''){
+            if(!$(this).val()){
                 isValid = false;
                 errors[$(this).attr("id")] = text.localize('Please select a value.');
             }

src/templates/new_account/maltainvestws.html.tt

@@ -375,10 +375,11 @@
                             <div class="grd-grid-8">
                                 <select id="net-income">
                                   <option value="">[% l('Please select') %]</option>
-                                  <option value="Less than &#36;25,000">[% l('Less than $25,000') %]</option>
-                                  <option value="&#36;25,000 - &#36;100,000">[% l('$25,000 - $100,000') %]</option>
-                                  <option value="&#36;100,000 - &#36;500,000">[% l('$100,000 - $500,000') %]</option>
-                                  <option value="Over &#36;500,000">[% l('Over $500,001') %]</option>
+                                  <option value="Less than &#36;25,000">Less than &#36;25,000</option>
+                                  <option value="&#36;25,000 - &#36;50,000" >&#36;25,000 - &#36;50,000</option>
+                                  <option value="&#36;50,001 - &#36;100,000">&#36;50,001 - &#36;100,000</option>
+                                  <option value="&#36;100,001 - &#36;500,000">&#36;100,001 - &#36;500,000</option>
+                                  <option value="Over &#36;500,000">Over &#36;500,001</option>
                                 </select>
                                 <p class="errorfield" id="error-net-income" style="display:none"></p>
                             </div>
@@ -390,10 +391,11 @@
                             <div class="grd-grid-8">
                                 <select id="estimated-worth">
                                   <option value="">[% l('Please select') %]</option>
-                                  <option value="Less than &#36;100,000">[% l('Less than $100,000') %]</option>
-                                  <option value="&#36;100,000 - &#36;250,000">[% l('$100,000 - $250,000') %]</option>
-                                  <option value="&#36;250,000 - &#36;1,000,000">[% l('$250,000 - $1,000,000') %]</option>
-                                  <option value="Over &#36;1,000,000">[% l('Over $1,000,000') %]</option>
+                                  <option value="Less than &#36;100,000">Less than &#36;100,000</option>
+                                  <option value="&#36;100,000 - &#36;250,000" >&#36;100,000 - &#36;250,000</option>
+                                  <option value="&#36;250,001 - &#36;500,000">&#36;250,001 - &#36;500,000</option>
+                                  <option value="&#36;500,001 - &#36;1,000,000">&#36;500,001 - &#36;1,000,000</option>
+                                  <option value="Over &#36;1,000,000">Over &#36;1,000,000</option>
                                 </select>
                                 <p class="errorfield" id="error-estimated-worth" style="display:none"></p>
                             </div>

src/templates/user/settings/financial_assessmentws.html.tt

@@ -240,8 +240,9 @@
                             <select id="net_income" name="net_income">
                                 <option value="">Please select</option>
                                 <option value="Less than &#36;25,000">Less than &#36;25,000</option>
-                                <option value="&#36;25,000 - &#36;100,000" >&#36;25,000 - &#36;100,000</option>
-                                <option value="&#36;100,000 - &#36;500,000">&#36;100,000 - &#36;500,000</option>
+                                <option value="&#36;25,000 - &#36;50,000" >&#36;25,000 - &#36;50,000</option>
+                                <option value="&#36;50,001 - &#36;100,000">&#36;50,001 - &#36;100,000</option>
+                                <option value="&#36;100,001 - &#36;500,000">&#36;100,001 - &#36;500,000</option>
                                 <option value="Over &#36;500,000">Over &#36;500,001</option>
                             </select>
                             <p class="errorfield" id="errornet_income"></p>
@@ -256,7 +257,8 @@
                                 <option value="">Please select</option>
                                 <option value="Less than &#36;100,000">Less than &#36;100,000</option>
                                 <option value="&#36;100,000 - &#36;250,000" >&#36;100,000 - &#36;250,000</option>
-                                <option value="&#36;250,000 - &#36;1,000,000">&#36;250,000 - &#36;1,000,000</option>
+                                <option value="&#36;250,001 - &#36;500,000">&#36;250,001 - &#36;500,000</option>
+                                <option value="&#36;500,001 - &#36;1,000,000">&#36;500,001 - &#36;1,000,000</option>
                                 <option value="Over &#36;1,000,000">Over &#36;1,000,000</option>
                             </select>
                             <p class="errorfield" id="errorestimated_worth"></p>