Skip to content

Commit

Permalink
Merge pull request #134 from cxminer/patch-1
Browse files Browse the repository at this point in the history
Fix hard coded element name
  • Loading branch information
rubenv committed Apr 6, 2016
2 parents 8c53faa + 062994a commit 2cff360
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/extract.js
Original file line number Diff line number Diff line change
Expand Up @@ -341,8 +341,8 @@ var Extractor = (function () {
}
}

if (node.is('translate')) {
self.addString(reference(n.startIndex), str, extracted.translate.plural, extracted.translate.extractedComment);
if (node.is(self.options.attribute)) {
self.addString(reference(n.startIndex), str, extracted[self.options.attribute].plural, extracted[self.options.attribute].extractedComment, extracted[self.options.attribute].context);
return;
}

Expand Down
27 changes: 27 additions & 0 deletions test/extract.js
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,33 @@ describe('Extract', function () {
assert.equal(catalog.items[1].msgctxt, 'male');
});

it('Should extract context of custom element attribute from HTM, including attribute as element', function () {
var files = [
'test/fixtures/context-custom.html'
];
var catalog = testExtract(files, {
attribute: 'trans'
});

assert.equal(catalog.items.length, 4);

assert.equal(catalog.items[0].msgid, 'CrazyMe!');
assert.equal(catalog.items[0].msgstr, '');
assert.equal(catalog.items[0].msgctxt, 'male');

assert.equal(catalog.items[1].msgid, 'CrazyYou!');
assert.equal(catalog.items[1].msgstr, '');
assert.strictEqual(catalog.items[1].msgctxt, null);

assert.equal(catalog.items[2].msgid, 'Hello1!');
assert.equal(catalog.items[2].msgstr, '');
assert.strictEqual(catalog.items[2].msgctxt, null);

assert.equal(catalog.items[3].msgid, 'Hello2!');
assert.equal(catalog.items[3].msgstr, '');
assert.equal(catalog.items[3].msgctxt, 'male');
});

it('Extracts strings from an ES6 class', function () {
var files = [
'test/fixtures/es6-class.js'
Expand Down
6 changes: 6 additions & 0 deletions test/fixtures/context-custom.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<div>
<trans trans-context="male">CrazyMe!</trans>
<trans>CrazyYou!</trans>
<div trans>Hello1!</div>
<div trans trans-context="male">Hello2!</div>
</div>

0 comments on commit 2cff360

Please sign in to comment.