Skip to content

Feature parameters #22

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

Closed
sebastianhoitz wants to merge 2 commits into from
Closed

Feature parameters #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc2adba
Parse strings when arguments are passed to the translate method
sebastianhoitz Feb 27, 2014
f37311f
Allow more than one argument
sebastianhoitz Feb 27, 2014
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
2 changes: 1 addition & 1 deletion lib/parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ function Parser(keywords) {

this.keywords = keywords;

this.pattern = new RegExp('\\{\\{(?:' + keywords.join('|') + ') "((?:\\\\.|[^"\\\\])*)"(?: "((?:\\\\.|[^"\\\\])*)" \\w+)? ?\\}\\}', 'gm');
this.pattern = new RegExp('\\{\\{(?:' + keywords.join('|') + ') "((?:\\\\.|[^"\\\\])*)"(?: "((?:\\\\.|[^"\\\\])*)" \\w+)?(?: [\\w|\\.]+)*? ?\\}\\}', 'gm');
}

/**
Expand Down
4 changes: 4 additions & 0 deletions test/fixtures/arguments.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<h1>{{title}}</h1>
<p>{{_ "Hello %s" name}}</p>
<p>{{_ "Hello %s. It is %s" name weekday}}</p>

12 changes: 12 additions & 0 deletions test/parser_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,17 @@ exports.parser = {
test.equal(Object.keys(result).length, 1, 'Invalid amount of strings returned');

test.done();
},
'arguments': function (test) {
test.expect(1);

var templatePath = __dirname + '/fixtures/arguments.hbs',
template = fs.readFileSync(templatePath, 'utf8'),
result = parser.parse(template);

test.equal(Object.keys(result).length, 2, 'Invalid amount of strings returned');

test.done();

}
};