Skip to content

Commit 1f43b5c

Browse files
sacgroverdgp1130
authored andcommitted
fix(@angular/cli): expand locale pattern in all schemas for all cases
Fixes: #17032 (cherry picked from commit 764b977)
1 parent faa8730 commit 1f43b5c

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

packages/angular/cli/lib/config/schema.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@
411411
"type": "object",
412412
"additionalProperties": false,
413413
"patternProperties": {
414-
"^[a-z]{2}(-[a-zA-Z]{2,})?$": {
414+
"^[a-zA-Z]{2,3}(-[a-zA-Z]{4})?(-([a-zA-Z]{2}|[0-9]{3}))?(-[a-zA-Z]{5,8})?$": {
415415
"oneOf": [
416416
{
417417
"type": "string",
@@ -2066,7 +2066,7 @@
20662066
"minItems": 1,
20672067
"items": {
20682068
"type": "string",
2069-
"pattern": "^[a-z]{2}(-[a-zA-Z]{2,})?$"
2069+
"pattern": "^[a-zA-Z]{2,3}(-[a-zA-Z]{4})?(-([a-zA-Z]{2}|[0-9]{3}))?(-[a-zA-Z]{5,8})?$"
20702070
}
20712071
}
20722072
]

packages/angular_devkit/build_angular/src/browser/schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@
211211
"minItems": 1,
212212
"items": {
213213
"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})?$"
215215
}
216216
}
217217
]

packages/angular_devkit/build_angular/src/server/schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@
175175
"minItems": 1,
176176
"items": {
177177
"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})?$"
179179
}
180180
}
181181
]

packages/angular_devkit/core/src/experimental/workspace/workspace-schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@
160160
"type": "object",
161161
"additionalProperties": false,
162162
"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})?$": {
164164
"oneOf": [
165165
{
166166
"type": "string",

0 commit comments

Comments
 (0)