Skip to content

Don't export angular expressions, allow export attributes like title … #182

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Don't export angular expressions, allow export attributes like title … #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 16 additions & 1 deletion lib/extract.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,13 @@ var Extractor = (function () {
reference = { file: reference };
}

// Removing translations consist entirely of expression
var expressionRegex = new RegExp('^\\s*?' + this.options.startDelim + '[^\'"' + this.options.endDelim + ']*?' + this.options.endDelim + '\\s*?$');

if (expressionRegex.test(string) && !string.replace(expressionRegex, '').length) {
return;
}

string = string.trim();

if (string.length === 0) {
Expand Down Expand Up @@ -414,7 +421,15 @@ var Extractor = (function () {
if (possibleAttributes.indexOf(attr) > -1) {
var attrValue = extracted[attr];
str = node.html(); // this shouldn't be necessary, but it is
self.addString(reference(n.startIndex), str || getAttr(attr) || '', attrValue.plural, attrValue.extractedComment, attrValue.context);

// slight hack for <div translate="translate">text</div>
var gotAttr = getAttr(attr);
var isTranslate = attr === 'translate' && gotAttr === 'translate';
if (isTranslate) {
gotAttr = null;
}

self.addString(reference(n.startIndex), gotAttr || str || '', attrValue.plural, attrValue.extractedComment, attrValue.context);
} else if (matches = self.noDelimRegex.exec(getAttr(attr))) {
str = matches[2].replace(/\\\'/g, '\'');
self.addString(reference(n.startIndex), str);
Expand Down
Loading