From 6044407c14c922bc1b02204cadc55c7cc4e5c51b Mon Sep 17 00:00:00 2001 From: Laurence de Villers Date: Fri, 1 Jan 2021 18:38:18 -0500 Subject: [PATCH 1/3] trying to make it work --- images/logo-monochrome0.svg | 1 - index.html | 3 + package-lock.json | 161 +++++++++++++++++ package.json | 3 + src/pages/home-page.html | 227 ------------------------ src/pages/home-page.ts | 50 +++++- src/pages/speakers-page.html | 328 ----------------------------------- src/pages/team-page.html | 177 ------------------- src/utils/functions.ts | 15 ++ 9 files changed, 229 insertions(+), 736 deletions(-) delete mode 100644 images/logo-monochrome0.svg delete mode 100644 src/pages/home-page.html delete mode 100644 src/pages/speakers-page.html delete mode 100644 src/pages/team-page.html diff --git a/images/logo-monochrome0.svg b/images/logo-monochrome0.svg deleted file mode 100644 index dec1373b2c..0000000000 --- a/images/logo-monochrome0.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/index.html b/index.html index 0d3cba8ab4..b6e5e4cc16 100644 --- a/index.html +++ b/index.html @@ -105,6 +105,9 @@ + + + - - diff --git a/src/pages/home-page.ts b/src/pages/home-page.ts index bc8748e7a2..ecf38b7bf2 100644 --- a/src/pages/home-page.ts +++ b/src/pages/home-page.ts @@ -1,6 +1,10 @@ import { customElement, property } from '@polymer/decorators'; import '@polymer/iron-icon'; import { html, PolymerElement } from '@polymer/polymer'; +import {AppLocalizeBehavior} from '@polymer/app-localize-behavior/app-localize-behavior.js'; +import {mixinBehaviors} from '@polymer/polymer/lib/legacy/class.js'; + + import '../components/about-block'; import '../elements/about-organizer-block'; import '../elements/featured-videos'; @@ -18,9 +22,11 @@ import { toggleVideoDialog } from '../store/ui/actions'; import { Viewport } from '../store/ui/types'; import { TempAny } from '../temp-any'; import { scrollToY } from '../utils/scrolling'; +import { getUserLanguage } from '../utils/functions'; -@customElement('home-page') -export class HomePage extends ReduxMixin(PolymerElement) { +// export class HomePage extends ReduxMixin(mixinBehaviors([AppLocalizeBehavior], PolymerElement)) { + +export class HomePage extends ReduxMixin(mixinBehaviors([AppLocalizeBehavior], PolymerElement)) { static get template() { return html` - - - - - - - - -
{$ heroSettings.speakers.title $}
-

{$ heroSettings.speakers.description $}

- - - - - - -
- -
- - - - - - - - diff --git a/src/pages/team-page.html b/src/pages/team-page.html deleted file mode 100644 index 993ed45fc2..0000000000 --- a/src/pages/team-page.html +++ /dev/null @@ -1,177 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/src/utils/functions.ts b/src/utils/functions.ts index 7c389a8601..6224f7bfb6 100644 --- a/src/utils/functions.ts +++ b/src/utils/functions.ts @@ -60,3 +60,18 @@ export const toggleQueryParam = (currentQueryParams: string | null, key: string, : currentKeyValuePairs.concat(keyValue); return resultArray.join('&'); }; + +export const getUserLanguage = () => { + var lang = window.navigator.languages ? window.navigator.languages[0] : null; + lang = lang || window.navigator.language || window.navigator['browserLanguage'] || window.navigator['userLanguage']; + if (lang.indexOf('-') !== -1) { + lang = lang.split('-')[0]; + } + if (lang.indexOf('_') !== -1) { + lang = lang.split('_')[0]; + } + if (lang != 'fr' && lang != 'en') { + lang = 'en'; + } + return lang; +} From 925e9a33ed628f7119f06d0754819dfc44267fcc Mon Sep 17 00:00:00 2001 From: Laurence de Villers Date: Fri, 1 Jan 2021 20:02:53 -0500 Subject: [PATCH 2/3] fix build for Windows --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dee87b4f72..ccfc189c83 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "install:functions": "npm --prefix ./functions ci", "postinstall": "npm run install:functions && npm run install:emulator", "serve": "npm run build && firebase serve", - "start": "NODE_ENV=development npm run watch", + "start": "NODE_ENV=development & npm run watch", "start:emulators": "firebase emulators:start", "test": "jest", "watch": "concurrently --kill-others npm:watch:*", From a8dce51832944d796264271e921a0c8a1fa0012d Mon Sep 17 00:00:00 2001 From: Laurence de Villers Date: Fri, 1 Jan 2021 18:38:18 -0500 Subject: [PATCH 3/3] trying to make it work --- images/logo-monochrome0.svg | 1 - index.html | 3 + package-lock.json | 161 +++++++++++++++++ package.json | 3 + src/pages/home-page.html | 227 ------------------------ src/pages/home-page.ts | 50 +++++- src/pages/speakers-page.html | 328 ----------------------------------- src/pages/team-page.html | 177 ------------------- src/utils/functions.ts | 15 ++ 9 files changed, 229 insertions(+), 736 deletions(-) delete mode 100644 images/logo-monochrome0.svg delete mode 100644 src/pages/home-page.html delete mode 100644 src/pages/speakers-page.html delete mode 100644 src/pages/team-page.html diff --git a/images/logo-monochrome0.svg b/images/logo-monochrome0.svg deleted file mode 100644 index dec1373b2c..0000000000 --- a/images/logo-monochrome0.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/index.html b/index.html index 0d3cba8ab4..b6e5e4cc16 100644 --- a/index.html +++ b/index.html @@ -105,6 +105,9 @@ + + + - - diff --git a/src/pages/home-page.ts b/src/pages/home-page.ts index bc8748e7a2..ecf38b7bf2 100644 --- a/src/pages/home-page.ts +++ b/src/pages/home-page.ts @@ -1,6 +1,10 @@ import { customElement, property } from '@polymer/decorators'; import '@polymer/iron-icon'; import { html, PolymerElement } from '@polymer/polymer'; +import {AppLocalizeBehavior} from '@polymer/app-localize-behavior/app-localize-behavior.js'; +import {mixinBehaviors} from '@polymer/polymer/lib/legacy/class.js'; + + import '../components/about-block'; import '../elements/about-organizer-block'; import '../elements/featured-videos'; @@ -18,9 +22,11 @@ import { toggleVideoDialog } from '../store/ui/actions'; import { Viewport } from '../store/ui/types'; import { TempAny } from '../temp-any'; import { scrollToY } from '../utils/scrolling'; +import { getUserLanguage } from '../utils/functions'; -@customElement('home-page') -export class HomePage extends ReduxMixin(PolymerElement) { +// export class HomePage extends ReduxMixin(mixinBehaviors([AppLocalizeBehavior], PolymerElement)) { + +export class HomePage extends ReduxMixin(mixinBehaviors([AppLocalizeBehavior], PolymerElement)) { static get template() { return html` - - - - - - - - -
{$ heroSettings.speakers.title $}
-

{$ heroSettings.speakers.description $}

- - - - - - -
- -
- - - - - - - - diff --git a/src/pages/team-page.html b/src/pages/team-page.html deleted file mode 100644 index 993ed45fc2..0000000000 --- a/src/pages/team-page.html +++ /dev/null @@ -1,177 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/src/utils/functions.ts b/src/utils/functions.ts index 7c389a8601..6224f7bfb6 100644 --- a/src/utils/functions.ts +++ b/src/utils/functions.ts @@ -60,3 +60,18 @@ export const toggleQueryParam = (currentQueryParams: string | null, key: string, : currentKeyValuePairs.concat(keyValue); return resultArray.join('&'); }; + +export const getUserLanguage = () => { + var lang = window.navigator.languages ? window.navigator.languages[0] : null; + lang = lang || window.navigator.language || window.navigator['browserLanguage'] || window.navigator['userLanguage']; + if (lang.indexOf('-') !== -1) { + lang = lang.split('-')[0]; + } + if (lang.indexOf('_') !== -1) { + lang = lang.split('_')[0]; + } + if (lang != 'fr' && lang != 'en') { + lang = 'en'; + } + return lang; +}