diff --git a/docs/config.md b/docs/config.md index 2f3a5031b1..6a2a59fc5a 100644 --- a/docs/config.md +++ b/docs/config.md @@ -54,8 +54,8 @@ One of the following options **must** be supplied: being optional. If both `default_server_config` and `default_server_name` are used, Element will try to look up the connection -infomation using `.well-known`, and if that fails, take `default_server_config` as the homeserver connection -infomation. +information using `.well-known`, and if that fails, take `default_server_config` as the homeserver connection +information. ## Labs flags diff --git a/docs/e2ee.md b/docs/e2ee.md index d0d62ac092..1229f55f38 100644 --- a/docs/e2ee.md +++ b/docs/e2ee.md @@ -36,7 +36,7 @@ When `force_disable` is true: - any `io.element.e2ee.default` value will be disregarded. Note: If the server is configured to forcibly enable encryption for some or all rooms, -this behaviour will be overriden. +this behaviour will be overridden. # Secure backup diff --git a/docs/labs.md b/docs/labs.md index 84430ac50d..34738e4e8e 100644 --- a/docs/labs.md +++ b/docs/labs.md @@ -128,7 +128,7 @@ Enables rendering of MD / HTML in room topics. Configures Element to use a new cryptography implementation based on the [matrix-rust-sdk](https://github.com/matrix-org/matrix-rust-sdk). -This setting is (currently) _sticky_ to a user's session: it only takes effect when the user logs in to a new session. Likewise, even after disabling the setting in `config.json`, the Rust implemention will remain in use until users log out. +This setting is (currently) _sticky_ to a user's session: it only takes effect when the user logs in to a new session. Likewise, even after disabling the setting in `config.json`, the Rust implementation will remain in use until users log out. ## New room header & details (`feature_new_room_decoration_ui`) [In Development] diff --git a/docs/translating-dev.md b/docs/translating-dev.md index 39f83f4888..847054600c 100644 --- a/docs/translating-dev.md +++ b/docs/translating-dev.md @@ -70,7 +70,7 @@ There you can also require all translations to be redone if the meaning of the s 1. Add it to the array in `_t` for example `_t(TKEY, {variable: this.variable})` 1. Add the variable inside the string. The syntax for variables is `%(variable)s`. Please note the _s_ at the end. The name of the variable has to match the previous used name. -- You can use the special `count` variable to choose between multiple versions of the same string, in order to get the correct pluralization. E.g. `_t('You have %(count)s new messages', { count: 2 })` would show 'You have 2 new messages', while `_t('You have %(count)s new messages', { count: 1 })` would show 'You have one new message' (assuming a singular version of the string has been added to the translation file. See above). Passing in `count` is much prefered over having an if-statement choose the correct string to use, because some languages have much more complicated plural rules than english (e.g. they might need a completely different form if there are three things rather than two). +- You can use the special `count` variable to choose between multiple versions of the same string, in order to get the correct pluralization. E.g. `_t('You have %(count)s new messages', { count: 2 })` would show 'You have 2 new messages', while `_t('You have %(count)s new messages', { count: 1 })` would show 'You have one new message' (assuming a singular version of the string has been added to the translation file. See above). Passing in `count` is much preferred over having an if-statement choose the correct string to use, because some languages have much more complicated plural rules than english (e.g. they might need a completely different form if there are three things rather than two). - If you want to translate text that includes e.g. hyperlinks or other HTML you have to also use tag substitution, e.g. `_t('Click here!', {}, { 'a': (sub) => {sub} })`. If you don't do the tag substitution you will end up showing literally '' rather than making a hyperlink. - You can also use React components with normal variable substitution if you want to insert HTML markup, e.g. `_t('Your email address is %(emailAddress)s', { emailAddress: {userEmailAddress} })`.