fix(@angular/cli): expand locale pattern in workspace schema

Fixes: #16935 (cherry picked from commit 7b54164)
angular · Feb 11, 2020 · ae58a65 · ae58a65
1 parent 267c103
commit ae58a65
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/packages/angular/cli/lib/config/schema.json b/packages/angular/cli/lib/config/schema.json
@@ -381,7 +381,8 @@
                   "type": "string",
                   "description": "Specifies the source locale of the application.",
                   "default": "en-US",
-                  "pattern": "^[a-z]{2}(-[a-zA-Z]{2,})?$"
+                  "$comment": "IETF BCP 47 language tag (simplified)",
+                  "pattern": "^[a-zA-Z]{2,3}(-[a-zA-Z]{4})?(-([a-zA-Z]{2}|[0-9]{3}))?(-[a-zA-Z]{5,8})?$"
                 },
                 {
                   "type": "object",
@@ -390,7 +391,7 @@
                     "code": {
                       "type": "string",
                       "description": "Specifies the locale code of the source locale",
-                      "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})?$"
                     },
                     "baseHref": {
                       "type": "string",

diff --git a/packages/angular_devkit/core/src/experimental/workspace/workspace-schema.json b/packages/angular_devkit/core/src/experimental/workspace/workspace-schema.json
@@ -136,7 +136,7 @@
               "type": "string",
               "description": "Specifies the source locale of the application.",
               "default": "en-US",
-              "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})?$"
             },
             {
               "type": "object",
@@ -145,7 +145,7 @@
                 "code": {
                   "type": "string",
                   "description": "Specifies the locale code of the source locale",
-                  "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})?$"
                 },
                 "baseHref": {
                   "type": "string",