unistack-org/ngx-translate-extract
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug where keys were being extracted when not accessing TranslationService property

Browse Source
This commit is contained in:
Kim Biesbjerg
2017-01-28 15:06:05 +01:00
parent 04429bdb44
commit 303fb1b6de
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/parsers/service.parser.ts
View File

@@ -12,7 +12,7 @@ export class ServiceParser implements ParserInterface {
} }
const methodRegExp: RegExp = /(?:get|instant)\s*\(\s*(\[?\s*(['"`])([^\1\r\n]*)\2\s*\]?)/; const methodRegExp: RegExp = /(?:get|instant)\s*\(\s*(\[?\s*(['"`])([^\1\r\n]*)\2\s*\]?)/;
const regExp: RegExp = new RegExp(`${translateServiceVar}\.${methodRegExp.source}`, 'g'); const regExp: RegExp = new RegExp(`\\.${translateServiceVar}\\.${methodRegExp.source}`, 'g');
let matches: RegExpExecArray; let matches: RegExpExecArray;
while (matches = regExp.exec(contents)) { while (matches = regExp.exec(contents)) {

6
tests/parsers/service.parser.spec.ts
View File

@@ -123,18 +123,18 @@ describe('ServiceParser', () => {
expect(keys).to.deep.equal(['Hello', 'World', 'How', 'Are', 'You', 'Today']); expect(keys).to.deep.equal(['Hello', 'World', 'How', 'Are', 'You', 'Today']);
}); });
it('should extract strings with params', () => { it('should not extract string when not accessing property', () => {
const contents = ` const contents = `
@Component({ }) @Component({ })
export class AppComponent { export class AppComponent {
public constructor(protected trans: TranslateService) { } public constructor(protected trans: TranslateService) { }
public test() { public test() {
trans.get("You are expected at {{time}}", {time: moment.format('H:mm')}).subscribe(); trans.get('Hello World');
} }
} }
`; `;
const keys = parser.extract(contents, componentFilename).keys(); const keys = parser.extract(contents, componentFilename).keys();
expect(keys).to.deep.equal(['You are expected at {{time}}']); expect(keys).to.deep.equal([]);
}); });
}); });