Print Preview: Fixing parsing of numberFormat for several locales.

chrome/browser/resources/print_preview/margin_settings.js

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 cr.define('print_preview', function() {
   'use strict';
 
   /**
    * Creates a Margins object that holds four margin values. The units in which
    * the values are expressed can be any numeric value.
@@ skipping 149 matching lines @@
   //  Group name corresponding to the left margin.
   MarginSettings.LEFT_GROUP = 'left';
   // Group name corresponding to the right margin.
   MarginSettings.RIGHT_GROUP = 'right';
   // Group name corresponding to the bottom margin.
   MarginSettings.BOTTOM_GROUP = 'bottom';
 
   /**
    * Extracts the number formatting and measurement system for the current
    * locale.
-   * @param {string} numberFormat Is the formatted version of a sample number,
-   *     sent from the backend.
+   * @param {string} numberFormat Is the formatted version of the sample number
+   *     12345678 sent from the backend.
    * @param {number} measurementSystem 0 for SI (aka metric system), 1 for the
    *     system used in the US. Note: Mathces UMeasurementSystem enum in
    *     third_party/icu/public/i18n/unicode/ulocdata.h.
    */
   MarginSettings.setNumberFormatAndMeasurementSystem = function(
       numberFormat, measurementSystem) {
-    var regex = /^(\d+)(\.|\,)(\d+)(\.|\,)(\d+)$/;
-    var matches = numberFormat.match(regex);
+    var regex = /^(123)(\W{0,1})(456)(\W{0,1})(78)$/;
+    var matches = numberFormat.match(regex) || ['','','.','',','];

[dpapad, 2011/12/12 23:58:06]

The fix has 2 parts.

1) Changing the regex to allow any kind of symbom for thousands point and
decimal point.
2) In the unexpected case that parsing fails, defaulting to '.' for thousands
point and ',' for decimal point. 

[Lei Zhang, 2011/12/13 00:16:02]

Isn't this reversed? ',' for thousands and '.' for decimal.

[dpapad1, 2011/12/13 01:01:19]

Well, I am not sure what the fallback should be. In some locales  (e.g Greek)
"." is for thousands and "," for decimal. I guess the fallback should be the
most commonly used option? Ideally we should be able to test in all locales and
make sure that the fallback is never needed.

[dpapad1, 2011/12/13 01:11:32]

Done.

     MarginSettings.thousandsPoint = matches[2];
     MarginSettings.decimalPoint = matches[4];
     MarginSettings.useMetricSystem = measurementSystem == 0;
   };
 
   cr.addSingletonGetter(MarginSettings);
 
   MarginSettings.prototype = {
     /**
      * Returns a dictionary of the four custom margin values.
@@ skipping 515 matching lines @@
       this.pageWidth_ = this.currentDefaultPageLayout.pageWidth;
       this.pageHeight_ = this.currentDefaultPageLayout.pageHeight;
     }
   };
 
   return {
     MarginSettings: MarginSettings,
     PageLayout: PageLayout,
   };
 });