Skip to content

Commit 1b7a7eb

Browse files
author
Orta
authored
Merge pull request #180 from microsoft/i8n
Support internationalization of text inside the website
2 parents 9dfd3ad + 95d74e7 commit 1b7a7eb

42 files changed

Lines changed: 1564 additions & 400 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/CI.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ jobs:
99
# Check out, and set up the node/ruby infra
1010
- uses: actions/checkout@v1
1111
- uses: actions/setup-node@v1
12+
with:
13+
node-version: '13.x'
1214

1315
# Get local dependencies
1416
- run: yarn install
@@ -51,6 +53,10 @@ jobs:
5153
path: './results'
5254

5355
# For danger stuff
56+
- uses: actions/setup-node@v1
57+
with:
58+
node-version: '13.x'
59+
5460
- run: yarn install
5561

5662
# danger for PR builds

‎.vscode/settings.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@
66
},
77
"workbench.colorCustomizations": {
88
"activityBar.background": "#c4d3e4",
9-
"activityBar.activeBorder": "#f2ccde",
9+
"activityBar.activeBorder": "#c37c9d",
1010
"activityBar.foreground": "#15202b",
1111
"activityBar.inactiveForeground": "#15202b99",
12-
"activityBarBadge.background": "#f2ccde",
12+
"activityBarBadge.background": "#c37c9d",
1313
"activityBarBadge.foreground": "#15202b"
1414
},
1515
"typescript.tsdk": "node_modules/typescript/lib",
1616
"debug.node.autoAttach": "on",
17-
"editor.formatOnSave": true
17+
"editor.formatOnSave": true,
18+
"peacock.color": "#a1b9d4"
1819
}

‎package.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
"workspaces": [
44
"packages/*"
55
],
6+
"engines": {
7+
"node": "^13"
8+
},
69
"devDependencies": {
710
"concurrently": "^5.0.2",
811
"danger": "^9.2.9",
@@ -15,6 +18,11 @@
1518
"resolutions": {
1619
"@types/react": "16.9.17"
1720
},
21+
"jest": {
22+
"transformIgnorePatterns": [
23+
"/node_modules/(?!intl-messageformat|intl-messageformat-parser).+\\.js$"
24+
]
25+
},
1826
"scripts": {
1927
"bootstrap": "yarn workspaces run bootstrap; yarn workspaces run build",
2028
"start": "concurrently -p \"[{name}]\" -n \"BUILD,SITE\" -c \"bgBlue.bold,bgMagenta.bold\" \"node watcher.js\" \"yarn workspace typescriptlang-org start\"",

packages/playground-examples/copy/leet/JavaScript/JavaScript Essentials/Code Flow.ts renamed to packages/playground-examples/copy/vo/JavaScript/JavaScript Essentials/Code Flow.ts

File renamed without changes.

packages/playground-examples/copy/leet/JavaScript/JavaScript Essentials/Functions.ts renamed to packages/playground-examples/copy/vo/JavaScript/JavaScript Essentials/Functions.ts

File renamed without changes.

packages/playground-examples/copy/leet/JavaScript/JavaScript Essentials/Hello World.ts renamed to packages/playground-examples/copy/vo/JavaScript/JavaScript Essentials/Hello World.ts

File renamed without changes.

packages/playground-examples/copy/leet/JavaScript/JavaScript Essentials/Objects and Arrays.ts renamed to packages/playground-examples/copy/vo/JavaScript/JavaScript Essentials/Objects and Arrays.ts

File renamed without changes.
File renamed without changes.

‎packages/ts-twoslasher/src/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ export function twoslasher(
358358
length = 0
359359
if (quickInfo && token && quickInfo.displayParts) {
360360
text = quickInfo.displayParts.map(dp => dp.text).join('')
361-
docs = quickInfo.documentation ? quickInfo.documentation.map(d => d.text).join('\n') : undefined
361+
docs = quickInfo.documentation ? quickInfo.documentation.map(d => d.text).join('<br/>') : undefined
362362
length = token[0].textSpan.start
363363
start = token[0].textSpan.length
364364
}

‎packages/tsconfig-reference/copy/leet/categories/Project_Files_0.md‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)