From 0981b6dc5bca358f9f12ede6105748b865e38061 Mon Sep 17 00:00:00 2001 From: Krist Wongsuphasawat Date: Wed, 24 Oct 2018 15:17:09 -0700 Subject: [PATCH] Merge pull request #13 from apache-superset/kristw--translator-lint Fix lint issues in translation module --- .../packages/superset-ui-translation/package.json | 2 +- .../packages/superset-ui-translation/src/Translator.js | 3 ++- .../superset-ui-translation/src/TranslatorSingleton.js | 4 +++- .../superset-ui-translation/test/Translator.test.js | 8 +++++--- .../superset-ui-translation/test/languagePacks/zh.json | 2 +- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-translation/package.json b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-translation/package.json index b226ac77551e..711e984fa2cb 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-translation/package.json +++ b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-translation/package.json @@ -15,7 +15,7 @@ "build": "yarn run build:cjs && yarn run build:esm", "dev": "beemo babel --watch ./src --out-dir esm/ --esm", "jest": "beemo jest --color --coverage", - "eslint": "beemo eslint \"./{src,test}/**/*.{js,jsx,json,md}\"", + "eslint": "beemo eslint \"./{src,test}/**/*.{js,jsx,md}\"", "lint": "yarn run prettier && yarn run eslint", "lint:fix": "yarn run prettier --write && yarn run eslint --fix", "test": "yarn run jest", diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-translation/src/Translator.js b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-translation/src/Translator.js index fca12d9826b7..e197d4b34090 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-translation/src/Translator.js +++ b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-translation/src/Translator.js @@ -24,6 +24,7 @@ export default class Translator { return input; } const text = this.i18n.gettext(input); - return (args.length > 0) ? sprintf(text, ...args) : text; + + return args.length > 0 ? sprintf(text, ...args) : text; } } diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-translation/src/TranslatorSingleton.js b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-translation/src/TranslatorSingleton.js index 74b73052c562..aaa0ed068281 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-translation/src/TranslatorSingleton.js +++ b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-translation/src/TranslatorSingleton.js @@ -4,13 +4,15 @@ let singleton; function configure(config) { singleton = new Translator(config); + return singleton; -}; +} function getInstance() { if (!singleton) { throw new Error('You must call configure(...) before calling other methods'); } + return singleton; } diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-translation/test/Translator.test.js b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-translation/test/Translator.test.js index 2866050d9a6a..6373a821fc60 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-translation/test/Translator.test.js +++ b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-translation/test/Translator.test.js @@ -13,9 +13,11 @@ describe('Translator', () => { expect(new Translator({})).toBeInstanceOf(Translator); }); it('initializes when config is specified', () => { - expect(new Translator({ - languagePack: languagePackZh, - })).toBeInstanceOf(Translator); + expect( + new Translator({ + languagePack: languagePackZh, + }), + ).toBeInstanceOf(Translator); }); }); describe('.translate(input, ...args)', () => { diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-translation/test/languagePacks/zh.json b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-translation/test/languagePacks/zh.json index 575078e2e638..6baace9cca4a 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-translation/test/languagePacks/zh.json +++ b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-translation/test/languagePacks/zh.json @@ -11,4 +11,4 @@ "Copy of %s": ["%s 的副本"] } } -} \ No newline at end of file +}