fix(@angular/cli): expand locale pattern in all schemas for all cases

sacgrover · dgp1130 · commit 764b977de4b9 · 2020-02-24T12:39:35.000-08:00
Fixes: #17032
diff --git a/packages/angular/cli/lib/config/schema.json b/packages/angular/cli/lib/config/schema.json
@@ -417,7 +417,7 @@
               "type": "object",
               "additionalProperties": false,
               "patternProperties": {
-                "^[a-z]{2}(-[a-zA-Z]{2,})?$": {
+                "^[a-zA-Z]{2,3}(-[a-zA-Z]{4})?(-([a-zA-Z]{2}|[0-9]{3}))?(-[a-zA-Z]{5,8})?$": {
                   "oneOf": [
                     {
                       "type": "string",
@@ -2081,7 +2081,7 @@
             "minItems": 1,
             "items": {
               "type": "string",
-              "pattern": "^[a-z]{2}(-[a-zA-Z]{2,})?$"
+              "pattern": "^[a-zA-Z]{2,3}(-[a-zA-Z]{4})?(-([a-zA-Z]{2}|[0-9]{3}))?(-[a-zA-Z]{5,8})?$"
             }
           }
         ]
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.json b/packages/angular_devkit/build_angular/src/browser/schema.json
@@ -211,7 +211,7 @@
           "minItems": 1,
           "items": {
             "type": "string",
-            "pattern": "^[a-z]{2}(-[a-zA-Z]{2,})?$"
+            "pattern": "^[a-zA-Z]{2,3}(-[a-zA-Z]{4})?(-([a-zA-Z]{2}|[0-9]{3}))?(-[a-zA-Z]{5,8})?$"
           }
         }
       ]
diff --git a/packages/angular_devkit/build_angular/src/server/schema.json b/packages/angular_devkit/build_angular/src/server/schema.json
@@ -175,7 +175,7 @@
           "minItems": 1,
           "items": {
             "type": "string",
-            "pattern": "^[a-z]{2}(-[a-zA-Z]{2,})?$"
+            "pattern": "^[a-zA-Z]{2,3}(-[a-zA-Z]{4})?(-([a-zA-Z]{2}|[0-9]{3}))?(-[a-zA-Z]{5,8})?$"
           }
         }
       ]
diff --git a/packages/angular_devkit/core/src/experimental/workspace/workspace-schema.json b/packages/angular_devkit/core/src/experimental/workspace/workspace-schema.json
@@ -160,7 +160,7 @@
           "type": "object",
           "additionalProperties": false,
           "patternProperties": {
-            "^[a-z]{2}(-[a-zA-Z]{2,})?$": {
+            "^[a-zA-Z]{2,3}(-[a-zA-Z]{4})?(-([a-zA-Z]{2}|[0-9]{3}))?(-[a-zA-Z]{5,8})?$": {
               "oneOf": [
                 {
                   "type": "string",

Original file line number	Diff line number	Diff line change
`@@ -417,7 +417,7 @@`
`417`	`417`	`"type": "object",`
`418`	`418`	`"additionalProperties": false,`
`419`	`419`	`"patternProperties": {`
`420`		`- "^[a-z]{2}(-[a-zA-Z]{2,})?$": {`
	`420`	`+ "^[a-zA-Z]{2,3}(-[a-zA-Z]{4})?(-([a-zA-Z]{2}\|[0-9]{3}))?(-[a-zA-Z]{5,8})?$": {`
`421`	`421`	`"oneOf": [`
`422`	`422`	`{`
`423`	`423`	`"type": "string",`
`@@ -2081,7 +2081,7 @@`
`2081`	`2081`	`"minItems": 1,`
`2082`	`2082`	`"items": {`
`2083`	`2083`	`"type": "string",`
`2084`		`- "pattern": "^[a-z]{2}(-[a-zA-Z]{2,})?$"`
	`2084`	`+ "pattern": "^[a-zA-Z]{2,3}(-[a-zA-Z]{4})?(-([a-zA-Z]{2}\|[0-9]{3}))?(-[a-zA-Z]{5,8})?$"`
`2085`	`2085`	`}`
`2086`	`2086`	`}`
`2087`	`2087`	`]`
Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@`
`211`	`211`	`"minItems": 1,`
`212`	`212`	`"items": {`
`213`	`213`	`"type": "string",`
`214`		`- "pattern": "^[a-z]{2}(-[a-zA-Z]{2,})?$"`
	`214`	`+ "pattern": "^[a-zA-Z]{2,3}(-[a-zA-Z]{4})?(-([a-zA-Z]{2}\|[0-9]{3}))?(-[a-zA-Z]{5,8})?$"`
`215`	`215`	`}`
`216`	`216`	`}`
`217`	`217`	`]`
Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@`
`175`	`175`	`"minItems": 1,`
`176`	`176`	`"items": {`
`177`	`177`	`"type": "string",`
`178`		`- "pattern": "^[a-z]{2}(-[a-zA-Z]{2,})?$"`
	`178`	`+ "pattern": "^[a-zA-Z]{2,3}(-[a-zA-Z]{4})?(-([a-zA-Z]{2}\|[0-9]{3}))?(-[a-zA-Z]{5,8})?$"`
`179`	`179`	`}`
`180`	`180`	`}`
`181`	`181`	`]`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@`
`160`	`160`	`"type": "object",`
`161`	`161`	`"additionalProperties": false,`
`162`	`162`	`"patternProperties": {`
`163`		`- "^[a-z]{2}(-[a-zA-Z]{2,})?$": {`
	`163`	`+ "^[a-zA-Z]{2,3}(-[a-zA-Z]{4})?(-([a-zA-Z]{2}\|[0-9]{3}))?(-[a-zA-Z]{5,8})?$": {`
`164`	`164`	`"oneOf": [`
`165`	`165`	`{`
`166`	`166`	`"type": "string",`