Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit 55204c2

Browse files
Narretzmgol
Narretz
authored and
mgol
committed
[WIP]chore: eslint i18n/
1 parent e78aaed commit 55204c2

File tree

9 files changed

+51
-37
lines changed

9 files changed

+51
-37
lines changed

‎i18n/spec/closureI18nExtractorSpec.js

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1+
'use strict';
2+
13
var closureI18nExtractor = require('../src/closureI18nExtractor.js');
24
var converter = require('../src/converter.js');
3-
findLocaleId = closureI18nExtractor.findLocaleId;
4-
extractNumberSymbols = closureI18nExtractor.extractNumberSymbols;
5-
extractCurrencySymbols = closureI18nExtractor.extractCurrencySymbols;
6-
extractDateTimeSymbols = closureI18nExtractor.extractDateTimeSymbols;
7-
outputLocale = closureI18nExtractor.outputLocale;
5+
var findLocaleId = closureI18nExtractor.findLocaleId;
6+
var extractNumberSymbols = closureI18nExtractor.extractNumberSymbols;
7+
var extractCurrencySymbols = closureI18nExtractor.extractCurrencySymbols;
8+
var extractDateTimeSymbols = closureI18nExtractor.extractDateTimeSymbols;
9+
var outputLocale = closureI18nExtractor.outputLocale;
810

911

