From: Kunal Marwaha <marwahaha@berkeley.edu>
Date: Wed, 29 Mar 2017 08:21:11 +0000 (-0400)
Subject: Remove RTL scraping from preparse
X-Git-Tag: 2.19.0~32^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db2d2a837fcd22bb790b591925a6453256fdcfd6;p=thirdparty%2Fmoment.git

Remove RTL scraping from preparse
---

diff --git a/src/locale/ar-ly.js b/src/locale/ar-ly.js
index 2dcba3f68..fb3a3e773 100644
--- a/src/locale/ar-ly.js
+++ b/src/locale/ar-ly.js
@@ -98,7 +98,7 @@ export default moment.defineLocale('ar-ly', {
         yy : pluralize('y')
     },
     preparse: function (string) {
-        return string.replace(/\u200f/g, '').replace(/،/g, ',');
+        return string.replace(/،/g, ',');
     },
     postformat: function (string) {
         return string.replace(/\d/g, function (match) {
diff --git a/src/locale/ar.js b/src/locale/ar.js
index 619843ae5..4d4a8a473 100644
--- a/src/locale/ar.js
+++ b/src/locale/ar.js
@@ -111,7 +111,7 @@ export default moment.defineLocale('ar', {
         yy : pluralize('y')
     },
     preparse: function (string) {
-        return string.replace(/\u200f/g, '').replace(/[١٢٣٤٥٦٧٨٩٠]/g, function (match) {
+        return string.replace(/[١٢٣٤٥٦٧٨٩٠]/g, function (match) {
             return numberMap[match];
         }).replace(/،/g, ',');
     },
@@ -125,4 +125,3 @@ export default moment.defineLocale('ar', {
         doy : 12  // The week that contains Jan 1st is the first week of the year.
     }
 });
-
diff --git a/src/test/locale/ar-ly.js b/src/test/locale/ar-ly.js
index a3d1ae717..0b7679123 100644
--- a/src/test/locale/ar-ly.js
+++ b/src/test/locale/ar-ly.js
@@ -240,3 +240,11 @@ test('no leading zeros in long date formats', function (assert) {
         }
     }
 });
+
+// locale-specific
+test('ar-ly strict mode parsing works', function (assert) {
+    const m = moment().locale('ar-ly');
+    const formattedDate = m.format('l');
+    assert.equal(moment.utc(formattedDate, 'l', 'ar-ly', false).isValid(), true, 'Non-strict parsing works');
+    assert.equal(moment.utc(formattedDate, 'l', 'ar-ly', true).isValid(), true,'Strict parsing must work');
+});
diff --git a/src/test/locale/ar.js b/src/test/locale/ar.js
index dc847ab65..b87b2aa1f 100644
--- a/src/test/locale/ar.js
+++ b/src/test/locale/ar.js
@@ -240,3 +240,11 @@ test('no leading zeros in long date formats', function (assert) {
         }
     }
 });
+
+// locale-specific
+test('ar strict mode parsing works', function (assert) {
+    const m = moment().locale('ar');
+    const formattedDate = m.format('l');
+    assert.equal(moment.utc(formattedDate, 'l', 'ar', false).isValid(), true, 'Non-strict parsing works');
+    assert.equal(moment.utc(formattedDate, 'l', 'ar', true).isValid(), true,'Strict parsing must work');
+});