ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix canvas_i18nliner issue, along with its tests 

it broke in the node upgrade (though fortunately not a feature we use),
and the tests were silently failing

test plan:
n/a, specs

Change-Id: Ib746b91e7500a31d8a8fb210af5afe8018c1dda3
Reviewed-on: https://gerrit.instructure.com/92764
Reviewed-by: Simon Williams <simon@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins
This commit is contained in:
Simon Williams 2016-10-13 13:20:11 -06:00
parent 22da9d6486
commit e4d7de76e3
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gems/canvas_i18nliner/.i18nrc Normal file
View File

@ -0,0 +1,5 @@
{
"plugins": [
"i18nliner-handlebars"
]
}

13
gems/canvas_i18nliner/js/scoped_i18n_js_extractor.js
View File

@ -14,9 +14,12 @@ ScopedI18nJsExtractor.prototype = Object.create(I18nJsExtractor.prototype);
ScopedI18nJsExtractor.prototype.constructor = ScopedI18nJsExtractor;
ScopedI18nJsExtractor.prototype.processCall = function(node) {
ScopedI18nJsExtractor.prototype.processCall = function(node, traverse) {
this.inferI18nScope(node);
I18nJsExtractor.prototype.processCall.call(this, node);
I18nJsExtractor.prototype.processCall.call(this, node, traverse);
if (this.i18nScope && this.i18nScope.node === node) {
this.popI18nScope();
}
};
ScopedI18nJsExtractor.prototype.inferI18nScope = function(node) {
@ -48,12 +51,6 @@ ScopedI18nJsExtractor.prototype.inferI18nScope = function(node) {
}
};
ScopedI18nJsExtractor.prototype.leave = function(node) {
if (this.i18nScope && this.i18nScope.node === node) {
this.popI18nScope();
}
};
ScopedI18nJsExtractor.prototype.pushI18nScope = function(scope) {
var stack = this.i18nScopeStack = this.i18nScopeStack || [];
stack.push(scope);

6
gems/canvas_i18nliner/npm-shrinkwrap.json generated
View File

@ -404,9 +404,9 @@
"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"
},
"i18nliner": {
"version": "0.1.5",
"from": "i18nliner@0.1.5",
"resolved": "https://registry.npmjs.org/i18nliner/-/i18nliner-0.1.5.tgz"
"version": "0.1.6",
"from": "i18nliner@0.1.6",
"resolved": "https://registry.npmjs.org/i18nliner/-/i18nliner-0.1.6.tgz"
},
"i18nliner-handlebars": {
"version": "0.2.0",

4
gems/canvas_i18nliner/package.json
View File

@ -8,7 +8,7 @@
"ember-template-compiler": "1.8.0",
"glob": "^7.0.3",
"handlebars": "1.3.0",
"i18nliner": "0.1.5",
"i18nliner": "0.1.6",
"i18nliner-handlebars": "0.2.0",
"minimist": "^1.1.0",
"mkdirp": "^0.5.1"
@ -17,6 +17,6 @@
"jasmine-node": "^1.14.5"
},
"scripts": {
"test": "./node_modules/.bin/jasmine-node ./test"
"test": "./node_modules/.bin/jasmine-node --captureExceptions ./test"
}
}