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

Fixes: #17032 (cherry picked from commit 764b977)
angular · Feb 24, 2020 · 1f43b5c · 1f43b5c
1 parent faa8730
commit 1f43b5c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/packages/angular/cli/lib/config/schema.json b/packages/angular/cli/lib/config/schema.json
@@ -411,7 +411,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",
@@ -2066,7 +2066,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",