diff --git a/packages/compiler/src/i18n/extractor_merger.ts b/packages/compiler/src/i18n/extractor_merger.ts
index f1009cb17303a..0a45f6db38119 100644
--- a/packages/compiler/src/i18n/extractor_merger.ts
+++ b/packages/compiler/src/i18n/extractor_merger.ts
@@ -516,5 +516,5 @@ function _parseMessageMeta(i18n?: string): {meaning: string, description: string
[meaningAndDesc.slice(0, descIndex), meaningAndDesc.slice(descIndex + 1)] :
['', meaningAndDesc];
- return {meaning, description, id};
+ return {meaning, description, id: id.trim()};
}
diff --git a/packages/compiler/src/render3/view/i18n/get_msg_utils.ts b/packages/compiler/src/render3/view/i18n/get_msg_utils.ts
index 8c7be771e25df..e601904793492 100644
--- a/packages/compiler/src/render3/view/i18n/get_msg_utils.ts
+++ b/packages/compiler/src/render3/view/i18n/get_msg_utils.ts
@@ -10,7 +10,7 @@ import {mapLiteral} from '../../../output/map_util';
import * as o from '../../../output/output_ast';
import {serializeIcuNode} from './icu_serializer';
-import {i18nMetaToDocStmt, metaFromI18nMessage} from './meta';
+import {i18nMetaToDocStmt} from './meta';
import {formatI18nPlaceholderName} from './util';
/** Closure uses `goog.getMsg(message)` to lookup translations */
@@ -32,7 +32,7 @@ export function createGoogleGetMsgStatements(
// const MSG_... = goog.getMsg(..);
// I18N_X = MSG_...;
const statements = [];
- const jsdocComment = i18nMetaToDocStmt(metaFromI18nMessage(message));
+ const jsdocComment = i18nMetaToDocStmt(message);
if (jsdocComment !== null) {
statements.push(jsdocComment);
}
diff --git a/packages/compiler/src/render3/view/i18n/localize_utils.ts b/packages/compiler/src/render3/view/i18n/localize_utils.ts
index 2622677cacb63..2e8dc4cdb6915 100644
--- a/packages/compiler/src/render3/view/i18n/localize_utils.ts
+++ b/packages/compiler/src/render3/view/i18n/localize_utils.ts
@@ -9,7 +9,6 @@ import * as i18n from '../../../i18n/i18n_ast';
import * as o from '../../../output/output_ast';
import {serializeIcuNode} from './icu_serializer';
-import {metaFromI18nMessage} from './meta';
import {formatI18nPlaceholderName} from './util';
export function createLocalizeStatements(
@@ -18,9 +17,8 @@ export function createLocalizeStatements(
const statements = [];
const {messageParts, placeHolders} = serializeI18nMessageForLocalize(message);
- statements.push(new o.ExpressionStatement(variable.set(o.localizedString(
- metaFromI18nMessage(message), messageParts, placeHolders,
- placeHolders.map(ph => params[ph])))));
+ statements.push(new o.ExpressionStatement(variable.set(
+ o.localizedString(message, messageParts, placeHolders, placeHolders.map(ph => params[ph])))));
return statements;
}
diff --git a/packages/compiler/src/render3/view/i18n/meta.ts b/packages/compiler/src/render3/view/i18n/meta.ts
index a1122d03573b0..9a4ede68fd3bc 100644
--- a/packages/compiler/src/render3/view/i18n/meta.ts
+++ b/packages/compiler/src/render3/view/i18n/meta.ts
@@ -153,7 +153,7 @@ export class I18nMetaVisitor implements html.Visitor {
*/
private _parseMetadata(meta: string|i18n.I18nMeta): I18nMeta {
return typeof meta === 'string' ? parseI18nMeta(meta) :
- meta instanceof i18n.Message ? metaFromI18nMessage(meta) : {};
+ meta instanceof i18n.Message ? meta : {};
}
/**
@@ -191,16 +191,6 @@ export class I18nMetaVisitor implements html.Visitor {
}
}
-export function metaFromI18nMessage(message: i18n.Message, id: string | null = null): I18nMeta {
- return {
- id: typeof id === 'string' ? id : message.id || '',
- customId: message.customId,
- legacyId: message.legacyId,
- meaning: message.meaning || '',
- description: message.description || ''
- };
-}
-
/** I18n separators for metadata **/
const I18N_MEANING_SEPARATOR = '|';
const I18N_ID_SEPARATOR = '@@';
@@ -215,11 +205,12 @@ const I18N_ID_SEPARATOR = '@@';
* @param meta String that represents i18n meta
* @returns Object with id, meaning and description fields
*/
-export function parseI18nMeta(meta?: string): I18nMeta {
+export function parseI18nMeta(meta: string = ''): I18nMeta {
let customId: string|undefined;
let meaning: string|undefined;
let description: string|undefined;
+ meta = meta.trim();
if (meta) {
const idIndex = meta.indexOf(I18N_ID_SEPARATOR);
const descIndex = meta.indexOf(I18N_MEANING_SEPARATOR);
diff --git a/packages/compiler/test/i18n/extractor_merger_spec.ts b/packages/compiler/test/i18n/extractor_merger_spec.ts
index 697d8fedae346..52eec7c548a25 100644
--- a/packages/compiler/test/i18n/extractor_merger_spec.ts
+++ b/packages/compiler/test/i18n/extractor_merger_spec.ts
@@ -51,6 +51,12 @@ import {serializeNodes as serializeHtmlNodes} from '../ml_parser/util/util';
]);
});
+ it('should trim whitespace from custom ids (but not meanings)', () => {
+ expect(extract('
test
')).toEqual([
+ [['test'], '\n m1', 'd1', 'i1'],
+ ]);
+ });
+
it('should extract from attributes without meaning and with id', () => {
expect(
extract(
diff --git a/packages/compiler/test/i18n/i18n_parser_spec.ts b/packages/compiler/test/i18n/i18n_parser_spec.ts
index 729cf37bc0457..cc8c9dd3afb3c 100644
--- a/packages/compiler/test/i18n/i18n_parser_spec.ts
+++ b/packages/compiler/test/i18n/i18n_parser_spec.ts
@@ -18,7 +18,7 @@ import {DEFAULT_INTERPOLATION_CONFIG} from '@angular/compiler/src/ml_parser/inte
describe('elements', () => {
it('should extract from elements', () => {
expect(_humanizeMessages('text
')).toEqual([
- [['text'], 'm', 'd'],
+ [['text'], 'm', 'd', ''],
]);
});
@@ -29,7 +29,7 @@ import {DEFAULT_INTERPOLATION_CONFIG} from '@angular/compiler/src/ml_parser/inte
'text',
'nested'
],
- 'm', 'd'
+ 'm', 'd', ''
],
]);
});
@@ -46,16 +46,22 @@ import {DEFAULT_INTERPOLATION_CONFIG} from '@angular/compiler/src/ml_parser/inte
[
''
],
- 'm', 'd'
+ 'm', 'd', ''
],
]);
});
+
+ it('should trim whitespace from custom ids (but not meanings)', () => {
+ expect(_humanizeMessages('text
')).toEqual([
+ [['text'], '\n m', 'd', 'id'],
+ ]);
+ });
});
describe('attributes', () => {
it('should extract from attributes outside of translatable section', () => {
expect(_humanizeMessages('')).toEqual([
- [['msg'], 'm', 'd'],
+ [['msg'], 'm', 'd', ''],
]);
});
@@ -66,9 +72,9 @@ import {DEFAULT_INTERPOLATION_CONFIG} from '@angular/compiler/src/ml_parser/inte
[
''
],
- '', ''
+ '', '', ''
],
- [['msg'], 'm', 'd'],
+ [['msg'], 'm', 'd', ''],
]);
});
@@ -76,12 +82,12 @@ import {DEFAULT_INTERPOLATION_CONFIG} from '@angular/compiler/src/ml_parser/inte
expect(_humanizeMessages(
'
'))
.toEqual([
- [['msg'], 'm', 'd'],
+ [['msg'], 'm', 'd', ''],
[
[
''
],
- '', ''
+ '', '', ''
],
]);
});
@@ -91,12 +97,12 @@ import {DEFAULT_INTERPOLATION_CONFIG} from '@angular/compiler/src/ml_parser/inte
_humanizeMessages(
'{count, plural, =0 {
}}'))
.toEqual([
- [['msg'], 'm', 'd'],
+ [['msg'], 'm', 'd', ''],
[
[
'{count, plural, =0 {[]}}'
],
- '', ''
+ '', '', ''
],
]);
});
@@ -105,7 +111,7 @@ import {DEFAULT_INTERPOLATION_CONFIG} from '@angular/compiler/src/ml_parser/inte
expect(
_humanizeMessages('{count, plural, =0 {
}}'))
.toEqual([
- [['msg'], 'm', 'd'],
+ [['msg'], 'm', 'd', ''],
]);
});
@@ -116,20 +122,20 @@ import {DEFAULT_INTERPOLATION_CONFIG} from '@angular/compiler/src/ml_parser/inte
describe('interpolation', () => {
it('should replace interpolation with placeholder', () => {
expect(_humanizeMessages('before{{ exp }}after
')).toEqual([
- [['[before, exp , after]'], 'm', 'd'],
+ [['[before, exp , after]'], 'm', 'd', ''],
]);
});
it('should support named interpolation', () => {
expect(_humanizeMessages('before{{ exp //i18n(ph="teSt") }}after
'))
.toEqual([
- [['[before, exp //i18n(ph="teSt") , after]'], 'm', 'd'],
+ [['[before, exp //i18n(ph="teSt") , after]'], 'm', 'd', ''],
]);
expect(
_humanizeMessages('before{{ exp //i18n(ph=\'teSt\') }}after
'))
.toEqual([
- [[`[before, exp //i18n(ph='teSt') , after]`], 'm', 'd'],
+ [[`[before, exp //i18n(ph='teSt') , after]`], 'm', 'd', ''],
]);
});
});
@@ -140,9 +146,9 @@ import {DEFAULT_INTERPOLATION_CONFIG} from '@angular/compiler/src/ml_parser/inte
message2
message3`))
.toEqual([
- [['message1'], 'meaning1', 'desc1'],
- [['message2'], '', 'desc2'],
- [['message3'], '', ''],
+ [['message1'], 'meaning1', 'desc1', ''],
+ [['message2'], '', 'desc2', ''],
+ [['message3'], '', '', ''],
]);
});
@@ -153,7 +159,7 @@ import {DEFAULT_INTERPOLATION_CONFIG} from '@angular/compiler/src/ml_parser/inte
'text',
'html, nested'
],
- '', ''
+ '', '', ''
],
]);
});
@@ -162,36 +168,36 @@ import {DEFAULT_INTERPOLATION_CONFIG} from '@angular/compiler/src/ml_parser/inte
describe('ICU messages', () => {
it('should extract as ICU when single child of an element', () => {
expect(_humanizeMessages('{count, plural, =0 {zero}}
')).toEqual([
- [['{count, plural, =0 {[zero]}}'], 'm', 'd'],
+ [['{count, plural, =0 {[zero]}}'], 'm', 'd', ''],
]);
});
it('should extract as ICU + ph when not single child of an element', () => {
expect(_humanizeMessages('b{count, plural, =0 {zero}}a
')).toEqual([
- [['b', '{count, plural, =0 {[zero]}}', 'a'], 'm', 'd'],
- [['{count, plural, =0 {[zero]}}'], '', ''],
+ [['b', '{count, plural, =0 {[zero]}}', 'a'], 'm', 'd', ''],
+ [['{count, plural, =0 {[zero]}}'], '', '', ''],
]);
});
it('should extract as ICU + ph when wrapped in whitespace in an element', () => {
expect(_humanizeMessages(' {count, plural, =0 {zero}}
')).toEqual([
- [[' ', '{count, plural, =0 {[zero]}}', ' '], 'm', 'd'],
- [['{count, plural, =0 {[zero]}}'], '', ''],
+ [[' ', '{count, plural, =0 {[zero]}}', ' '], 'm', 'd', ''],
+ [['{count, plural, =0 {[zero]}}'], '', '', ''],
]);
});
it('should extract as ICU when single child of a block', () => {
expect(_humanizeMessages('{count, plural, =0 {zero}}'))
.toEqual([
- [['{count, plural, =0 {[zero]}}'], 'm', 'd'],
+ [['{count, plural, =0 {[zero]}}'], 'm', 'd', ''],
]);
});
it('should extract as ICU + ph when not single child of a block', () => {
expect(_humanizeMessages('b{count, plural, =0 {zero}}a'))
.toEqual([
- [['{count, plural, =0 {[zero]}}'], '', ''],
- [['b', '{count, plural, =0 {[zero]}}', 'a'], 'm', 'd'],
+ [['{count, plural, =0 {[zero]}}'], '', '', ''],
+ [['b', '{count, plural, =0 {[zero]}}', 'a'], 'm', 'd', ''],
]);
});
@@ -204,9 +210,9 @@ import {DEFAULT_INTERPOLATION_CONFIG} from '@angular/compiler/src/ml_parser/inte
'b', '{count, plural, =0 {[{sex, select, male {[m]}}]}}',
'a'
],
- 'm', 'd'
+ 'm', 'd', ''
],
- [['{count, plural, =0 {[{sex, select, male {[m]}}]}}'], '', ''],
+ [['{count, plural, =0 {[{sex, select, male {[m]}}]}}'], '', '', ''],
]);
});
});
@@ -214,7 +220,7 @@ import {DEFAULT_INTERPOLATION_CONFIG} from '@angular/compiler/src/ml_parser/inte
describe('implicit elements', () => {
it('should extract from implicit elements', () => {
expect(_humanizeMessages('bolditalic', ['b'])).toEqual([
- [['bold'], '', ''],
+ [['bold'], '', '', ''],
]);
});
});
@@ -224,7 +230,7 @@ import {DEFAULT_INTERPOLATION_CONFIG} from '@angular/compiler/src/ml_parser/inte
expect(_humanizeMessages(
'bolditalic', [], {'b': ['title']}))
.toEqual([
- [['bb'], '', ''],
+ [['bb'], '', '', ''],
]);
});
});
@@ -239,7 +245,7 @@ import {DEFAULT_INTERPOLATION_CONFIG} from '@angular/compiler/src/ml_parser/inte
'two',
'three',
],
- 'm', 'd'
+ 'm', 'd', ''
],
]);
@@ -256,7 +262,7 @@ import {DEFAULT_INTERPOLATION_CONFIG} from '@angular/compiler/src/ml_parser/inte
[
'[ a , a , b ]'
],
- 'm', 'd'
+ 'm', 'd', ''
],
]);
@@ -276,11 +282,11 @@ import {DEFAULT_INTERPOLATION_CONFIG} from '@angular/compiler/src/ml_parser/inte
'{count, plural, =0 {[0]}}',
'{count, plural, =1 {[1]}}',
],
- 'm', 'd'
+ 'm', 'd', ''
],
- [['{count, plural, =0 {[0]}}'], '', ''],
- [['{count, plural, =0 {[0]}}'], '', ''],
- [['{count, plural, =1 {[1]}}'], '', ''],
+ [['{count, plural, =0 {[0]}}'], '', '', ''],
+ [['{count, plural, =0 {[0]}}'], '', '', ''],
+ [['{count, plural, =1 {[1]}}'], '', '', ''],
]);
expect(_humanizePlaceholders(html)).toEqual([
@@ -304,11 +310,11 @@ import {DEFAULT_INTERPOLATION_CONFIG} from '@angular/compiler/src/ml_parser/inte
export function _humanizeMessages(
html: string, implicitTags: string[] = [],
- implicitAttrs: {[k: string]: string[]} = {}): [string[], string, string][] {
+ implicitAttrs: {[k: string]: string[]} = {}): [string[], string, string, string][] {
// clang-format off
// https://github.com/angular/clang-format/issues/35
return _extractMessages(html, implicitTags, implicitAttrs).map(
- message => [serializeNodes(message.nodes), message.meaning, message.description, ]) as [string[], string, string][];
+ message => [serializeNodes(message.nodes), message.meaning, message.description, message.id]) as [string[], string, string, string][];
// clang-format on
}
diff --git a/packages/compiler/test/render3/view/i18n_spec.ts b/packages/compiler/test/render3/view/i18n_spec.ts
index a4660926cefc1..afa377807527d 100644
--- a/packages/compiler/test/render3/view/i18n_spec.ts
+++ b/packages/compiler/test/render3/view/i18n_spec.ts
@@ -207,6 +207,13 @@ describe('Utils', () => {
expect(parseI18nMeta('meaning|desc')).toEqual(meta('', 'meaning', 'desc'));
expect(parseI18nMeta('meaning|desc@@id')).toEqual(meta('id', 'meaning', 'desc'));
expect(parseI18nMeta('@@id')).toEqual(meta('id', '', ''));
+
+ expect(parseI18nMeta('\n ')).toEqual(meta());
+ expect(parseI18nMeta('\n desc\n ')).toEqual(meta('', '', 'desc'));
+ expect(parseI18nMeta('\n desc@@id\n ')).toEqual(meta('id', '', 'desc'));
+ expect(parseI18nMeta('\n meaning|desc\n ')).toEqual(meta('', 'meaning', 'desc'));
+ expect(parseI18nMeta('\n meaning|desc@@id\n ')).toEqual(meta('id', 'meaning', 'desc'));
+ expect(parseI18nMeta('\n @@id\n ')).toEqual(meta('id', '', ''));
});
it('serializeI18nHead()', () => {