Skip to content

Fixes rubenv/angular-gettext-tools#177 #178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
matthieusieben wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fixes rubenv/angular-gettext-tools#177 #178

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
72e1723
Fixes rubenv/angular-gettext-tools#177
matthieusieben Dec 13, 2017
c5f100f
Linting
matthieusieben Dec 13, 2017
ca3a4fd
Linting
matthieusieben Dec 13, 2017
f03327a
node.leadingComments are `undefined`, not `null`
matthieusieben Dec 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions lib/extract.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,17 @@ var Extractor = (function () {
return;
}

function isAnnontatedString(node) {
return node !== null &&
isStringLiteral(node) &&
node.leadingComments &&
self.options.markerNames.some(function (markerName) {
return node.leadingComments.some(function (comment) {
return comment.value.indexOf(markerName) !== -1;
});
});
}

function isGettext(node) {
return node !== null &&
node.type === 'CallExpression' &&
Expand Down Expand Up @@ -298,6 +309,8 @@ var Extractor = (function () {
} else if (isTemplateElement(node)) {
var line = reference.location && reference.location.start.line ? reference.location.start.line - 1 : 0;
self.extractHtml(reference.file, node.value.raw, line);
} else if (isAnnontatedString(node)) {
str = getJSExpression(node);
}
if (str || singular) {
var leadingComments = node.leadingComments || (parentComment ? parentComment.leadingComments : []);
Expand Down