Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dgp1130 merged 1 commit into from
Feb 11, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions packages/angular/cli/lib/config/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,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",
Expand All @@ -396,7 +397,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",
Expand Down
4 changes: 2 additions & 2 deletions packages/angular_devkit/core/src/experimental/workspace/workspace-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down