+<<<<<<< HEAD
_t("Welcome to Tchap")
_t("Decentralised, encrypted chat & collaboration powered by [matrix]")
+======= +_t("Welcome to Element")
+ +_t("Decentralised, encrypted chat & collaboration powered by $matrixLogo")
+>>>>>>> v1.10.14
diff --git a/res/welcome/images/matrix.svg b/res/welcome/images/matrix.svg
deleted file mode 100644
index 13adcab25..000000000
--- a/res/welcome/images/matrix.svg
+++ /dev/null
@@ -1,153 +0,0 @@
-
-
-
-
diff --git a/scripts/copy-res.js b/scripts/copy-res.js
index 1452500aa..2cc307c2d 100755
--- a/scripts/copy-res.js
+++ b/scripts/copy-res.js
@@ -13,7 +13,48 @@ const loaderUtils = require("loader-utils");
const INCLUDE_LANGS = [
{'value': 'en_EN', 'label': 'English'},
{'value': 'en_US', 'label': 'English (US)'},
+<<<<<<< HEAD
{'value': 'fr', 'label': 'Français'}
+=======
+ {'value': 'eo', 'label': 'Esperanto'},
+ {'value': 'es', 'label': 'Español'},
+ {'value': 'et', 'label': 'Eesti'},
+ {'value': 'eu', 'label': 'Euskara'},
+ {'value': 'fi', 'label': 'Suomi'},
+ {'value': 'fr', 'label': 'Français'},
+ {'value': 'gl', 'label': 'Galego'},
+ {'value': 'he', 'label': 'עברית'},
+ {'value': 'hi', 'label': 'हिन्दी'},
+ {'value': 'hu', 'label': 'Magyar'},
+ {'value': 'id', 'label': 'Bahasa Indonesia'},
+ {'value': 'is', 'label': 'íslenska'},
+ {'value': 'it', 'label': 'Italiano'},
+ {'value': 'ja', 'label': '日本語'},
+ {'value': 'kab', 'label': 'Taqbaylit'},
+ {'value': 'ko', 'label': '한국어'},
+ {'value': 'lo', 'label': 'ລາວ'},
+ {'value': 'lt', 'label': 'Lietuvių'},
+ {'value': 'lv', 'label': 'Latviešu'},
+ {'value': 'nb_NO', 'label': 'Norwegian Bokmål'},
+ {'value': 'nl', 'label': 'Nederlands'},
+ {'value': 'nn', 'label': 'Norsk Nynorsk'},
+ {'value': 'pl', 'label': 'Polski'},
+ {'value': 'pt', 'label': 'Português'},
+ {'value': 'pt_BR', 'label': 'Português do Brasil'},
+ {'value': 'ru', 'label': 'Русский'},
+ {'value': 'sk', 'label': 'Slovenčina'},
+ {'value': 'sq', 'label': 'Shqip'},
+ {'value': 'sr', 'label': 'српски'},
+ {'value': 'sv', 'label': 'Svenska'},
+ {'value': 'te', 'label': 'తెలుగు'},
+ {'value': 'th', 'label': 'ไทย'},
+ {'value': 'tr', 'label': 'Türkçe'},
+ {'value': 'uk', 'label': 'українська мова'},
+ {'value': 'vi', 'label': 'Tiếng Việt'},
+ {'value': 'vls', 'label': 'West-Vlaams'},
+ {'value': 'zh_Hans', 'label': '简体中文'}, // simplified chinese
+ {'value': 'zh_Hant', 'label': '繁體中文'}, // traditional chinese
+>>>>>>> master
];
// cpx includes globbed parts of the filename in the destination, but excludes
@@ -192,8 +233,14 @@ function weblateToCounterpart(inTrs) {
if (keyParts.length === 2) {
let obj = outTrs[keyParts[0]];
if (obj === undefined) {
- obj = {};
- outTrs[keyParts[0]] = obj;
+ obj = outTrs[keyParts[0]] = {};
+ } else if (typeof obj === "string") {
+ // This is a transitional edge case if a string went from singular to pluralised and both still remain
+ // in the translation json file. Use the singular translation as `other` and merge pluralisation atop.
+ obj = outTrs[keyParts[0]] = {
+ "other": inTrs[key],
+ };
+ console.warn("Found entry in i18n file in both singular and pluralised form", keyParts[0]);
}
obj[keyParts[1]] = inTrs[key];
} else {
diff --git a/scripts/docker-link-repos.sh b/scripts/docker-link-repos.sh
index 54c89baca..cf824d87a 100644
--- a/scripts/docker-link-repos.sh
+++ b/scripts/docker-link-repos.sh
@@ -32,7 +32,6 @@ cd react-sdk
yarn link
yarn link matrix-js-sdk
yarn --network-timeout=100000 install
-yarn reskindex
cd ../
echo "Setting up element-web with react-sdk and js-sdk packages"
diff --git a/scripts/fetch-develop.deps.sh b/scripts/fetch-develop.deps.sh
index 65159d1a1..71850188a 100755
--- a/scripts/fetch-develop.deps.sh
+++ b/scripts/fetch-develop.deps.sh
@@ -92,16 +92,8 @@ pushd matrix-react-sdk
yarn link
yarn link matrix-js-sdk
yarn install --pure-lockfile
-yarn reskindex
popd
yarn link matrix-react-sdk
##############################
-
-# Link the reskindex binary in place: if we used `yarn link`,
-# Yarn would do this for us, but we don't because we'd have
-# to define the Yarn binary prefix somewhere so it could put the
-# intermediate symlinks there. Instead, we do it ourselves.
-mkdir -p node_modules/.bin
-ln -sfv ../matrix-react-sdk/scripts/reskindex.js node_modules/.bin/reskindex
diff --git a/scripts/get-version-from-git.sh b/scripts/get-version-from-git.sh
index f3abdcb7c..eb9729c78 100755
--- a/scripts/get-version-from-git.sh
+++ b/scripts/get-version-from-git.sh
@@ -4,7 +4,7 @@
# these dependencies are git checkouts.
# Since the deps are fetched from git, we can rev-parse
-REACT_SHA=$(cd node_modules/matrix-react-sdk; git rev-parse --short=12 HEAD)
-JSSDK_SHA=$(cd node_modules/matrix-js-sdk; git rev-parse --short=12 HEAD)
+REACT_SHA=$(git -C node_modules/matrix-react-sdk rev-parse --short=12 HEAD)
+JSSDK_SHA=$(git -C node_modules/matrix-js-sdk rev-parse --short=12 HEAD)
VECTOR_SHA=$(git rev-parse --short=12 HEAD) # use the ACTUAL SHA rather than assume develop
echo $VECTOR_SHA-react-$REACT_SHA-js-$JSSDK_SHA
diff --git a/scripts/layered.sh b/scripts/layered.sh
new file mode 100755
index 000000000..3650d21aa
--- /dev/null
+++ b/scripts/layered.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+set -x
+
+# Creates a layered environment with the full repo for the app and SDKs cloned
+# and linked. This gives an element-web dev environment ready to build with
+# matching branches of react-sdk's dependencies so that changes can be tested
+# in element-web.
+
+# Note that this style is different from the recommended developer setup: this
+# file nests js-sdk and matrix-react-sdk inside element-web, while the local
+# development setup places them all at the same level. We are nesting them here
+# because some CI systems do not allow moving to a directory above the checkout
+# for the primary repo (element-web in this case).
+
+# Install dependencies, as we'll be using fetchdep.sh from matrix-react-sdk
+yarn install --pure-lockfile
+
+# Pass appropriate repo to fetchdep.sh
+export PR_ORG=vector-im
+export PR_REPO=element-web
+
+# Set up the js-sdk first
+node_modules/matrix-react-sdk/scripts/fetchdep.sh matrix-org matrix-js-sdk
+pushd matrix-js-sdk
+yarn link
+yarn install --pure-lockfile
+popd
+
+# Also set up matrix-analytics-events so we get the latest from
+# the main branch or a branch with matching name
+node_modules/matrix-react-sdk/scripts/fetchdep.sh matrix-org matrix-analytics-events main
+pushd matrix-analytics-events
+yarn link
+yarn install --pure-lockfile
+popd
+
+# Now set up the react-sdk
+node_modules/matrix-react-sdk/scripts/fetchdep.sh matrix-org matrix-react-sdk
+pushd matrix-react-sdk
+yarn link
+yarn link matrix-js-sdk
+yarn link matrix-analytics-events
+yarn install --pure-lockfile
+popd
+
+# Link the layers into element-web
+yarn link matrix-js-sdk
+yarn link matrix-react-sdk
diff --git a/scripts/yarn-sub.js b/scripts/yarn-sub.js
deleted file mode 100644
index 817ad33c9..000000000
--- a/scripts/yarn-sub.js
+++ /dev/null
@@ -1,22 +0,0 @@
-const path = require('path');
-const child_process = require('child_process');
-
-const moduleName = process.argv[2];
-if (!moduleName) {
- console.error("Expected module name");
- process.exit(1);
-}
-
-const argString = process.argv.length > 3 ? process.argv.slice(3).join(" ") : "";
-if (!argString) {
- console.error("Expected an yarn argument string to use");
- process.exit(1);
-}
-
-const modulePath = path.dirname(require.resolve(`${moduleName}/package.json`));
-
-child_process.execSync("yarn " + argString, {
- env: process.env,
- cwd: modulePath,
- stdio: ['inherit', 'inherit', 'inherit'],
-});
diff --git a/sonar-project.properties b/sonar-project.properties
new file mode 100644
index 000000000..669f26bab
--- /dev/null
+++ b/sonar-project.properties
@@ -0,0 +1,14 @@
+sonar.projectKey=element-web
+sonar.organization=new_vector_ltd_organization
+
+# Encoding of the source code. Default is default system encoding
+#sonar.sourceEncoding=UTF-8
+
+sonar.sources=src,res
+sonar.tests=test
+sonar.exclusions=__mocks__,docs,element.io,nginx
+
+sonar.typescript.tsconfigPath=./tsconfig.json
+sonar.javascript.lcov.reportPaths=coverage/lcov.info
+sonar.coverage.exclusions=test/**/*,res/**/*
+sonar.testExecutionReportPaths=coverage/test-report.xml
diff --git a/src/components/structures/VectorEmbeddedPage.tsx b/src/components/structures/VectorEmbeddedPage.tsx
deleted file mode 100644
index 85adb2fb3..000000000
--- a/src/components/structures/VectorEmbeddedPage.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2016 OpenMarket Ltd
-Copyright 2017 Vector Creations Ltd
-Copyright 2019 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import EmbeddedPage from 'matrix-react-sdk/src/components/structures/EmbeddedPage';
-import sanitizeHtml from 'sanitize-html';
-import { _t } from 'matrix-react-sdk/src/languageHandler';
-
-export default class VectorEmbeddedPage extends EmbeddedPage {
- static replaces = 'EmbeddedPage';
-
- // we're overriding the base component here, for Element-specific tweaks
- translate(s: string) {
- s = sanitizeHtml(_t(s));
- // ugly fix for https://github.com/vector-im/element-web/issues/4243
- // eslint-disable-next-line max-len
- s = s.replace(/\[matrix\]/, '
');
- return s;
- }
-}
diff --git a/src/components/views/auth/VectorAuthFooter.tsx b/src/components/views/auth/VectorAuthFooter.tsx
index 0cdfdc0a2..87557ab4b 100644
--- a/src/components/views/auth/VectorAuthFooter.tsx
+++ b/src/components/views/auth/VectorAuthFooter.tsx
@@ -44,6 +44,4 @@ const VectorAuthFooter = () => {
);
};
-VectorAuthFooter.replaces = 'AuthFooter';
-
export default VectorAuthFooter;
diff --git a/src/components/views/auth/VectorAuthHeaderLogo.tsx b/src/components/views/auth/VectorAuthHeaderLogo.tsx
index deaf9cc23..d44e3e5a7 100644
--- a/src/components/views/auth/VectorAuthHeaderLogo.tsx
+++ b/src/components/views/auth/VectorAuthHeaderLogo.tsx
@@ -19,9 +19,7 @@ import React from 'react';
import SdkConfig from 'matrix-react-sdk/src/SdkConfig';
export default class VectorAuthHeaderLogo extends React.PureComponent {
- static replaces = 'AuthHeaderLogo';
-
- render() {
+ public render() {
const brandingConfig = SdkConfig.getObject("branding");
const logoUrl = brandingConfig?.get("auth_header_logo_url") ?? "themes/element/img/logos/element-logo.svg";
diff --git a/src/components/views/auth/VectorAuthPage.tsx b/src/components/views/auth/VectorAuthPage.tsx
index d37739a03..d2e6d9f8d 100644
--- a/src/components/views/auth/VectorAuthPage.tsx
+++ b/src/components/views/auth/VectorAuthPage.tsx
@@ -15,16 +15,15 @@ limitations under the License.
*/
import React, { CSSProperties } from 'react';
-import * as sdk from 'matrix-react-sdk/src/index';
import SdkConfig from 'matrix-react-sdk/src/SdkConfig';
-export default class VectorAuthPage extends React.PureComponent {
- static replaces = 'AuthPage';
+import VectorAuthFooter from "./VectorAuthFooter";
- static welcomeBackgroundUrl;
+export default class VectorAuthPage extends React.PureComponent {
+ private static welcomeBackgroundUrl;
// cache the url as a static to prevent it changing without refreshing
- static getWelcomeBackgroundUrl() {
+ private static getWelcomeBackgroundUrl() {
if (VectorAuthPage.welcomeBackgroundUrl) return VectorAuthPage.welcomeBackgroundUrl;
const brandingConfig = SdkConfig.getObject("branding");
@@ -43,9 +42,7 @@ export default class VectorAuthPage extends React.PureComponent {
return VectorAuthPage.welcomeBackgroundUrl;
}
- render() {
- const AuthFooter = sdk.getComponent('auth.AuthFooter');
-
+ public render() {
const pageStyle = {
background: `center/cover fixed url(${VectorAuthPage.getWelcomeBackgroundUrl()})`,
};
@@ -80,7 +77,7 @@ export default class VectorAuthPage extends React.PureComponent {
{ this.props.children }
');
- return s;
- }
-}
diff --git a/src/components/views/auth/VectorAuthFooter.tsx b/src/components/views/auth/VectorAuthFooter.tsx
index 0cdfdc0a2..87557ab4b 100644
--- a/src/components/views/auth/VectorAuthFooter.tsx
+++ b/src/components/views/auth/VectorAuthFooter.tsx
@@ -44,6 +44,4 @@ const VectorAuthFooter = () => {
);
};
-VectorAuthFooter.replaces = 'AuthFooter';
-
export default VectorAuthFooter;
diff --git a/src/components/views/auth/VectorAuthHeaderLogo.tsx b/src/components/views/auth/VectorAuthHeaderLogo.tsx
index deaf9cc23..d44e3e5a7 100644
--- a/src/components/views/auth/VectorAuthHeaderLogo.tsx
+++ b/src/components/views/auth/VectorAuthHeaderLogo.tsx
@@ -19,9 +19,7 @@ import React from 'react';
import SdkConfig from 'matrix-react-sdk/src/SdkConfig';
export default class VectorAuthHeaderLogo extends React.PureComponent {
- static replaces = 'AuthHeaderLogo';
-
- render() {
+ public render() {
const brandingConfig = SdkConfig.getObject("branding");
const logoUrl = brandingConfig?.get("auth_header_logo_url") ?? "themes/element/img/logos/element-logo.svg";
diff --git a/src/components/views/auth/VectorAuthPage.tsx b/src/components/views/auth/VectorAuthPage.tsx
index d37739a03..d2e6d9f8d 100644
--- a/src/components/views/auth/VectorAuthPage.tsx
+++ b/src/components/views/auth/VectorAuthPage.tsx
@@ -15,16 +15,15 @@ limitations under the License.
*/
import React, { CSSProperties } from 'react';
-import * as sdk from 'matrix-react-sdk/src/index';
import SdkConfig from 'matrix-react-sdk/src/SdkConfig';
-export default class VectorAuthPage extends React.PureComponent {
- static replaces = 'AuthPage';
+import VectorAuthFooter from "./VectorAuthFooter";
- static welcomeBackgroundUrl;
+export default class VectorAuthPage extends React.PureComponent {
+ private static welcomeBackgroundUrl;
// cache the url as a static to prevent it changing without refreshing
- static getWelcomeBackgroundUrl() {
+ private static getWelcomeBackgroundUrl() {
if (VectorAuthPage.welcomeBackgroundUrl) return VectorAuthPage.welcomeBackgroundUrl;
const brandingConfig = SdkConfig.getObject("branding");
@@ -43,9 +42,7 @@ export default class VectorAuthPage extends React.PureComponent {
return VectorAuthPage.welcomeBackgroundUrl;
}
- render() {
- const AuthFooter = sdk.getComponent('auth.AuthFooter');
-
+ public render() {
const pageStyle = {
background: `center/cover fixed url(${VectorAuthPage.getWelcomeBackgroundUrl()})`,
};
@@ -80,7 +77,7 @@ export default class VectorAuthPage extends React.PureComponent {
{ this.props.children }
+
-
-
+
-
+
diff --git a/src/vector/mobile_guide/index.ts b/src/vector/mobile_guide/index.ts
index 52349975f..334f75890 100644
--- a/src/vector/mobile_guide/index.ts
+++ b/src/vector/mobile_guide/index.ts
@@ -17,7 +17,7 @@ function renderConfigError(message: string): void {
const toHide = document.getElementsByClassName("mx_HomePage_container");
const errorContainers = document.getElementsByClassName(
"mx_HomePage_errorContainer",
- ) as HTMLCollectionOf
-
-
-
-
- Set up Element on iOS or Android
-
+
+
+
-
+
-
+
+
+
+
+
+ Set up Element on iOS or Android
+
-
-
-
-
-
+
+
+