MediaWiki:DonationForm.js: Difference between revisions

Browse history interactively

← Older edit Newer edit →

Content deleted Content added

Inline

@@ Line 225: / Line 225: @@
 /* Localize the amount errors. Call when initialising form. */
 donationForm.localizeErrors = function() {
-    var currency  = donationForm.currency;
+    var currency  = donationForm.currency,
-    var minAmount = donationForm.minimums[ currency ];
+        minAmount = donationForm.minimums[ currency ],
+        locale = donationForm.getLocale( mw.config.get('wgPageContentLanguage'), donationForm.country );
-    /* T287706 - round to 2 decimal places (rounding up) */
-    var numFormat = function( amount ) {
-        return Math.ceil( amount * 100 ) / 100;
-    };
     $('.lp-error-smallamount').text( function( index, oldText ) {
-        return oldText.replace( '$1', numFormat( minAmount ) + ' ' + currency );
+        return oldText.replace( '$1', donationForm.formatAmount( minAmount, locale ) + '\xa0' + currency );
     });
@@ Line 245: / Line 242: @@
     $('.lp-error-bigamount').text( function( index, oldText ) {
-        return oldText.replace( '$1', numFormat( donationForm.maxUSD * minAmount ) )
+        return oldText.replace( '$1', donationForm.formatAmount( donationForm.maxUSD * minAmount, locale ) )
                       .replace( '$2', currency )
                       .replace( '$3', 'benefactors@wikimedia.org' )
-                      .replace( '$4', donationForm.maxUSD );
+                      .replace( '$4', donationForm.formatAmount( donationForm.maxUSD, locale ) );
     });
 };
@@ Line 754: / Line 751: @@
         }
         if ( params.recurring && params.variant && params.variant.match( /monthlyConvert/ ) ) {
-	        // Post-payments monthly convert makes no sense if it's already recurring
+            // Post-payments monthly convert makes no sense if it's already recurring
-	        // Avoid things like T312905
+            // Avoid things like T312905
-	        delete params.variant;
+            delete params.variant;
         }
@@ Line 991: / Line 988: @@
         minAmount = donationForm.minimums[ donationForm.currency ] || 1,
         maxAmount = donationForm.maxUSD * minAmount,
-        feeText, locale, formatterOptions;
+        feeText, locale;
     locale = donationForm.getLocale( mw.config.get('wgPageContentLanguage'), donationForm.country );
+    feeText = donationForm.formatAmount( feeAmount, locale );
-    if ( feeAmount % 1 !== 0 ) { // Not a whole number
-        formatterOptions = { minimumFractionDigits: 2 };
-    } else {
-        formatterOptions = {};
-    }
-    try {
-        feeText = feeAmount.toLocaleString( locale, formatterOptions );
-    } catch(e) {
-        feeText = feeAmount.toFixed(2);
-    }
     $('.ptf label span').text( feeText );
@@ Line 1,106: / Line 1,092: @@
  * @param  {string} language
  * @param  {string} country
- * @return {string}          locale identifier
+ * @return {string} locale identifier e.g. en-GB
  */
 donationForm.getLocale = function( language, country ) {
@@ Line 1,140: / Line 1,126: @@
     return false;
 };
+/**
+ * Format an amount for a given locale
+ *
+ * 2 decimal places if it has a fractional part, 0 if not
+ * Note this doesn't include any currency symbol
+ *
+ * @param  {number} amount
+ * @param  {string} locale To determine correct separators
+ * @return {string}
+ */
+donationForm.formatAmount = function( amount, locale ) {
+    var formatterOptions, output;
+    if ( amount % 1 !== 0 ) { // Not a whole number
+        formatterOptions = { minimumFractionDigits: 2, maximumFractionDigits: 2 };
+    } else {
+        formatterOptions = {};
+    }
+    try {
+        output = amount.toLocaleString( locale, formatterOptions );
+    } catch(e) {
+        output = amount.toFixed(2);
+    }
+    return output;
+}

MediaWiki:DonationForm.js: Difference between revisions

Navigation menu

Search