From fb4630207d86d39ea05dd679b2724be87597c518 Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Thu, 23 Feb 2017 17:50:56 -0300 Subject: [#907] Moves i18n and util files to common directory with @thaissiqueira --- web-ui/src/common/app.js | 2 +- web-ui/src/common/i18n.js | 40 ++++++++++++++++++++++++++++++++++++ web-ui/src/common/util.js | 8 ++++++++ web-ui/src/i18n.js | 40 ------------------------------------ web-ui/src/login/login.js | 2 +- web-ui/src/util.js | 8 -------- web-ui/test/unit/common/util.spec.js | 20 ++++++++++++++++++ web-ui/test/unit/util.spec.js | 20 ------------------ 8 files changed, 70 insertions(+), 70 deletions(-) create mode 100644 web-ui/src/common/i18n.js create mode 100644 web-ui/src/common/util.js delete mode 100644 web-ui/src/i18n.js delete mode 100644 web-ui/src/util.js create mode 100644 web-ui/test/unit/common/util.spec.js delete mode 100644 web-ui/test/unit/util.spec.js (limited to 'web-ui') diff --git a/web-ui/src/common/app.js b/web-ui/src/common/app.js index f6594557..03a69fc9 100644 --- a/web-ui/src/common/app.js +++ b/web-ui/src/common/app.js @@ -18,7 +18,7 @@ import React from 'react'; import { I18nextProvider } from 'react-i18next'; -import internationalization from '../i18n'; +import internationalization from 'src/common/i18n'; const App = ({ i18n = internationalization, child }) => ( diff --git a/web-ui/src/common/i18n.js b/web-ui/src/common/i18n.js new file mode 100644 index 00000000..db107dc7 --- /dev/null +++ b/web-ui/src/common/i18n.js @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2017 ThoughtWorks, Inc. + * + * Pixelated is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Pixelated is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with Pixelated. If not, see . + */ +import i18n from 'i18next'; +import i18nBackend from 'i18nextXHRBackend'; +import I18nDetector from 'i18nextBrowserLanguageDetector'; + +const detector = new I18nDetector(); +const detect = detector.detect.bind(detector); + +detector.detect = (detectionOrder) => { + const result = detect(detectionOrder); + return result.replace('-', '_'); +}; + +i18n + .use(i18nBackend) + .use(detector) + .init({ + fallbackLng: 'en_US', + parseMissingKeyHandler: key => (`"${key} untranslated"`), + backend: { + loadPath: 'public/locales/{{lng}}/{{ns}}.json' + } + }); + +export default i18n; diff --git a/web-ui/src/common/util.js b/web-ui/src/common/util.js new file mode 100644 index 00000000..effb3d9c --- /dev/null +++ b/web-ui/src/common/util.js @@ -0,0 +1,8 @@ +export const hasQueryParameter = (param) => { + const decodedUri = decodeURIComponent(window.location.search.substring(1)); + return !(decodedUri.split('&').indexOf(param) < 0); +}; + +export default { + hasQueryParameter +}; diff --git a/web-ui/src/i18n.js b/web-ui/src/i18n.js deleted file mode 100644 index db107dc7..00000000 --- a/web-ui/src/i18n.js +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2017 ThoughtWorks, Inc. - * - * Pixelated is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Pixelated is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Pixelated. If not, see . - */ -import i18n from 'i18next'; -import i18nBackend from 'i18nextXHRBackend'; -import I18nDetector from 'i18nextBrowserLanguageDetector'; - -const detector = new I18nDetector(); -const detect = detector.detect.bind(detector); - -detector.detect = (detectionOrder) => { - const result = detect(detectionOrder); - return result.replace('-', '_'); -}; - -i18n - .use(i18nBackend) - .use(detector) - .init({ - fallbackLng: 'en_US', - parseMissingKeyHandler: key => (`"${key} untranslated"`), - backend: { - loadPath: 'public/locales/{{lng}}/{{ns}}.json' - } - }); - -export default i18n; diff --git a/web-ui/src/login/login.js b/web-ui/src/login/login.js index c8e08762..39500b9d 100644 --- a/web-ui/src/login/login.js +++ b/web-ui/src/login/login.js @@ -19,9 +19,9 @@ import React from 'react'; import { render } from 'react-dom'; import a11y from 'react-a11y'; +import { hasQueryParameter } from 'src/common/util'; import App from 'src/common/app'; import PageWrapper from './page'; -import { hasQueryParameter } from '../util'; if (process.env.NODE_ENV === 'development') a11y(React); diff --git a/web-ui/src/util.js b/web-ui/src/util.js deleted file mode 100644 index effb3d9c..00000000 --- a/web-ui/src/util.js +++ /dev/null @@ -1,8 +0,0 @@ -export const hasQueryParameter = (param) => { - const decodedUri = decodeURIComponent(window.location.search.substring(1)); - return !(decodedUri.split('&').indexOf(param) < 0); -}; - -export default { - hasQueryParameter -}; diff --git a/web-ui/test/unit/common/util.spec.js b/web-ui/test/unit/common/util.spec.js new file mode 100644 index 00000000..805d9dd5 --- /dev/null +++ b/web-ui/test/unit/common/util.spec.js @@ -0,0 +1,20 @@ +import expect from 'expect'; +import Util from 'src/common/util'; + +describe('Utils', () => { + describe('.hasQueryParameter', () => { + global.window = { + location: { + search: '?auth-error&lng=pt-BR' + } + }; + + it('checks if param included in query parameters', () => { + expect(Util.hasQueryParameter('auth-error')).toBe(true); + }); + + it('checks if param not included in query parameters', () => { + expect(Util.hasQueryParameter('error')).toBe(false); + }); + }); +}); diff --git a/web-ui/test/unit/util.spec.js b/web-ui/test/unit/util.spec.js deleted file mode 100644 index 968b2d83..00000000 --- a/web-ui/test/unit/util.spec.js +++ /dev/null @@ -1,20 +0,0 @@ -import expect from 'expect'; -import Util from 'src/util'; - -describe('Utils', () => { - describe('.hasQueryParameter', () => { - global.window = { - location: { - search: '?auth-error&lng=pt-BR' - } - }; - - it('checks if param included in query parameters', () => { - expect(Util.hasQueryParameter('auth-error')).toBe(true); - }); - - it('checks if param not included in query parameters', () => { - expect(Util.hasQueryParameter('error')).toBe(false); - }); - }); -}); -- cgit v1.2.3