1012
function newTestLocaleInfo() {
@@ -131,7 +133,6 @@ describe("extractCurrencySymbols", function() {
131133
"};"
132134
].join('\n');
133135

134-
var localeInfo = {};
135136
var currencySymbols = extractCurrencySymbols(CONTENT);
136137
expect(currencySymbols.GBP).toEqual([2, '£', 'GB£']);
137138
expect(currencySymbols.AOA).toEqual([2, 'Kz', 'Kz']);
@@ -215,7 +216,6 @@ describe("extractDateTimeSymbols", function() {
215216

216217
describe("pluralExtractor", function() {
217218
it("should output PLURAL_CAT in the output string code", function() {
218-
var localeIds = ["fr_CA"];
219219
var content = (
220220
"goog.provide('goog.i18n.pluralRules');\n" +
221221
"\n" +
@@ -248,11 +248,13 @@ describe("pluralExtractor", function() {
248248
// Ref: closureI18nExtractor.pluralExtractor.
249249
pluralCat = pluralCat.replace(/^@@|@@$/g, '');
250250
// pluralCat requires these constants to exist.
251+
// eslint-disable-next-line no-unused-vars
251252
var PLURAL_CATEGORY = {
252253
ZERO: "zero", ONE: "one", TWO: "two",
253254
FEW: "few", MANY: "many", OTHER: "other"
254255
};
255256
// Obtain the function by evaluating the source text.
257+
// eslint-disable-next-line no-eval
256258
pluralCat = eval("(" + pluralCat + ")");
257259
// Confirm some expectations for pluralCat in fr_CA.
258260
expect(pluralCat(0)).toEqual("one");
@@ -263,6 +265,7 @@ describe("pluralExtractor", function() {
263265
describe("serializeContent", function() {
264266
it("should not make any modifications to the content of the locale", function() {
265267
var serializedContent = closureI18nExtractor.serializeContent(newTestLocaleInfo());
268+
// eslint-disable-next-line no-eval
266269
expect(eval("(" + serializedContent + ")")).toEqual(newTestLocaleInfo());
267270
});
268271
it("should only have ascii characters", function() {
@@ -271,6 +274,7 @@ describe("serializeContent", function() {
271274
});
272275
it("should not transform arrays into objects", function() {
273276
var serializedContent = closureI18nExtractor.serializeContent(newTestLocaleInfo().fr_CA);
277+
// eslint-disable-next-line no-eval
274278
var deserializedLocale = eval("(" + serializedContent + ")");
275279
expect(deserializedLocale.DATETIME_FORMATS.MONTH.length).not.toBeUndefined();
276280
});

‎i18n/spec/parserSpec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ describe('parsePattern', function() {
2222
parseAndExpect('#,##0.###', '', '-', '', '', 1, 0, 3, 3, 3);
2323
parseAndExpect('#,##0.###;#,##0.###-', '', '', '', '-', 1, 0, 3, 3, 3);
2424
parseAndExpect('#,##,##0.###', '', '-', '', '', 1, 0, 3, 2, 3);
25-
parseAndExpect("#,##0.###;\'\u202A\'-#,##0.###\'\u202C\'",
25+
parseAndExpect("#,##0.###;'\u202A'-#,##0.###'\u202C'",
2626
'', '\u202A-', '', '\u202C', 1, 0, 3, 3, 3);
2727
parseAndExpect('#0.###;#0.###-', '', '', '', '-', 1, 0, 3, 0, 0);
2828

@@ -31,7 +31,7 @@ describe('parsePattern', function() {
3131
it('should parse CURRENCY patterns', function() {
3232
// all CURRENCY patterns from closure
3333
parseAndExpect('#,##0.00 \u00A4', '', '-', ' \u00A4', ' \u00A4', 1, 2, 2, 3, 3);
34-
parseAndExpect("#,##0.00\u00A0\u00A4;\'\u202A\'-#,##0.00\'\u202C\'\u00A0\u00A4",
34+
parseAndExpect("#,##0.00\u00A0\u00A4;'\u202A'-#,##0.00'\u202C'\u00A0\u00A4",
3535
'', '\u202A-', '\u00A0\u00A4', '\u202C\u00A0\u00A4', 1, 2, 2, 3, 3);
3636
parseAndExpect('#,##0.00 \u00A4;(#,##0.00 \u00A4)',
3737
'', '(', ' \u00A4', ' \u00A4)', 1, 2, 2, 3, 3);

‎i18n/src/parser.js

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
'use strict';
2+
13
/**
24
* A simple parser to parse a number format into a pattern object
35
*/
@@ -27,20 +29,20 @@ function parsePattern(pattern) {
2729
lgSize: 0
2830
};
2931

30-
var parts = pattern.split(PATTERN_SEP),
31-
positive = parts[0],
32-
negative = parts[1];
32+
var patternParts = pattern.split(PATTERN_SEP),
33+
positive = patternParts[0],
34+
negative = patternParts[1];
3335

34-
var parts = positive.split(DECIMAL_SEP),
35-
integer = parts[0],
36-
fraction = parts[1];
36+
var positiveParts = positive.split(DECIMAL_SEP),
37+
integer = positiveParts[0],
38+
fraction = positiveParts[1];
3739

3840
p.posPre = integer.substr(0, integer.indexOf(DIGIT));
3941

4042
for (var i = 0; i < fraction.length; i++) {
4143
var ch = fraction.charAt(i);
42-
if (ch == ZERO) p.minFrac = p.maxFrac = i + 1;
43-
else if (ch == DIGIT) p.maxFrac = i + 1;
44+
if (ch === ZERO) p.minFrac = p.maxFrac = i + 1;
45+
else if (ch === DIGIT) p.maxFrac = i + 1;
4446
else p.posSuf += ch;
4547
}
4648

@@ -52,8 +54,8 @@ function parsePattern(pattern) {
5254
var trunkLen = positive.length - p.posPre.length - p.posSuf.length,
5355
pos = negative.indexOf(DIGIT);
5456

55-
p.negPre = negative.substr(0, pos).replace(/\'/g, '');
56-
p.negSuf = negative.substr(pos + trunkLen).replace(/\'/g, '');
57+
p.negPre = negative.substr(0, pos).replace(/'/g, '');
58+
p.negSuf = negative.substr(pos + trunkLen).replace(/'/g, '');
5759
} else {
5860
// hardcoded '-' sign is fine as all locale use '-' as MINUS_SIGN. (\u2212 is the same as '-')
5961
p.negPre = '-' + p.posPre;

‎i18n/src/util.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
'use strict';
2+
13
exports.findLocaleId = function findLocaleId(str, type) {
24
if (type === 'num') {
35
return (str.match(/^NumberFormatSymbols_(.+)$/) || [])[1];
4-
} else if (type == 'datetime') {
6+
} else if (type === 'datetime') {
57
return (str.match(/^DateTimeSymbols_(.+)$/) || [])[1];
68
}
79
};

‎i18n/ucd/spec/.eslintrc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"env": {
3-
"jasmine": true
3+
"jasmine": true,
4+
"es6": true
45
}
56
}

‎i18n/ucd/spec/extactValuesSpec.js

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
'use strict';
2+
13
var extractValues = require('../src/extractValues.js').extractValues;
24
var stream = require('stream');
35

4-
function StringStream(str) {
6+
function stringStream(str) {
57
return new stream.Readable({
68
read: function(n) {
79
this.push(str);
@@ -12,40 +14,45 @@ function StringStream(str) {
1214

1315
describe('extractValues', function() {
1416
it('should extract the values from the xml', function(done) {
15-
var str = '<ucd><repertoire><char cp="0000" IDS="N"></char><char cp="0001" IDS="Y"></char><char cp="0002" IDS="Y"></char><char cp="0003" IDS="N"></char></repertoire></ucd>';
16-
extractValues(StringStream(str), {'IDS': 'Y'}, function(values) {
17+
var str = '<ucd><repertoire><char cp="0000" IDS="N"></char><char cp="0001" IDS="Y"></char>' +
18+
'<char cp="0002" IDS="Y"></char><char cp="0003" IDS="N"></char></repertoire></ucd>';
19+
extractValues(stringStream(str), {'IDS': 'Y'}, function(values) {
1720
expect(values).toEqual({ IDS_Y : [['0001', '0002']] });
1821
done();
1922
});
2023
});
2124

2225
it('should extract the values from the xml if the last element matches', function(done) {
23-
var str = '<ucd><repertoire><char cp="0000" IDS="N"></char><char cp="0001" IDS="Y"></char><char cp="0002" IDS="Y"></char><char cp="0003" IDS="Y"></char></repertoire></ucd>';
24-
extractValues(StringStream(str), {'IDS': 'Y'}, function(values) {
26+
var str = '<ucd><repertoire><char cp="0000" IDS="N"></char><char cp="0001" IDS="Y"></char>' +
27+
'<char cp="0002" IDS="Y"></char><char cp="0003" IDS="Y"></char></repertoire></ucd>';
28+
extractValues(stringStream(str), {'IDS': 'Y'}, function(values) {
2529
expect(values).toEqual({ IDS_Y : [['0001', '0003']] });
2630
done();
2731
});
2832
});
2933

3034
it('should support `reserved`', function(done) {
31-
var str = '<ucd><repertoire><char cp="0000" IDS="N"></char><char cp="0001" IDS="Y"></char><reserved first-cp="0002" last-cp="0005" IDS="N"></reserved><char cp="0006" IDS="Y"></char></repertoire></ucd>';
32-
extractValues(StringStream(str), {'IDS': 'Y'}, function(values) {
35+
var str = '<ucd><repertoire><char cp="0000" IDS="N"></char><char cp="0001" IDS="Y"></char>' +
36+
'<reserved first-cp="0002" last-cp="0005" IDS="N"></reserved><char cp="0006" IDS="Y"></char></repertoire></ucd>';
37+
extractValues(stringStream(str), {'IDS': 'Y'}, function(values) {
3338
expect(values).toEqual({ IDS_Y : [['0001', '0001'], ['0006', '0006']] });
3439
done();
3540
});
3641
});
3742

3843
it('should support `surrogate`', function(done) {
39-
var str = '<ucd><repertoire><char cp="0000" IDS="N"></char><char cp="0001" IDS="Y"></char><surrogate first-cp="0002" last-cp="0005" IDS="N"></surrogate><char cp="0006" IDS="Y"></char></repertoire></ucd>';
40-
extractValues(StringStream(str), {'IDS': 'Y'}, function(values) {
44+
var str = '<ucd><repertoire><char cp="0000" IDS="N"></char><char cp="0001" IDS="Y"></char>' +
45+
'<surrogate first-cp="0002" last-cp="0005" IDS="N"></surrogate><char cp="0006" IDS="Y"></char></repertoire></ucd>';
46+
extractValues(stringStream(str), {'IDS': 'Y'}, function(values) {
4147
expect(values).toEqual({ IDS_Y : [['0001', '0001'], ['0006', '0006']] });
4248
done();
4349
});
4450
});
4551

4652
it('should support `noncharactere`', function(done) {
47-
var str = '<ucd><repertoire><char cp="0000" IDS="N"></char><char cp="0001" IDS="Y"></char><noncharacter first-cp="0002" last-cp="0005" IDS="N"></noncharacter><char cp="0006" IDS="Y"></char></repertoire></ucd>';
48-
extractValues(StringStream(str), {'IDS': 'Y'}, function(values) {
53+
var str = '<ucd><repertoire><char cp="0000" IDS="N"></char><char cp="0001" IDS="Y"></char>' +
54+
'<noncharacter first-cp="0002" last-cp="0005" IDS="N"></noncharacter><char cp="0006" IDS="Y"></char></repertoire></ucd>';
55+
extractValues(stringStream(str), {'IDS': 'Y'}, function(values) {
4956
expect(values).toEqual({ IDS_Y : [['0001', '0001'], ['0006', '0006']] });
5057
done();
5158
});

‎i18n/ucd/spec/generateCodeSpec.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
var generateCodeModule = require('../src/generateCode.js');
32
var generateCode = generateCodeModule.generateCode;
43
var generateFunction = generateCodeModule.generateFunction;

‎i18n/ucd/src/extract.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
"use strict";
1+
'use strict';
22

33
var fs = require('fs');
44
var zlib = require('zlib');
55
var extractValues = require('./extractValues').extractValues;
66
var generateCode = require('./generateCode').generateCode;
7-
var generateextractValues = require('./extractValues').extractValues;
87
// ID_Start and ID_Continue
98
var propertiesToExtract = {'IDS': 'Y', 'IDC': 'Y'};
109

@@ -17,7 +16,7 @@ function main() {
1716
function writeFile(validRanges) {
1817
var code = generateCode(validRanges);
1918
try {
20-
var stats = fs.lstatSync('../src/ngParseExt');
19+
fs.lstatSync('../src/ngParseExt');
2120
} catch (e) {
2221
fs.mkdirSync('../src/ngParseExt');
2322
}

‎i18n/ucd/src/extractValues.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ function extractValues(stream, propertiesToExtract, callback) {
5050

5151
function doCallback() {
5252
for (var i in keys) {
53-
property = keys[i] + '_' + keyValues[i];
53+
var property = keys[i] + '_' + keyValues[i];
5454
invalidProperty(property);
5555
}
5656
callback(validRanges);

0 commit comments

Comments
 (0)