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,
+   * @param {string} numberFormat Is the formatted version of a sample number
    *     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);
-    MarginSettings.thousandsPoint = matches[2];
-    MarginSettings.decimalPoint = matches[4];
+    var symbols = parseNumberFormat(numberFormat);
+    MarginSettings.thousandsPoint = symbols[0];
+    MarginSettings.decimalPoint = symbols[1];
     MarginSettings.useMetricSystem = measurementSystem == 0;
   };
 
   cr.addSingletonGetter(MarginSettings);
 
   MarginSettings.prototype = {
     /**
      * Returns a dictionary of the four custom margin values.
      * @return {object}
      */
@@ skipping 513 matching lines @@
       this.pageWidth_ = this.currentDefaultPageLayout.pageWidth;
       this.pageHeight_ = this.currentDefaultPageLayout.pageHeight;
     }
   };
 
   return {
     MarginSettings: MarginSettings,
     PageLayout: PageLayout,
   };
 });