-Get them now if they're not already installed on your machine.
+ +Get them now if they're not already installed on your machine. 如果你的电脑上还没有装过，请立即获取它！ diff --git a/aio/content/guide/security.md b/aio/content/guide/security.md index 16bae4b268..b995e95cc0 100644 --- a/aio/content/guide/security.md +++ b/aio/content/guide/security.md @@ -70,7 +70,9 @@ For more information, see the [Trusting safe values](guide/security#bypass-secur **避免使用本文档中带“[_安全风险_](guide/security#bypass-security-apis)”标记的Angular API。** 要了解更多信息，请参阅本章的[信任那些安全的值](guide/security#bypass-security-apis)部分。 -## Preventing cross-site scripting (XSS) + + +## Preventing cross-site scripting (XSS) ## 防范跨站脚本(XSS)攻击 diff --git a/aio/src/app/layout/doc-viewer/doc-viewer.component.ts b/aio/src/app/layout/doc-viewer/doc-viewer.component.ts index eefd830101..b9ec775b34 100644 --- a/aio/src/app/layout/doc-viewer/doc-viewer.component.ts +++ b/aio/src/app/layout/doc-viewer/doc-viewer.component.ts @@ -12,10 +12,9 @@ import { OnDestroy, Output, } from '@angular/core'; -import { Title } from '@angular/platform-browser'; -import { DocumentContents } from 'app/documents/document.service'; - import { EmbeddedComponents } from 'app/embedded/embedded.module'; +import { DocumentContents } from 'app/documents/document.service'; +import { Title } from '@angular/platform-browser'; import { TocService } from 'app/shared/toc.service'; interface EmbeddedComponentFactory { diff --git a/aio/tools/transforms/remark-package/services/renderMarkdown.js b/aio/tools/transforms/remark-package/services/renderMarkdown.js index 077d64da1a..8c0a47bc80 100644 --- a/aio/tools/transforms/remark-package/services/renderMarkdown.js +++ b/aio/tools/transforms/remark-package/services/renderMarkdown.js @@ -2,7 +2,7 @@ const remark = require('remark'); const html = require('remark-html'); const code = require('./handlers/code'); -const {markAndSwap} = require('./translator'); +const {mark} = require('./translator'); /** * @dgService renderMarkdown @@ -22,7 +22,7 @@ module.exports = function renderMarkdown() { .use(html, { handlers }); return function renderMarkdownImpl(content) { - return markAndSwap(renderer.processSync(content).toString()); + return mark(renderer.processSync(content).toString()); }; /** diff --git a/aio/tools/transforms/remark-package/services/translator.js b/aio/tools/transforms/remark-package/services/translator.js index b72446bb55..2528230218 100644 --- a/aio/tools/transforms/remark-package/services/translator.js +++ b/aio/tools/transforms/remark-package/services/translator.js @@ -5,20 +5,10 @@ function mark(text) { }); } -function swap(text) { - return text.replace(/<(\w+)( translation-origin\b[\s\S]*?)<\/\1>(\s*)<\1( translation-result\b[\s\S]*?)<\/\1>/gi, '<$1$4$3<$1$2'); -} - -function markAndSwap(text) { - return mark(text); -} - function isTranslation(text) { return text && /[\u2E80-\u2EFF\u2F00-\u2FDF\u3000-\u303F\u31C0-\u31EF\u3200-\u32FF\u3300-\u33FF\u3400-\u4DBF\u4DC0-\u4DFF\u4E00-\u9FBF\uF900-\uFAFF\uFE30-\uFE4F\uFF00-\uFFEF]/.test(text); } module.exports = { mark, - swap, - markAndSwap, }; diff --git a/aio/tools/transforms/remark-package/services/translator.spec.js b/aio/tools/transforms/remark-package/services/translator.spec.js index f7b7e15b16..922498b726 100644 --- a/aio/tools/transforms/remark-package/services/translator.spec.js +++ b/aio/tools/transforms/remark-package/services/translator.spec.js @@ -1,13 +1,9 @@ +// TODO: replace mocha with jasmine const { expect } = require('chai'); -const { mark, swap } = require('./translator'); +const { mark} = require('./translator'); it('mark translation results and origins', () => { expect(mark('