mirror of
https://github.com/element-hq/element-web
synced 2024-10-24 03:35:50 +03:00
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/notifications0
This commit is contained in:
Michael Telatynski
commit
edd09f66d1
142 changed files with 4631 additions and 1005 deletions
190
CHANGELOG.md
190
CHANGELOG.md
|
|
@ -1,3 +1,193 @@
|
|||
Changes in [2.8.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.8.0) (2020-06-23)
|
||||
===================================================================================================
|
||||
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.8.0-rc.1...v2.8.0)
|
||||
|
||||
* Upgrade to JS SDK 7.0.0
|
||||
* Update read receipt remainder for internal font size change
|
||||
[\#4807](https://github.com/matrix-org/matrix-react-sdk/pull/4807)
|
||||
* Revert "Use recovery keys over passphrases"
|
||||
[\#4793](https://github.com/matrix-org/matrix-react-sdk/pull/4793)
|
||||
|
||||
Changes in [2.8.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.8.0-rc.1) (2020-06-17)
|
||||
=============================================================================================================
|
||||
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.7.2...v2.8.0-rc.1)
|
||||
|
||||
* Upgrade to JS SDK 7.0.0-rc.1
|
||||
* Fix Styled Checkbox and Radio Button disabled state
|
||||
[\#4778](https://github.com/matrix-org/matrix-react-sdk/pull/4778)
|
||||
* clean up and fix the isMasterRuleEnabled logic
|
||||
[\#4782](https://github.com/matrix-org/matrix-react-sdk/pull/4782)
|
||||
* Fix case-sensitivity of /me to match rest of slash commands
|
||||
[\#4763](https://github.com/matrix-org/matrix-react-sdk/pull/4763)
|
||||
* Add a 'show less' button to the new room list
|
||||
[\#4765](https://github.com/matrix-org/matrix-react-sdk/pull/4765)
|
||||
* Update from Weblate
|
||||
[\#4781](https://github.com/matrix-org/matrix-react-sdk/pull/4781)
|
||||
* Sticky and collapsing headers for new room list
|
||||
[\#4758](https://github.com/matrix-org/matrix-react-sdk/pull/4758)
|
||||
* Make the room list labs setting reload on change
|
||||
[\#4780](https://github.com/matrix-org/matrix-react-sdk/pull/4780)
|
||||
* Handle/hide old rooms in the room list
|
||||
[\#4767](https://github.com/matrix-org/matrix-react-sdk/pull/4767)
|
||||
* Add some media queries to improve UI on mobile (#3991)
|
||||
[\#4656](https://github.com/matrix-org/matrix-react-sdk/pull/4656)
|
||||
* Match fuzzy filtering a bit more reliably in the new room list
|
||||
[\#4769](https://github.com/matrix-org/matrix-react-sdk/pull/4769)
|
||||
* Improve Field ts definitions some more
|
||||
[\#4777](https://github.com/matrix-org/matrix-react-sdk/pull/4777)
|
||||
* Fix alignment of checkboxes in new room list's context menu
|
||||
[\#4776](https://github.com/matrix-org/matrix-react-sdk/pull/4776)
|
||||
* Fix Field ts def, fix LocalEchoWrapper and NotificationsEnabledController
|
||||
[\#4775](https://github.com/matrix-org/matrix-react-sdk/pull/4775)
|
||||
* Add presence indicators and globes to new room list
|
||||
[\#4774](https://github.com/matrix-org/matrix-react-sdk/pull/4774)
|
||||
* Include the sticky room when filtering in the new room list
|
||||
[\#4772](https://github.com/matrix-org/matrix-react-sdk/pull/4772)
|
||||
* Add a home button to the new room list menu when available
|
||||
[\#4771](https://github.com/matrix-org/matrix-react-sdk/pull/4771)
|
||||
* use group layout for search results
|
||||
[\#4764](https://github.com/matrix-org/matrix-react-sdk/pull/4764)
|
||||
* Fix m.id.phone spec compliance
|
||||
[\#4757](https://github.com/matrix-org/matrix-react-sdk/pull/4757)
|
||||
* User Info default power levels for ban/kick/redact to 50 as per spec
|
||||
[\#4759](https://github.com/matrix-org/matrix-react-sdk/pull/4759)
|
||||
* Match new room list's text search to old room list
|
||||
[\#4768](https://github.com/matrix-org/matrix-react-sdk/pull/4768)
|
||||
* Fix ordering of recent rooms in the new room list
|
||||
[\#4766](https://github.com/matrix-org/matrix-react-sdk/pull/4766)
|
||||
* Change theme selector to use new styled radio buttons
|
||||
[\#4731](https://github.com/matrix-org/matrix-react-sdk/pull/4731)
|
||||
* Use recovery keys over passphrases
|
||||
[\#4686](https://github.com/matrix-org/matrix-react-sdk/pull/4686)
|
||||
* Update from Weblate
|
||||
[\#4760](https://github.com/matrix-org/matrix-react-sdk/pull/4760)
|
||||
* Initial dark theme support for new room list
|
||||
[\#4756](https://github.com/matrix-org/matrix-react-sdk/pull/4756)
|
||||
* Support per-list options and algorithms on the new room list
|
||||
[\#4754](https://github.com/matrix-org/matrix-react-sdk/pull/4754)
|
||||
* Send read marker updates immediately after moving visually
|
||||
[\#4755](https://github.com/matrix-org/matrix-react-sdk/pull/4755)
|
||||
* Add a minimized view to the new room list
|
||||
[\#4753](https://github.com/matrix-org/matrix-react-sdk/pull/4753)
|
||||
* Fix e2e icon alignment in irc-layout
|
||||
[\#4752](https://github.com/matrix-org/matrix-react-sdk/pull/4752)
|
||||
* Add some resource leak protection to new room list badges
|
||||
[\#4750](https://github.com/matrix-org/matrix-react-sdk/pull/4750)
|
||||
* Fix read-receipt alignment
|
||||
[\#4747](https://github.com/matrix-org/matrix-react-sdk/pull/4747)
|
||||
* Show message previews on the new room list tiles
|
||||
[\#4751](https://github.com/matrix-org/matrix-react-sdk/pull/4751)
|
||||
* Fix various layout concerns with the new room list
|
||||
[\#4749](https://github.com/matrix-org/matrix-react-sdk/pull/4749)
|
||||
* Prioritize text on the clipboard over file
|
||||
[\#4748](https://github.com/matrix-org/matrix-react-sdk/pull/4748)
|
||||
* Move Settings flag to ts
|
||||
[\#4729](https://github.com/matrix-org/matrix-react-sdk/pull/4729)
|
||||
* Add a context menu to rooms in the new room list
|
||||
[\#4743](https://github.com/matrix-org/matrix-react-sdk/pull/4743)
|
||||
* Add hover states and basic context menu to new room list
|
||||
[\#4742](https://github.com/matrix-org/matrix-react-sdk/pull/4742)
|
||||
* Update resize handle for new designs in new room list
|
||||
[\#4741](https://github.com/matrix-org/matrix-react-sdk/pull/4741)
|
||||
* Improve general stability in the new room list
|
||||
[\#4740](https://github.com/matrix-org/matrix-react-sdk/pull/4740)
|
||||
* Reimplement breadcrumbs for new room list
|
||||
[\#4735](https://github.com/matrix-org/matrix-react-sdk/pull/4735)
|
||||
* Add styled radio buttons
|
||||
[\#4744](https://github.com/matrix-org/matrix-react-sdk/pull/4744)
|
||||
* Hide checkbox tick on dark backgrounds
|
||||
[\#4730](https://github.com/matrix-org/matrix-react-sdk/pull/4730)
|
||||
* Make checkboxes a11y friendly
|
||||
[\#4746](https://github.com/matrix-org/matrix-react-sdk/pull/4746)
|
||||
* EventIndex: Store and restore the encryption info for encrypted events.
|
||||
[\#4738](https://github.com/matrix-org/matrix-react-sdk/pull/4738)
|
||||
* Use IDestroyable instead of IDisposable
|
||||
[\#4739](https://github.com/matrix-org/matrix-react-sdk/pull/4739)
|
||||
* Add/improve badge counts in new room list
|
||||
[\#4734](https://github.com/matrix-org/matrix-react-sdk/pull/4734)
|
||||
* Convert FormattingUtils to TypeScript and add badge utility function
|
||||
[\#4732](https://github.com/matrix-org/matrix-react-sdk/pull/4732)
|
||||
* Add filtering and exploring to the new room list
|
||||
[\#4736](https://github.com/matrix-org/matrix-react-sdk/pull/4736)
|
||||
* Support prioritized room list filters
|
||||
[\#4737](https://github.com/matrix-org/matrix-react-sdk/pull/4737)
|
||||
* Clean up font scaling appearance
|
||||
[\#4733](https://github.com/matrix-org/matrix-react-sdk/pull/4733)
|
||||
* Add user menu to new room list
|
||||
[\#4722](https://github.com/matrix-org/matrix-react-sdk/pull/4722)
|
||||
* New room list basic styling and layout
|
||||
[\#4711](https://github.com/matrix-org/matrix-react-sdk/pull/4711)
|
||||
* Fix read receipt overlap
|
||||
[\#4727](https://github.com/matrix-org/matrix-react-sdk/pull/4727)
|
||||
* Load correct default font size
|
||||
[\#4726](https://github.com/matrix-org/matrix-react-sdk/pull/4726)
|
||||
* send state of lowBandwidth in rageshakes
|
||||
[\#4724](https://github.com/matrix-org/matrix-react-sdk/pull/4724)
|
||||
* Change internal font size from from 15 to 10
|
||||
[\#4725](https://github.com/matrix-org/matrix-react-sdk/pull/4725)
|
||||
* Upgrade deps
|
||||
[\#4723](https://github.com/matrix-org/matrix-react-sdk/pull/4723)
|
||||
* Ensure active Jitsi conference is closed on widget pop-out
|
||||
[\#4444](https://github.com/matrix-org/matrix-react-sdk/pull/4444)
|
||||
* Introduce sticky rooms to the new room list
|
||||
[\#4720](https://github.com/matrix-org/matrix-react-sdk/pull/4720)
|
||||
* Handle remaining cases for room updates in new room list
|
||||
[\#4721](https://github.com/matrix-org/matrix-react-sdk/pull/4721)
|
||||
* Allow searching the emoji picker using other emoji
|
||||
[\#4719](https://github.com/matrix-org/matrix-react-sdk/pull/4719)
|
||||
* New room list scrolling and resizing
|
||||
[\#4697](https://github.com/matrix-org/matrix-react-sdk/pull/4697)
|
||||
* Don't show FormatBar if composer is empty
|
||||
[\#4696](https://github.com/matrix-org/matrix-react-sdk/pull/4696)
|
||||
* Split the left panel into new and old for new room list designs
|
||||
[\#4687](https://github.com/matrix-org/matrix-react-sdk/pull/4687)
|
||||
* Fix compact layout regression
|
||||
[\#4712](https://github.com/matrix-org/matrix-react-sdk/pull/4712)
|
||||
* fix emoji in safari
|
||||
[\#4710](https://github.com/matrix-org/matrix-react-sdk/pull/4710)
|
||||
* Fix not being able to dismiss new login toasts
|
||||
[\#4709](https://github.com/matrix-org/matrix-react-sdk/pull/4709)
|
||||
* Fix exceptions from Tooltip
|
||||
[\#4708](https://github.com/matrix-org/matrix-react-sdk/pull/4708)
|
||||
* Stop removing variation selector from quick reactions
|
||||
[\#4707](https://github.com/matrix-org/matrix-react-sdk/pull/4707)
|
||||
* Tidy up continuation algorithm and make it work for hidden profile changes
|
||||
[\#4704](https://github.com/matrix-org/matrix-react-sdk/pull/4704)
|
||||
* Profile settings should never show a disambiguated display name
|
||||
[\#4699](https://github.com/matrix-org/matrix-react-sdk/pull/4699)
|
||||
* Prevent (double) 4S bootstrap from RestoreKeyBackupDialog
|
||||
[\#4701](https://github.com/matrix-org/matrix-react-sdk/pull/4701)
|
||||
* Stop checkbox styling bleeding through room address selector
|
||||
[\#4691](https://github.com/matrix-org/matrix-react-sdk/pull/4691)
|
||||
* Center HeaderButtons
|
||||
[\#4695](https://github.com/matrix-org/matrix-react-sdk/pull/4695)
|
||||
* Add .well-known option to control default e2ee behaviour
|
||||
[\#4605](https://github.com/matrix-org/matrix-react-sdk/pull/4605)
|
||||
* Add max-width to right and left panels
|
||||
[\#4692](https://github.com/matrix-org/matrix-react-sdk/pull/4692)
|
||||
* Fix login loop where the sso flow returns to `#/login`
|
||||
[\#4685](https://github.com/matrix-org/matrix-react-sdk/pull/4685)
|
||||
* Don't clear MAU toasts when a successful sync comes in
|
||||
[\#4690](https://github.com/matrix-org/matrix-react-sdk/pull/4690)
|
||||
* Add initial filtering support to new room list
|
||||
[\#4681](https://github.com/matrix-org/matrix-react-sdk/pull/4681)
|
||||
* Bubble up a decline-to-render of verification events to outside wrapper
|
||||
[\#4664](https://github.com/matrix-org/matrix-react-sdk/pull/4664)
|
||||
* upgrade to twemoji 13.0.0
|
||||
[\#4672](https://github.com/matrix-org/matrix-react-sdk/pull/4672)
|
||||
* Apply FocusLock to ImageView to capture Escape handling
|
||||
[\#4666](https://github.com/matrix-org/matrix-react-sdk/pull/4666)
|
||||
* Fix the 'complete security' screen
|
||||
[\#4689](https://github.com/matrix-org/matrix-react-sdk/pull/4689)
|
||||
* add null-guard for Autocomplete containerRef
|
||||
[\#4688](https://github.com/matrix-org/matrix-react-sdk/pull/4688)
|
||||
* Remove legacy codepaths for Unknown Device Error (UDE/UDD) handling
|
||||
[\#4660](https://github.com/matrix-org/matrix-react-sdk/pull/4660)
|
||||
* Remove feature_cross_signing
|
||||
[\#4655](https://github.com/matrix-org/matrix-react-sdk/pull/4655)
|
||||
* Autocomplete: use scrollIntoView for auto-scroll to fix it
|
||||
[\#4670](https://github.com/matrix-org/matrix-react-sdk/pull/4670)
|
||||
|
||||
Changes in [2.7.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.7.2) (2020-06-16)
|
||||
===================================================================================================
|
||||
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.7.1...v2.7.2)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "matrix-react-sdk",
|
||||
"version": "2.7.2",
|
||||
"version": "2.8.0",
|
||||
"description": "SDK for matrix.org using React",
|
||||
"author": "matrix.org",
|
||||
"repository": {
|
||||
|
|
|
|||
|
|
@ -189,6 +189,7 @@
|
|||
@import "./views/rooms/_RoomSublist2.scss";
|
||||
@import "./views/rooms/_RoomTile.scss";
|
||||
@import "./views/rooms/_RoomTile2.scss";
|
||||
@import "./views/rooms/_RoomTileIcon.scss";
|
||||
@import "./views/rooms/_RoomUpgradeWarningBar.scss";
|
||||
@import "./views/rooms/_SearchBar.scss";
|
||||
@import "./views/rooms/_SendMessageComposer.scss";
|
||||
|
|
|
|||
|
|
@ -65,6 +65,10 @@ $tagPanelWidth: 70px; // only applies in this file, used for calculations
|
|||
.mx_LeftPanel2_userAvatarContainer {
|
||||
position: relative; // to make default avatars work
|
||||
margin-right: 8px;
|
||||
|
||||
.mx_LeftPanel2_userAvatar {
|
||||
border-radius: 32px; // should match avatar size
|
||||
}
|
||||
}
|
||||
|
||||
.mx_LeftPanel2_userName {
|
||||
|
|
@ -72,6 +76,11 @@ $tagPanelWidth: 70px; // only applies in this file, used for calculations
|
|||
font-size: $font-15px;
|
||||
line-height: $font-20px;
|
||||
flex: 1;
|
||||
|
||||
// Ellipsize any text overflow
|
||||
text-overflow: ellipsis;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.mx_LeftPanel2_headerButtons {
|
||||
|
|
@ -131,6 +140,7 @@ $tagPanelWidth: 70px; // only applies in this file, used for calculations
|
|||
overflow-y: auto;
|
||||
width: 100%;
|
||||
max-width: 100%;
|
||||
position: relative; // for sticky headers
|
||||
|
||||
// Create a flexbox to trick the layout engine
|
||||
display: flex;
|
||||
|
|
|
|||
|
|
@ -15,7 +15,26 @@ limitations under the License.
|
|||
*/
|
||||
|
||||
.mx_UserMenuButton {
|
||||
// No special styles on the button itself
|
||||
> span {
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
position: relative;
|
||||
display: block;
|
||||
|
||||
&::before {
|
||||
content: '';
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
mask-position: center;
|
||||
mask-size: contain;
|
||||
mask-repeat: no-repeat;
|
||||
background: $primary-fg-color;
|
||||
mask-image: url('$(res)/img/feather-customised/more-horizontal.svg');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.mx_UserMenuButton_contextMenu {
|
||||
|
|
@ -35,9 +54,6 @@ limitations under the License.
|
|||
// Create another flexbox of columns to handle large user IDs
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
// fit the container
|
||||
flex: 1;
|
||||
width: calc(100% - 40px); // 40px = 32px theme button + 8px margin to theme button
|
||||
|
||||
* {
|
||||
|
|
@ -79,4 +95,49 @@ limitations under the License.
|
|||
justify-content: center;
|
||||
}
|
||||
}
|
||||
|
||||
.mx_IconizedContextMenu_icon {
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
display: block;
|
||||
|
||||
&::before {
|
||||
content: '';
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
display: block;
|
||||
mask-position: center;
|
||||
mask-size: contain;
|
||||
mask-repeat: no-repeat;
|
||||
background: $primary-fg-color;
|
||||
}
|
||||
}
|
||||
|
||||
.mx_UserMenuButton_iconHome::before {
|
||||
mask-image: url('$(res)/img/feather-customised/home.svg');
|
||||
}
|
||||
|
||||
.mx_UserMenuButton_iconBell::before {
|
||||
mask-image: url('$(res)/img/feather-customised/notifications.svg');
|
||||
}
|
||||
|
||||
.mx_UserMenuButton_iconLock::before {
|
||||
mask-image: url('$(res)/img/feather-customised/lock.svg');
|
||||
}
|
||||
|
||||
.mx_UserMenuButton_iconSettings::before {
|
||||
mask-image: url('$(res)/img/feather-customised/settings.svg');
|
||||
}
|
||||
|
||||
.mx_UserMenuButton_iconArchive::before {
|
||||
mask-image: url('$(res)/img/feather-customised/archive.svg');
|
||||
}
|
||||
|
||||
.mx_UserMenuButton_iconMessage::before {
|
||||
mask-image: url('$(res)/img/feather-customised/message-circle.svg');
|
||||
}
|
||||
|
||||
.mx_UserMenuButton_iconSignOut::before {
|
||||
mask-image: url('$(res)/img/feather-customised/sign-out.svg');
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -98,7 +98,3 @@ limitations under the License.
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
.mx_CompleteSecurity_resetText {
|
||||
padding-top: 20px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -146,3 +146,12 @@ limitations under the License.
|
|||
.mx_AuthBody_spinner {
|
||||
margin: 1em 0;
|
||||
}
|
||||
|
||||
@media only screen and (max-width: 480px) {
|
||||
.mx_AuthBody {
|
||||
border-radius: 4px;
|
||||
width: auto;
|
||||
max-width: 500px;
|
||||
padding: 10px;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,3 +21,9 @@ limitations under the License.
|
|||
padding: 25px 40px;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
@media only screen and (max-width: 480px) {
|
||||
.mx_AuthHeader {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,3 +23,9 @@ limitations under the License.
|
|||
.mx_AuthHeaderLogo img {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
@media only screen and (max-width: 480px) {
|
||||
.mx_AuthHeaderLogo {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,3 +29,9 @@ limitations under the License.
|
|||
box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.33);
|
||||
background-color: $authpage-modal-bg-color;
|
||||
}
|
||||
|
||||
@media only screen and (max-width: 480px) {
|
||||
.mx_AuthPage_modal {
|
||||
margin-top: 0;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -73,42 +73,33 @@ limitations under the License.
|
|||
margin-left: 20px;
|
||||
}
|
||||
|
||||
.mx_CreateSecretStorageDialog_recoveryKeyHeader {
|
||||
margin-bottom: 1em;
|
||||
}
|
||||
|
||||
.mx_CreateSecretStorageDialog_recoveryKeyContainer {
|
||||
width: 380px;
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
display: flex;
|
||||
}
|
||||
|
||||
.mx_CreateSecretStorageDialog_recoveryKey {
|
||||
font-weight: bold;
|
||||
text-align: center;
|
||||
width: 262px;
|
||||
padding: 20px;
|
||||
color: $info-plinth-fg-color;
|
||||
background-color: $info-plinth-bg-color;
|
||||
border-radius: 6px;
|
||||
word-spacing: 1em;
|
||||
margin-bottom: 20px;
|
||||
margin-right: 12px;
|
||||
}
|
||||
|
||||
.mx_CreateSecretStorageDialog_recoveryKeyButtons {
|
||||
flex: 1;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.mx_CreateSecretStorageDialog_recoveryKeyButtons .mx_AccessibleButton {
|
||||
width: 160px;
|
||||
padding-left: 0px;
|
||||
padding-right: 0px;
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
||||
.mx_CreateSecretStorageDialog_recoveryKeyButtons button {
|
||||
flex: 1;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.mx_CreateSecretStorageDialog_continueSpinner {
|
||||
margin-top: 33px;
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
.mx_CreateSecretStorageDialog_continueSpinner img {
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -354,6 +354,11 @@ limitations under the License.
|
|||
opacity: 1;
|
||||
}
|
||||
|
||||
.mx_EventTile_e2eIcon_unauthenticated {
|
||||
background-image: url('$(res)/img/e2e/normal.svg');
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
.mx_EventTile_e2eIcon_hidden {
|
||||
display: none;
|
||||
}
|
||||
|
|
@ -572,3 +577,14 @@ limitations under the License.
|
|||
margin-left: 1em;
|
||||
}
|
||||
}
|
||||
|
||||
@media only screen and (max-width: 480px) {
|
||||
.mx_EventTile_line, .mx_EventTile_reply {
|
||||
padding-left: 0;
|
||||
margin-right: 0;
|
||||
}
|
||||
.mx_EventTile_content {
|
||||
margin-top: 10px;
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -121,11 +121,6 @@ $irc-line-height: $font-18px;
|
|||
}
|
||||
}
|
||||
|
||||
.mx_EvenTile_line .mx_MessageActionBar,
|
||||
.mx_EvenTile_line .mx_ReplyThread_wrapper {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.mx_EventTile_reply {
|
||||
order: 4;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -267,3 +267,12 @@ limitations under the License.
|
|||
.mx_RoomHeader_pinsIndicatorUnread {
|
||||
background-color: $pinned-unread-color;
|
||||
}
|
||||
|
||||
@media only screen and (max-width: 480px) {
|
||||
.mx_RoomHeader_wrapper {
|
||||
padding: 0;
|
||||
}
|
||||
.mx_RoomHeader {
|
||||
overflow: hidden;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,17 +22,68 @@ limitations under the License.
|
|||
flex-direction: column;
|
||||
|
||||
margin-left: 8px;
|
||||
margin-top: 12px;
|
||||
margin-bottom: 12px;
|
||||
width: 100%;
|
||||
|
||||
&:first-child {
|
||||
margin-top: 12px; // so we're not up against the search/filter
|
||||
}
|
||||
|
||||
.mx_RoomSublist2_headerContainer {
|
||||
// Create a flexbox to make ordering easy
|
||||
// Create a flexbox to make alignment easy
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
// ***************************
|
||||
// Sticky Headers Start
|
||||
|
||||
// Ideally we'd be able to use `position: sticky; top: 0; bottom: 0;` on the
|
||||
// headerContainer, however due to our layout concerns we actually have to
|
||||
// calculate it manually so we can sticky things in the right places. We also
|
||||
// target the headerText instead of the container to reduce jumps when scrolling,
|
||||
// and to help hide the badges/other buttons that could appear on hover. This
|
||||
// all works by ensuring the header text has a fixed height when sticky so the
|
||||
// fixed height of the container can maintain the scroll position.
|
||||
|
||||
// The combined height must be set in the LeftPanel2 component for sticky headers
|
||||
// to work correctly.
|
||||
padding-bottom: 8px;
|
||||
height: 24px;
|
||||
|
||||
.mx_RoomSublist2_stickable {
|
||||
flex: 1;
|
||||
max-width: 100%;
|
||||
z-index: 2; // Prioritize headers in the visible list over sticky ones
|
||||
|
||||
// Set the same background color as the room list for sticky headers
|
||||
background-color: $roomlist2-bg-color;
|
||||
|
||||
// Create a flexbox to make ordering easy
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
// We use a generic sticky class for 2 reasons: to reduce style duplication and
|
||||
// to identify when a header is sticky. If we didn't have a consistent sticky class,
|
||||
// we'd have to do the "is sticky" checks again on click, as clicking the header
|
||||
// when sticky scrolls instead of collapses the list.
|
||||
&.mx_RoomSublist2_headerContainer_sticky {
|
||||
position: fixed;
|
||||
z-index: 1; // over top of other elements, but still under the ones in the visible list
|
||||
height: 32px; // to match the header container
|
||||
// width set by JS
|
||||
}
|
||||
|
||||
&.mx_RoomSublist2_headerContainer_stickyBottom {
|
||||
bottom: 0;
|
||||
}
|
||||
|
||||
// We don't have a top style because the top is dependent on the room list header's
|
||||
// height, and is therefore calculated in JS.
|
||||
// The class, mx_RoomSublist2_headerContainer_stickyTop, is applied though.
|
||||
}
|
||||
|
||||
// Sticky Headers End
|
||||
// ***************************
|
||||
|
||||
.mx_RoomSublist2_badgeContainer {
|
||||
opacity: 0.8;
|
||||
width: 16px;
|
||||
|
|
@ -76,18 +127,45 @@ limitations under the License.
|
|||
}
|
||||
|
||||
.mx_RoomSublist2_headerText {
|
||||
flex: 1;
|
||||
max-width: calc(100% - 16px); // 16px is the badge width
|
||||
text-transform: uppercase;
|
||||
opacity: 0.5;
|
||||
line-height: $font-16px;
|
||||
font-size: $font-12px;
|
||||
|
||||
flex: 1;
|
||||
max-width: calc(100% - 16px); // 16px is the badge width
|
||||
|
||||
// Ellipsize any text overflow
|
||||
text-overflow: ellipsis;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
|
||||
.mx_RoomSublist2_collapseBtn {
|
||||
display: inline-block;
|
||||
position: relative;
|
||||
|
||||
// Default hidden
|
||||
visibility: hidden;
|
||||
width: 0;
|
||||
height: 0;
|
||||
|
||||
&::before {
|
||||
content: '';
|
||||
width: 12px;
|
||||
height: 12px;
|
||||
position: absolute;
|
||||
top: 1px;
|
||||
left: 1px;
|
||||
mask-position: center;
|
||||
mask-size: contain;
|
||||
mask-repeat: no-repeat;
|
||||
background: $primary-fg-color;
|
||||
mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
|
||||
}
|
||||
|
||||
&.mx_RoomSublist2_collapseBtn_collapsed::before {
|
||||
mask-image: url('$(res)/img/feather-customised/chevron-right.svg');
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -100,7 +178,7 @@ limitations under the License.
|
|||
flex-direction: column;
|
||||
overflow: hidden;
|
||||
|
||||
.mx_RoomSublist2_showMoreButton {
|
||||
.mx_RoomSublist2_showNButton {
|
||||
cursor: pointer;
|
||||
font-size: $font-13px;
|
||||
line-height: $font-18px;
|
||||
|
|
@ -129,18 +207,25 @@ limitations under the License.
|
|||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
.mx_RoomSublist2_showMoreButtonChevron {
|
||||
.mx_RoomSublist2_showNButtonChevron {
|
||||
position: relative;
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
margin-left: 12px;
|
||||
margin-right: 18px;
|
||||
mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
|
||||
mask-position: center;
|
||||
mask-size: contain;
|
||||
mask-repeat: no-repeat;
|
||||
background: $roomtile2-preview-color;
|
||||
}
|
||||
|
||||
.mx_RoomSublist2_showMoreButtonChevron {
|
||||
mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
|
||||
}
|
||||
|
||||
.mx_RoomSublist2_showLessButtonChevron {
|
||||
mask-image: url('$(res)/img/feather-customised/chevron-up.svg');
|
||||
}
|
||||
}
|
||||
|
||||
// Class name comes from the ResizableBox component
|
||||
|
|
@ -201,6 +286,17 @@ limitations under the License.
|
|||
background-color: $roomlist2-button-bg-color;
|
||||
}
|
||||
}
|
||||
|
||||
.mx_RoomSublist2_headerContainer {
|
||||
.mx_RoomSublist2_headerText {
|
||||
.mx_RoomSublist2_collapseBtn {
|
||||
visibility: visible;
|
||||
width: 12px;
|
||||
height: 12px;
|
||||
margin-right: 4px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
&.mx_RoomSublist2_minimized {
|
||||
|
|
@ -210,18 +306,18 @@ limitations under the License.
|
|||
position: relative;
|
||||
|
||||
.mx_RoomSublist2_badgeContainer {
|
||||
order: 1;
|
||||
order: 0;
|
||||
align-self: flex-end;
|
||||
margin-right: 0;
|
||||
}
|
||||
|
||||
.mx_RoomSublist2_headerText {
|
||||
order: 2;
|
||||
.mx_RoomSublist2_stickable {
|
||||
order: 1;
|
||||
max-width: 100%;
|
||||
}
|
||||
|
||||
.mx_RoomSublist2_auxButton {
|
||||
order: 4;
|
||||
order: 2;
|
||||
visibility: visible;
|
||||
width: 32px !important; // !important to override hover styles
|
||||
height: 32px !important; // !important to override hover styles
|
||||
|
|
@ -239,10 +335,10 @@ limitations under the License.
|
|||
.mx_RoomSublist2_resizeBox {
|
||||
align-items: center;
|
||||
|
||||
.mx_RoomSublist2_showMoreButton {
|
||||
.mx_RoomSublist2_showNButton {
|
||||
flex-direction: column;
|
||||
|
||||
.mx_RoomSublist2_showMoreButtonChevron {
|
||||
.mx_RoomSublist2_showNButtonChevron {
|
||||
margin-right: 12px; // to center
|
||||
}
|
||||
}
|
||||
|
|
@ -320,8 +416,4 @@ limitations under the License.
|
|||
.mx_RadioButton, .mx_Checkbox {
|
||||
margin-top: 8px;
|
||||
}
|
||||
|
||||
.mx_Checkbox {
|
||||
margin-left: -8px; // to counteract the indent from the component
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,6 +32,13 @@ limitations under the License.
|
|||
|
||||
.mx_RoomTile2_avatarContainer {
|
||||
margin-right: 8px;
|
||||
position: relative;
|
||||
|
||||
.mx_RoomTileIcon {
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
right: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.mx_RoomTile2_nameContainer {
|
||||
|
|
@ -60,7 +67,7 @@ limitations under the License.
|
|||
}
|
||||
|
||||
.mx_RoomTile2_name.mx_RoomTile2_nameHasUnreadEvents {
|
||||
font-weight: 600;
|
||||
font-weight: 700;
|
||||
}
|
||||
|
||||
.mx_RoomTile2_messagePreview {
|
||||
|
|
|
|||
69
res/css/views/rooms/_RoomTileIcon.scss
Normal file
69
res/css/views/rooms/_RoomTileIcon.scss
Normal file
|
|
@ -0,0 +1,69 @@
|
|||
/*
|
||||
Copyright 2020 The Matrix.org Foundation C.I.C.
|
||||
|
||||
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.
|
||||
*/
|
||||
|
||||
.mx_RoomTileIcon {
|
||||
width: 12px;
|
||||
height: 12px;
|
||||
border-radius: 12px;
|
||||
background-color: $roomlist2-bg-color; // to match the room list itself
|
||||
}
|
||||
|
||||
.mx_RoomTileIcon_globe::before {
|
||||
content: '';
|
||||
width: 8px;
|
||||
height: 8px;
|
||||
top: 2px;
|
||||
left: 2px;
|
||||
position: absolute;
|
||||
mask-position: center;
|
||||
mask-size: contain;
|
||||
mask-repeat: no-repeat;
|
||||
background: $primary-fg-color;
|
||||
mask-image: url('$(res)/img/globe.svg');
|
||||
}
|
||||
|
||||
.mx_RoomTileIcon_offline::before {
|
||||
content: '';
|
||||
width: 8px;
|
||||
height: 8px;
|
||||
top: 2px;
|
||||
left: 2px;
|
||||
position: absolute;
|
||||
border-radius: 8px;
|
||||
background-color: $presence-offline;
|
||||
}
|
||||
|
||||
.mx_RoomTileIcon_online::before {
|
||||
content: '';
|
||||
width: 8px;
|
||||
height: 8px;
|
||||
top: 2px;
|
||||
left: 2px;
|
||||
position: absolute;
|
||||
border-radius: 8px;
|
||||
background-color: $presence-online;
|
||||
}
|
||||
|
||||
.mx_RoomTileIcon_away::before {
|
||||
content: '';
|
||||
width: 8px;
|
||||
height: 8px;
|
||||
top: 2px;
|
||||
left: 2px;
|
||||
position: absolute;
|
||||
border-radius: 8px;
|
||||
background-color: $presence-away;
|
||||
}
|
||||
|
|
@ -15,33 +15,58 @@ limitations under the License.
|
|||
*/
|
||||
|
||||
.mx_AppearanceUserSettingsTab_fontSlider,
|
||||
.mx_AppearanceUserSettingsTab_themeSection .mx_Field,
|
||||
.mx_AppearanceUserSettingsTab_fontScaling .mx_Field {
|
||||
.mx_AppearanceUserSettingsTab_fontSlider_preview,
|
||||
.mx_AppearanceUserSettingsTab_Layout {
|
||||
@mixin mx_Settings_fullWidthField;
|
||||
}
|
||||
|
||||
.mx_AppearanceUserSettingsTab .mx_Field {
|
||||
width: 256px;
|
||||
}
|
||||
|
||||
.mx_AppearanceUserSettingsTab_fontScaling {
|
||||
color: $primary-fg-color;
|
||||
}
|
||||
|
||||
.mx_AppearanceUserSettingsTab_fontSlider {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
padding: 15px;
|
||||
background: $font-slider-bg-color;
|
||||
background: rgba($appearance-tab-border-color, 0.2);
|
||||
border-radius: 10px;
|
||||
font-size: 10px;
|
||||
margin-top: 24px;
|
||||
margin-bottom: 24px;
|
||||
}
|
||||
|
||||
.mx_AppearanceUserSettingsTab_fontSlider_preview {
|
||||
border: 1px solid $appearance-tab-border-color;
|
||||
border-radius: 10px;
|
||||
padding: 0 16px 9px 16px;
|
||||
pointer-events: none;
|
||||
|
||||
.mx_EventTile_msgOption {
|
||||
display: none;
|
||||
}
|
||||
|
||||
&.mx_IRCLayout {
|
||||
padding-top: 9px;
|
||||
}
|
||||
}
|
||||
|
||||
.mx_AppearanceUserSettingsTab_fontSlider_smallText {
|
||||
font-size: 15px;
|
||||
padding-right: 20px;
|
||||
padding-left: 5px;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.mx_AppearanceUserSettingsTab_fontSlider_largeText {
|
||||
font-size: 18px;
|
||||
padding-left: 20px;
|
||||
padding-right: 5px;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.mx_AppearanceUserSettingsTab {
|
||||
|
|
@ -95,7 +120,8 @@ limitations under the License.
|
|||
}
|
||||
|
||||
&.mx_ThemeSelector_dark {
|
||||
background-color: #181b21;
|
||||
// 5% lightened version of 181b21
|
||||
background-color: #25282e;
|
||||
color: #f3f8fd;
|
||||
|
||||
> input > div {
|
||||
|
|
@ -124,3 +150,71 @@ limitations under the License.
|
|||
.mx_SettingsTab_customFontSizeField {
|
||||
margin-left: calc($font-16px + 10px);
|
||||
}
|
||||
|
||||
.mx_AppearanceUserSettingsTab_Layout_RadioButtons {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
|
||||
color: $primary-fg-color;
|
||||
|
||||
.mx_AppearanceUserSettingsTab_spacer {
|
||||
width: 24px;
|
||||
}
|
||||
|
||||
> .mx_AppearanceUserSettingsTab_Layout_RadioButton {
|
||||
flex-grow: 0;
|
||||
flex-shrink: 1;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
width: 300px;
|
||||
|
||||
border: 1px solid $appearance-tab-border-color;
|
||||
border-radius: 10px;
|
||||
|
||||
.mx_EventTile_msgOption,
|
||||
.mx_MessageActionBar {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.mx_AppearanceUserSettingsTab_Layout_RadioButton_preview {
|
||||
flex-grow: 1;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding: 10px;
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
.mx_RadioButton {
|
||||
flex-grow: 0;
|
||||
padding: 10px;
|
||||
}
|
||||
|
||||
.mx_EventTile_content {
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.mx_RadioButton {
|
||||
border-top: 1px solid $appearance-tab-border-color;
|
||||
|
||||
> input + div {
|
||||
border-color: rgba($muted-fg-color, 0.2);
|
||||
}
|
||||
}
|
||||
|
||||
.mx_RadioButton_checked {
|
||||
background-color: rgba($accent-color, 0.08);
|
||||
}
|
||||
}
|
||||
|
||||
.mx_AppearanceUserSettingsTab_Advanced {
|
||||
.mx_AppearanceUserSettingsTab_AdvancedToggle {
|
||||
color: $accent-color;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
|
||||
.mx_AppearanceUserSettingsTab_systemFont {
|
||||
margin-left: calc($font-16px + 10px);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
1
res/img/feather-customised/chevron-right.svg
Normal file
1
res/img/feather-customised/chevron-right.svg
Normal file
|
|
@ -0,0 +1 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-chevron-right"><polyline points="9 18 15 12 9 6"></polyline></svg>
|
||||
|
After Width: | Height: | Size: 270 B |
1
res/img/feather-customised/chevron-up.svg
Normal file
1
res/img/feather-customised/chevron-up.svg
Normal file
|
|
@ -0,0 +1 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-chevron-up"><polyline points="18 15 12 9 6 15"></polyline></svg>
|
||||
|
After Width: | Height: | Size: 268 B |
6
res/img/globe.svg
Normal file
6
res/img/globe.svg
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
<svg width="8" height="8" viewBox="0 0 8 8" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<g id="icon">
|
||||
<path id="sea" fill-rule="evenodd" clip-rule="evenodd" d="M4 8C6.20914 8 8 6.20914 8 4C8 1.79086 6.20914 0 4 0C1.79086 0 0 1.79086 0 4C0 6.20914 1.79086 8 4 8ZM4.6693 2.43613C4.8306 2.64728 4.94732 2.80007 4.45289 2.80007C4.14732 2.80007 3.84175 2.74171 3.58076 2.69186C3.15847 2.61121 2.85289 2.55285 2.85289 2.80007C2.85289 3.00007 3.65289 3.40007 4.45289 3.80007C5.25289 4.20007 6.05289 4.60007 6.05289 4.80007C6.05289 5.20007 6.05289 7.60007 5.25289 7.20007C4.45289 6.80007 2.45289 5.20007 2.45289 4.80007C2.45289 4.65277 2.18168 4.39698 1.85897 4.09263C1.30535 3.57051 0.600192 2.90547 0.852893 2.40007C1.25289 1.60007 2.85289 6.51479e-05 5.25289 0.800065C4.98623 1.06673 4.45289 1.68007 4.45289 2.00007C4.45289 2.15285 4.56961 2.30564 4.6693 2.43613Z" fill="#2E2F32"/>
|
||||
<path id="earth" d="M4.45294 2.80007C5.25294 2.80007 4.45294 2.40007 4.45294 2.00007C4.45294 1.68007 4.98627 1.06673 5.25294 0.800065C2.85294 6.51479e-05 1.25294 1.60007 0.852941 2.40007C0.452941 3.20007 2.45294 4.40007 2.45294 4.80007C2.45294 5.20007 4.45294 6.80007 5.25294 7.20007C6.05294 7.60007 6.05294 5.20007 6.05294 4.80007C6.05294 4.40007 2.85294 3.20007 2.85294 2.80007C2.85294 2.40007 3.65294 2.80007 4.45294 2.80007Z" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.3 KiB |
|
|
@ -198,8 +198,8 @@ $breadcrumb-placeholder-bg-color: #272c35;
|
|||
|
||||
$user-tile-hover-bg-color: $header-panel-bg-color;
|
||||
|
||||
// FontSlider colors
|
||||
$font-slider-bg-color: $room-highlight-color;
|
||||
// Appearance tab colors
|
||||
$appearance-tab-border-color: $room-highlight-color;
|
||||
|
||||
// ***** Mixins! *****
|
||||
|
||||
|
|
|
|||
|
|
@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
|
|||
limitations under the License.
|
||||
*/
|
||||
|
||||
$font-family: var(--font-family, $font-family);
|
||||
$monospace-font-family: var(--font-family-monospace, $monospace-font-family);
|
||||
//
|
||||
// --accent-color
|
||||
$accent-color: var(--accent-color);
|
||||
|
|
|
|||
|
|
@ -186,6 +186,10 @@ $roomtile2-preview-color: #9e9e9e;
|
|||
$roomtile2-default-badge-bg-color: #61708b;
|
||||
$roomtile2-selected-bg-color: #FFF;
|
||||
|
||||
$presence-online: $accent-color;
|
||||
$presence-away: orange; // TODO: Get color
|
||||
$presence-offline: #E3E8F0;
|
||||
|
||||
// ********************
|
||||
|
||||
$roomtile-name-color: #61708b;
|
||||
|
|
@ -323,7 +327,7 @@ $breadcrumb-placeholder-bg-color: #e8eef5;
|
|||
$user-tile-hover-bg-color: $header-panel-bg-color;
|
||||
|
||||
// FontSlider colors
|
||||
$font-slider-bg-color: rgba($input-darker-bg-color, 0.2);
|
||||
$appearance-tab-border-color: $input-darker-bg-color;
|
||||
|
||||
// ***** Mixins! *****
|
||||
|
||||
|
|
|
|||
|
|
@ -15,5 +15,5 @@ limitations under the License.
|
|||
*/
|
||||
|
||||
// Based on https://stackoverflow.com/a/53229857/3532235
|
||||
export type Without<T, U> = {[P in Exclude<keyof T, keyof U>] ? : never}
|
||||
export type Without<T, U> = {[P in Exclude<keyof T, keyof U>] ? : never};
|
||||
export type XOR<T, U> = (T | U) extends object ? (Without<T, U> & U) | (Without<U, T> & T) : T | U;
|
||||
|
|
|
|||
|
|
@ -150,7 +150,7 @@ export default abstract class BasePlatform {
|
|||
abstract displayNotification(title: string, msg: string, avatarUrl: string, room: Object);
|
||||
|
||||
loudNotification(ev: Event, room: Object) {
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a promise that resolves to a string representing the current version of the application.
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@ import {MatrixClientPeg} from './MatrixClientPeg';
|
|||
import { deriveKey } from 'matrix-js-sdk/src/crypto/key_passphrase';
|
||||
import { decodeRecoveryKey } from 'matrix-js-sdk/src/crypto/recoverykey';
|
||||
import { _t } from './languageHandler';
|
||||
import SettingsStore from './settings/SettingsStore';
|
||||
import {encodeBase64} from "matrix-js-sdk/src/crypto/olmlib";
|
||||
|
||||
// This stores the secret storage private keys in memory for the JS SDK. This is
|
||||
|
|
@ -30,14 +29,9 @@ import {encodeBase64} from "matrix-js-sdk/src/crypto/olmlib";
|
|||
// operation ends.
|
||||
let secretStorageKeys = {};
|
||||
let secretStorageBeingAccessed = false;
|
||||
// Stores the 'passphraseOnly' option for the active storage access operation
|
||||
let passphraseOnlyOption = null;
|
||||
|
||||
function isCachingAllowed() {
|
||||
return (
|
||||
secretStorageBeingAccessed ||
|
||||
SettingsStore.getValue("keepSecretStoragePassphraseForSession")
|
||||
);
|
||||
return secretStorageBeingAccessed;
|
||||
}
|
||||
|
||||
export class AccessCancelledError extends Error {
|
||||
|
|
@ -101,7 +95,6 @@ async function getSecretStorageKey({ keys: keyInfos }, ssssItemName) {
|
|||
const key = await inputToKey(input);
|
||||
return await MatrixClientPeg.get().checkSecretStorageKey(key, info);
|
||||
},
|
||||
passphraseOnly: passphraseOnlyOption,
|
||||
},
|
||||
/* className= */ null,
|
||||
/* isPriorityModal= */ false,
|
||||
|
|
@ -216,27 +209,19 @@ export async function promptForBackupPassphrase() {
|
|||
*
|
||||
* @param {Function} [func] An operation to perform once secret storage has been
|
||||
* bootstrapped. Optional.
|
||||
* @param {object} [opts] Named options
|
||||
* @param {bool} [opts.forceReset] Reset secret storage even if it's already set up
|
||||
* @param {object} [opts.withKeys] Map of key ID to key for SSSS keys that the client
|
||||
* already has available. If a key is not supplied here, the user will be prompted.
|
||||
* @param {bool} [opts.passphraseOnly] If true, do not prompt for recovery key or to reset keys
|
||||
* @param {bool} [forceReset] Reset secret storage even if it's already set up
|
||||
*/
|
||||
export async function accessSecretStorage(
|
||||
func = async () => { }, opts = {},
|
||||
) {
|
||||
export async function accessSecretStorage(func = async () => { }, forceReset = false) {
|
||||
const cli = MatrixClientPeg.get();
|
||||
secretStorageBeingAccessed = true;
|
||||
passphraseOnlyOption = opts.passphraseOnly;
|
||||
secretStorageKeys = Object.assign({}, opts.withKeys || {});
|
||||
try {
|
||||
if (!await cli.hasSecretStorageKey() || opts.forceReset) {
|
||||
if (!await cli.hasSecretStorageKey() || forceReset) {
|
||||
// This dialog calls bootstrap itself after guiding the user through
|
||||
// passphrase creation.
|
||||
const { finished } = Modal.createTrackedDialogAsync('Create Secret Storage dialog', '',
|
||||
import("./async-components/views/dialogs/secretstorage/CreateSecretStorageDialog"),
|
||||
{
|
||||
force: opts.forceReset,
|
||||
force: forceReset,
|
||||
},
|
||||
null, /* priority = */ false, /* static = */ true,
|
||||
);
|
||||
|
|
@ -274,6 +259,5 @@ export async function accessSecretStorage(
|
|||
if (!isCachingAllowed()) {
|
||||
secretStorageKeys = {};
|
||||
}
|
||||
passphraseOnlyOption = null;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -119,26 +119,26 @@ export default class DeviceListener {
|
|||
|
||||
// No need to do a recheck here: we just need to get a snapshot of our devices
|
||||
// before we download any new ones.
|
||||
}
|
||||
};
|
||||
|
||||
_onDevicesUpdated = (users: string[]) => {
|
||||
if (!users.includes(MatrixClientPeg.get().getUserId())) return;
|
||||
this._recheck();
|
||||
}
|
||||
};
|
||||
|
||||
_onDeviceVerificationChanged = (userId: string) => {
|
||||
if (userId !== MatrixClientPeg.get().getUserId()) return;
|
||||
this._recheck();
|
||||
}
|
||||
};
|
||||
|
||||
_onUserTrustStatusChanged = (userId: string) => {
|
||||
if (userId !== MatrixClientPeg.get().getUserId()) return;
|
||||
this._recheck();
|
||||
}
|
||||
};
|
||||
|
||||
_onCrossSingingKeysChanged = () => {
|
||||
this._recheck();
|
||||
}
|
||||
};
|
||||
|
||||
_onAccountData = (ev) => {
|
||||
// User may have:
|
||||
|
|
@ -152,11 +152,11 @@ export default class DeviceListener {
|
|||
) {
|
||||
this._recheck();
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
_onSync = (state, prevState) => {
|
||||
if (state === 'PREPARED' && prevState === null) this._recheck();
|
||||
}
|
||||
};
|
||||
|
||||
// The server doesn't tell us when key backup is set up, so we poll
|
||||
// & cache the result
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ import RoomViewStore from "./stores/RoomViewStore";
|
|||
import {IntegrationManagers} from "./integrations/IntegrationManagers";
|
||||
import SettingsStore from "./settings/SettingsStore";
|
||||
import {Capability} from "./widgets/WidgetApi";
|
||||
import {objectClone} from "./utils/objects";
|
||||
|
||||
const WIDGET_API_VERSION = '0.0.2'; // Current API version
|
||||
const SUPPORTED_WIDGET_API_VERSIONS = [
|
||||
|
|
@ -247,7 +248,7 @@ export default class FromWidgetPostMessageApi {
|
|||
* @param {Object} res Response data
|
||||
*/
|
||||
sendResponse(event, res) {
|
||||
const data = JSON.parse(JSON.stringify(event.data));
|
||||
const data = objectClone(event.data);
|
||||
data.response = res;
|
||||
event.source.postMessage(data, event.origin);
|
||||
}
|
||||
|
|
@ -260,7 +261,7 @@ export default class FromWidgetPostMessageApi {
|
|||
*/
|
||||
sendError(event, msg, nestedError) {
|
||||
console.error('Action:' + event.data.action + ' failed with message: ' + msg);
|
||||
const data = JSON.parse(JSON.stringify(event.data));
|
||||
const data = objectClone(event.data);
|
||||
data.response = {
|
||||
error: {
|
||||
message: msg,
|
||||
|
|
|
|||
|
|
@ -175,14 +175,6 @@ export default class Markdown {
|
|||
const renderer = new commonmark.HtmlRenderer({safe: false});
|
||||
const real_paragraph = renderer.paragraph;
|
||||
|
||||
// The default `out` function only sends the input through an XML
|
||||
// escaping function, which causes messages to be entity encoded,
|
||||
// which we don't want in this case.
|
||||
renderer.out = function(s) {
|
||||
// The `lit` function adds a string literal to the output buffer.
|
||||
this.lit(s);
|
||||
};
|
||||
|
||||
renderer.paragraph = function(node, entering) {
|
||||
// as with toHTML, only append lines to paragraphs if there are
|
||||
// multiple paragraphs
|
||||
|
|
|
|||
|
|
@ -35,13 +35,13 @@ import { crossSigningCallbacks } from './CrossSigningManager';
|
|||
import {SHOW_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
|
||||
|
||||
export interface IMatrixClientCreds {
|
||||
homeserverUrl: string,
|
||||
identityServerUrl: string,
|
||||
userId: string,
|
||||
deviceId: string,
|
||||
accessToken: string,
|
||||
guest: boolean,
|
||||
pickleKey?: string,
|
||||
homeserverUrl: string;
|
||||
identityServerUrl: string;
|
||||
userId: string;
|
||||
deviceId: string;
|
||||
accessToken: string;
|
||||
guest: boolean;
|
||||
pickleKey?: string;
|
||||
}
|
||||
|
||||
// TODO: Move this to the js-sdk
|
||||
|
|
|
|||
|
|
@ -244,16 +244,17 @@ import RoomViewStore from './stores/RoomViewStore';
|
|||
import { _t } from './languageHandler';
|
||||
import {IntegrationManagers} from "./integrations/IntegrationManagers";
|
||||
import {WidgetType} from "./widgets/WidgetType";
|
||||
import {objectClone} from "./utils/objects";
|
||||
|
||||
function sendResponse(event, res) {
|
||||
const data = JSON.parse(JSON.stringify(event.data));
|
||||
const data = objectClone(event.data);
|
||||
data.response = res;
|
||||
event.source.postMessage(data, event.origin);
|
||||
}
|
||||
|
||||
function sendError(event, msg, nestedError) {
|
||||
console.error("Action:" + event.data.action + " failed with message: " + msg);
|
||||
const data = JSON.parse(JSON.stringify(event.data));
|
||||
const data = objectClone(event.data);
|
||||
data.response = {
|
||||
error: {
|
||||
message: msg,
|
||||
|
|
|
|||
515
src/Searching.js
515
src/Searching.js
|
|
@ -17,25 +17,71 @@ limitations under the License.
|
|||
import EventIndexPeg from "./indexing/EventIndexPeg";
|
||||
import {MatrixClientPeg} from "./MatrixClientPeg";
|
||||
|
||||
function serverSideSearch(term, roomId = undefined) {
|
||||
let filter;
|
||||
if (roomId !== undefined) {
|
||||
// XXX: it's unintuitive that the filter for searching doesn't have
|
||||
// the same shape as the v2 filter API :(
|
||||
filter = {
|
||||
rooms: [roomId],
|
||||
};
|
||||
}
|
||||
const SEARCH_LIMIT = 10;
|
||||
|
||||
const searchPromise = MatrixClientPeg.get().searchRoomEvents({
|
||||
filter,
|
||||
term,
|
||||
});
|
||||
async function serverSideSearch(term, roomId = undefined) {
|
||||
const client = MatrixClientPeg.get();
|
||||
|
||||
return searchPromise;
|
||||
const filter = {
|
||||
limit: SEARCH_LIMIT,
|
||||
};
|
||||
|
||||
if (roomId !== undefined) filter.rooms = [roomId];
|
||||
|
||||
const body = {
|
||||
search_categories: {
|
||||
room_events: {
|
||||
search_term: term,
|
||||
filter: filter,
|
||||
order_by: "recent",
|
||||
event_context: {
|
||||
before_limit: 1,
|
||||
after_limit: 1,
|
||||
include_profile: true,
|
||||
},
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
const response = await client.search({body: body});
|
||||
|
||||
const result = {
|
||||
response: response,
|
||||
query: body,
|
||||
};
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
async function serverSideSearchProcess(term, roomId = undefined) {
|
||||
const client = MatrixClientPeg.get();
|
||||
const result = await serverSideSearch(term, roomId);
|
||||
|
||||
// The js-sdk method backPaginateRoomEventsSearch() uses _query internally
|
||||
// so we're reusing the concept here since we wan't to delegate the
|
||||
// pagination back to backPaginateRoomEventsSearch() in some cases.
|
||||
const searchResult = {
|
||||
_query: result.query,
|
||||
results: [],
|
||||
highlights: [],
|
||||
};
|
||||
|
||||
return client._processRoomEventsSearch(searchResult, result.response);
|
||||
}
|
||||
|
||||
function compareEvents(a, b) {
|
||||
const aEvent = a.result;
|
||||
const bEvent = b.result;
|
||||
|
||||
if (aEvent.origin_server_ts > bEvent.origin_server_ts) return -1;
|
||||
if (aEvent.origin_server_ts < bEvent.origin_server_ts) return 1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
async function combinedSearch(searchTerm) {
|
||||
const client = MatrixClientPeg.get();
|
||||
|
||||
// Create two promises, one for the local search, one for the
|
||||
// server-side search.
|
||||
const serverSidePromise = serverSideSearch(searchTerm);
|
||||
|
|
@ -48,37 +94,59 @@ async function combinedSearch(searchTerm) {
|
|||
const localResult = await localPromise;
|
||||
const serverSideResult = await serverSidePromise;
|
||||
|
||||
// Combine the search results into one result.
|
||||
const result = {};
|
||||
const serverQuery = serverSideResult.query;
|
||||
const serverResponse = serverSideResult.response;
|
||||
|
||||
// Our localResult and serverSideResult are both ordered by
|
||||
// recency separately, when we combine them the order might not
|
||||
// be the right one so we need to sort them.
|
||||
const compare = (a, b) => {
|
||||
const aEvent = a.context.getEvent().event;
|
||||
const bEvent = b.context.getEvent().event;
|
||||
const localQuery = localResult.query;
|
||||
const localResponse = localResult.response;
|
||||
|
||||
if (aEvent.origin_server_ts >
|
||||
bEvent.origin_server_ts) return -1;
|
||||
if (aEvent.origin_server_ts <
|
||||
bEvent.origin_server_ts) return 1;
|
||||
return 0;
|
||||
// Store our queries for later on so we can support pagination.
|
||||
//
|
||||
// We're reusing _query here again to not introduce separate code paths and
|
||||
// concepts for our different pagination methods. We're storing the
|
||||
// server-side next batch separately since the query is the json body of
|
||||
// the request and next_batch needs to be a query parameter.
|
||||
//
|
||||
// We can't put it in the final result that _processRoomEventsSearch()
|
||||
// returns since that one can be either a server-side one, a local one or a
|
||||
// fake one to fetch the remaining cached events. See the docs for
|
||||
// combineEvents() for an explanation why we need to cache events.
|
||||
const emptyResult = {
|
||||
seshatQuery: localQuery,
|
||||
_query: serverQuery,
|
||||
serverSideNextBatch: serverResponse.next_batch,
|
||||
cachedEvents: [],
|
||||
oldestEventFrom: "server",
|
||||
results: [],
|
||||
highlights: [],
|
||||
};
|
||||
|
||||
result.count = localResult.count + serverSideResult.count;
|
||||
result.results = localResult.results.concat(
|
||||
serverSideResult.results).sort(compare);
|
||||
result.highlights = localResult.highlights.concat(
|
||||
serverSideResult.highlights);
|
||||
// Combine our results.
|
||||
const combinedResult = combineResponses(emptyResult, localResponse, serverResponse.search_categories.room_events);
|
||||
|
||||
// Let the client process the combined result.
|
||||
const response = {
|
||||
search_categories: {
|
||||
room_events: combinedResult,
|
||||
},
|
||||
};
|
||||
|
||||
const result = client._processRoomEventsSearch(emptyResult, response);
|
||||
|
||||
// Restore our encryption info so we can properly re-verify the events.
|
||||
restoreEncryptionInfo(result.results);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
async function localSearch(searchTerm, roomId = undefined) {
|
||||
async function localSearch(searchTerm, roomId = undefined, processResult = true) {
|
||||
const eventIndex = EventIndexPeg.get();
|
||||
|
||||
const searchArgs = {
|
||||
search_term: searchTerm,
|
||||
before_limit: 1,
|
||||
after_limit: 1,
|
||||
limit: SEARCH_LIMIT,
|
||||
order_by_recency: true,
|
||||
room_id: undefined,
|
||||
};
|
||||
|
|
@ -87,6 +155,19 @@ async function localSearch(searchTerm, roomId = undefined) {
|
|||
searchArgs.room_id = roomId;
|
||||
}
|
||||
|
||||
const localResult = await eventIndex.search(searchArgs);
|
||||
|
||||
searchArgs.next_batch = localResult.next_batch;
|
||||
|
||||
const result = {
|
||||
response: localResult,
|
||||
query: searchArgs,
|
||||
};
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
async function localSearchProcess(searchTerm, roomId = undefined) {
|
||||
const emptyResult = {
|
||||
results: [],
|
||||
highlights: [],
|
||||
|
|
@ -94,9 +175,34 @@ async function localSearch(searchTerm, roomId = undefined) {
|
|||
|
||||
if (searchTerm === "") return emptyResult;
|
||||
|
||||
const result = await localSearch(searchTerm, roomId);
|
||||
|
||||
emptyResult.seshatQuery = result.query;
|
||||
|
||||
const response = {
|
||||
search_categories: {
|
||||
room_events: result.response,
|
||||
},
|
||||
};
|
||||
|
||||
const processedResult = MatrixClientPeg.get()._processRoomEventsSearch(emptyResult, response);
|
||||
// Restore our encryption info so we can properly re-verify the events.
|
||||
restoreEncryptionInfo(processedResult.results);
|
||||
|
||||
return processedResult;
|
||||
}
|
||||
|
||||
async function localPagination(searchResult) {
|
||||
const eventIndex = EventIndexPeg.get();
|
||||
|
||||
const searchArgs = searchResult.seshatQuery;
|
||||
|
||||
const localResult = await eventIndex.search(searchArgs);
|
||||
searchResult.seshatQuery.next_batch = localResult.next_batch;
|
||||
|
||||
// We only need to restore the encryption state for the new results, so
|
||||
// remember how many of them we got.
|
||||
const newResultCount = localResult.results.length;
|
||||
|
||||
const response = {
|
||||
search_categories: {
|
||||
|
|
@ -104,15 +210,257 @@ async function localSearch(searchTerm, roomId = undefined) {
|
|||
},
|
||||
};
|
||||
|
||||
const result = MatrixClientPeg.get()._processRoomEventsSearch(
|
||||
emptyResult, response);
|
||||
const result = MatrixClientPeg.get()._processRoomEventsSearch(searchResult, response);
|
||||
|
||||
// Restore our encryption info so we can properly re-verify the events.
|
||||
for (let i = 0; i < result.results.length; i++) {
|
||||
const timeline = result.results[i].context.getTimeline();
|
||||
const newSlice = result.results.slice(Math.max(result.results.length - newResultCount, 0));
|
||||
restoreEncryptionInfo(newSlice);
|
||||
|
||||
searchResult.pendingRequest = null;
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
function compareOldestEvents(firstResults, secondResults) {
|
||||
try {
|
||||
const oldestFirstEvent = firstResults.results[firstResults.results.length - 1].result;
|
||||
const oldestSecondEvent = secondResults.results[secondResults.results.length - 1].result;
|
||||
|
||||
if (oldestFirstEvent.origin_server_ts <= oldestSecondEvent.origin_server_ts) {
|
||||
return -1;
|
||||
} else {
|
||||
return 1;
|
||||
}
|
||||
} catch {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
function combineEventSources(previousSearchResult, response, a, b) {
|
||||
// Merge event sources and sort the events.
|
||||
const combinedEvents = a.concat(b).sort(compareEvents);
|
||||
// Put half of the events in the response, and cache the other half.
|
||||
response.results = combinedEvents.slice(0, SEARCH_LIMIT);
|
||||
previousSearchResult.cachedEvents = combinedEvents.slice(SEARCH_LIMIT);
|
||||
}
|
||||
|
||||
/**
|
||||
* Combine the events from our event sources into a sorted result
|
||||
*
|
||||
* This method will first be called from the combinedSearch() method. In this
|
||||
* case we will fetch SEARCH_LIMIT events from the server and the local index.
|
||||
*
|
||||
* The method will put the SEARCH_LIMIT newest events from the server and the
|
||||
* local index in the results part of the response, the rest will be put in the
|
||||
* cachedEvents field of the previousSearchResult (in this case an empty search
|
||||
* result).
|
||||
*
|
||||
* Every subsequent call will be made from the combinedPagination() method, in
|
||||
* this case we will combine the cachedEvents and the next SEARCH_LIMIT events
|
||||
* from either the server or the local index.
|
||||
*
|
||||
* Since we have two event sources and we need to sort the results by date we
|
||||
* need keep on looking for the oldest event. We are implementing a variation of
|
||||
* a sliding window.
|
||||
*
|
||||
* The event sources are here represented as two sorted lists where the smallest
|
||||
* number represents the newest event. The two lists need to be merged in a way
|
||||
* that preserves the sorted property so they can be shown as one search result.
|
||||
* We first fetch SEARCH_LIMIT events from both sources.
|
||||
*
|
||||
* If we set SEARCH_LIMIT to 3:
|
||||
*
|
||||
* Server events [01, 02, 04, 06, 07, 08, 11, 13]
|
||||
* |01, 02, 04|
|
||||
* Local events [03, 05, 09, 10, 12, 14, 15, 16]
|
||||
* |03, 05, 09|
|
||||
*
|
||||
* We note that the oldest event is from the local index, and we combine the
|
||||
* results:
|
||||
*
|
||||
* Server window [01, 02, 04]
|
||||
* Local window [03, 05, 09]
|
||||
*
|
||||
* Combined events [01, 02, 03, 04, 05, 09]
|
||||
*
|
||||
* We split the combined result in the part that we want to present and a part
|
||||
* that will be cached.
|
||||
*
|
||||
* Presented events [01, 02, 03]
|
||||
* Cached events [04, 05, 09]
|
||||
*
|
||||
* We slide the window for the server since the oldest event is from the local
|
||||
* index.
|
||||
*
|
||||
* Server events [01, 02, 04, 06, 07, 08, 11, 13]
|
||||
* |06, 07, 08|
|
||||
* Local events [03, 05, 09, 10, 12, 14, 15, 16]
|
||||
* |XX, XX, XX|
|
||||
* Cached events [04, 05, 09]
|
||||
*
|
||||
* We note that the oldest event is from the server and we combine the new
|
||||
* server events with the cached ones.
|
||||
*
|
||||
* Cached events [04, 05, 09]
|
||||
* Server events [06, 07, 08]
|
||||
*
|
||||
* Combined events [04, 05, 06, 07, 08, 09]
|
||||
*
|
||||
* We split again.
|
||||
*
|
||||
* Presented events [04, 05, 06]
|
||||
* Cached events [07, 08, 09]
|
||||
*
|
||||
* We slide the local window, the oldest event is on the server.
|
||||
*
|
||||
* Server events [01, 02, 04, 06, 07, 08, 11, 13]
|
||||
* |XX, XX, XX|
|
||||
* Local events [03, 05, 09, 10, 12, 14, 15, 16]
|
||||
* |10, 12, 14|
|
||||
*
|
||||
* Cached events [07, 08, 09]
|
||||
* Local events [10, 12, 14]
|
||||
* Combined events [07, 08, 09, 10, 12, 14]
|
||||
*
|
||||
* Presented events [07, 08, 09]
|
||||
* Cached events [10, 12, 14]
|
||||
*
|
||||
* Next up we slide the server window again.
|
||||
*
|
||||
* Server events [01, 02, 04, 06, 07, 08, 11, 13]
|
||||
* |11, 13|
|
||||
* Local events [03, 05, 09, 10, 12, 14, 15, 16]
|
||||
* |XX, XX, XX|
|
||||
*
|
||||
* Cached events [10, 12, 14]
|
||||
* Server events [11, 13]
|
||||
* Combined events [10, 11, 12, 13, 14]
|
||||
*
|
||||
* Presented events [10, 11, 12]
|
||||
* Cached events [13, 14]
|
||||
*
|
||||
* We have one source exhausted, we fetch the rest of our events from the other
|
||||
* source and combine it with our cached events.
|
||||
*
|
||||
*
|
||||
* @param {object} previousSearchResult A search result from a previous search
|
||||
* call.
|
||||
* @param {object} localEvents An unprocessed search result from the event
|
||||
* index.
|
||||
* @param {object} serverEvents An unprocessed search result from the server.
|
||||
*
|
||||
* @return {object} A response object that combines the events from the
|
||||
* different event sources.
|
||||
*
|
||||
*/
|
||||
function combineEvents(previousSearchResult, localEvents = undefined, serverEvents = undefined) {
|
||||
const response = {};
|
||||
|
||||
const cachedEvents = previousSearchResult.cachedEvents;
|
||||
let oldestEventFrom = previousSearchResult.oldestEventFrom;
|
||||
response.highlights = previousSearchResult.highlights;
|
||||
|
||||
if (localEvents && serverEvents) {
|
||||
// This is a first search call, combine the events from the server and
|
||||
// the local index. Note where our oldest event came from, we shall
|
||||
// fetch the next batch of events from the other source.
|
||||
if (compareOldestEvents(localEvents, serverEvents) < 0) {
|
||||
oldestEventFrom = "local";
|
||||
}
|
||||
|
||||
combineEventSources(previousSearchResult, response, localEvents.results, serverEvents.results);
|
||||
response.highlights = localEvents.highlights.concat(serverEvents.highlights);
|
||||
} else if (localEvents) {
|
||||
// This is a pagination call fetching more events from the local index,
|
||||
// meaning that our oldest event was on the server.
|
||||
// Change the source of the oldest event if our local event is older
|
||||
// than the cached one.
|
||||
if (compareOldestEvents(localEvents, cachedEvents) < 0) {
|
||||
oldestEventFrom = "local";
|
||||
}
|
||||
combineEventSources(previousSearchResult, response, localEvents.results, cachedEvents);
|
||||
} else if (serverEvents) {
|
||||
// This is a pagination call fetching more events from the server,
|
||||
// meaning that our oldest event was in the local index.
|
||||
// Change the source of the oldest event if our server event is older
|
||||
// than the cached one.
|
||||
if (compareOldestEvents(serverEvents, cachedEvents) < 0) {
|
||||
oldestEventFrom = "server";
|
||||
}
|
||||
combineEventSources(previousSearchResult, response, serverEvents.results, cachedEvents);
|
||||
} else {
|
||||
// This is a pagination call where we exhausted both of our event
|
||||
// sources, let's push the remaining cached events.
|
||||
response.results = cachedEvents;
|
||||
previousSearchResult.cachedEvents = [];
|
||||
}
|
||||
|
||||
previousSearchResult.oldestEventFrom = oldestEventFrom;
|
||||
|
||||
return response;
|
||||
}
|
||||
|
||||
/**
|
||||
* Combine the local and server search responses
|
||||
*
|
||||
* @param {object} previousSearchResult A search result from a previous search
|
||||
* call.
|
||||
* @param {object} localEvents An unprocessed search result from the event
|
||||
* index.
|
||||
* @param {object} serverEvents An unprocessed search result from the server.
|
||||
*
|
||||
* @return {object} A response object that combines the events from the
|
||||
* different event sources.
|
||||
*/
|
||||
function combineResponses(previousSearchResult, localEvents = undefined, serverEvents = undefined) {
|
||||
// Combine our events first.
|
||||
const response = combineEvents(previousSearchResult, localEvents, serverEvents);
|
||||
|
||||
// Our first search will contain counts from both sources, subsequent
|
||||
// pagination requests will fetch responses only from one of the sources, so
|
||||
// reuse the first count when we're paginating.
|
||||
if (previousSearchResult.count) {
|
||||
response.count = previousSearchResult.count;
|
||||
} else {
|
||||
response.count = localEvents.count + serverEvents.count;
|
||||
}
|
||||
|
||||
// Update our next batch tokens for the given search sources.
|
||||
if (localEvents) {
|
||||
previousSearchResult.seshatQuery.next_batch = localEvents.next_batch;
|
||||
}
|
||||
if (serverEvents) {
|
||||
previousSearchResult.serverSideNextBatch = serverEvents.next_batch;
|
||||
}
|
||||
|
||||
// Set the response next batch token to one of the tokens from the sources,
|
||||
// this makes sure that if we exhaust one of the sources we continue with
|
||||
// the other one.
|
||||
if (previousSearchResult.seshatQuery.next_batch) {
|
||||
response.next_batch = previousSearchResult.seshatQuery.next_batch;
|
||||
} else if (previousSearchResult.serverSideNextBatch) {
|
||||
response.next_batch = previousSearchResult.serverSideNextBatch;
|
||||
}
|
||||
|
||||
// We collected all search results from the server as well as from Seshat,
|
||||
// we still have some events cached that we'll want to display on the next
|
||||
// pagination request.
|
||||
//
|
||||
// Provide a fake next batch token for that case.
|
||||
if (!response.next_batch && previousSearchResult.cachedEvents.length > 0) {
|
||||
response.next_batch = "cached";
|
||||
}
|
||||
|
||||
return response;
|
||||
}
|
||||
|
||||
function restoreEncryptionInfo(searchResultSlice) {
|
||||
for (let i = 0; i < searchResultSlice.length; i++) {
|
||||
const timeline = searchResultSlice[i].context.getTimeline();
|
||||
|
||||
for (let j = 0; j < timeline.length; j++) {
|
||||
const ev = timeline[j];
|
||||
|
||||
if (ev.event.curve25519Key) {
|
||||
ev.makeEncrypted(
|
||||
"m.room.encrypted",
|
||||
|
|
@ -129,6 +477,57 @@ async function localSearch(searchTerm, roomId = undefined) {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async function combinedPagination(searchResult) {
|
||||
const eventIndex = EventIndexPeg.get();
|
||||
const client = MatrixClientPeg.get();
|
||||
|
||||
const searchArgs = searchResult.seshatQuery;
|
||||
const oldestEventFrom = searchResult.oldestEventFrom;
|
||||
|
||||
let localResult;
|
||||
let serverSideResult;
|
||||
|
||||
// Fetch events from the local index if we have a token for itand if it's
|
||||
// the local indexes turn or the server has exhausted its results.
|
||||
if (searchArgs.next_batch && (!searchResult.serverSideNextBatch || oldestEventFrom === "server")) {
|
||||
localResult = await eventIndex.search(searchArgs);
|
||||
}
|
||||
|
||||
// Fetch events from the server if we have a token for it and if it's the
|
||||
// local indexes turn or the local index has exhausted its results.
|
||||
if (searchResult.serverSideNextBatch && (oldestEventFrom === "local" || !searchArgs.next_batch)) {
|
||||
const body = {body: searchResult._query, next_batch: searchResult.serverSideNextBatch};
|
||||
serverSideResult = await client.search(body);
|
||||
}
|
||||
|
||||
let serverEvents;
|
||||
|
||||
if (serverSideResult) {
|
||||
serverEvents = serverSideResult.search_categories.room_events;
|
||||
}
|
||||
|
||||
// Combine our events.
|
||||
const combinedResult = combineResponses(searchResult, localResult, serverEvents);
|
||||
|
||||
const response = {
|
||||
search_categories: {
|
||||
room_events: combinedResult,
|
||||
},
|
||||
};
|
||||
|
||||
const oldResultCount = searchResult.results.length;
|
||||
|
||||
// Let the client process the combined result.
|
||||
const result = client._processRoomEventsSearch(searchResult, response);
|
||||
|
||||
// Restore our encryption info so we can properly re-verify the events.
|
||||
const newResultCount = result.results.length - oldResultCount;
|
||||
const newSlice = result.results.slice(Math.max(result.results.length - newResultCount, 0));
|
||||
restoreEncryptionInfo(newSlice);
|
||||
|
||||
searchResult.pendingRequest = null;
|
||||
|
||||
return result;
|
||||
}
|
||||
|
|
@ -140,11 +539,11 @@ function eventIndexSearch(term, roomId = undefined) {
|
|||
if (MatrixClientPeg.get().isRoomEncrypted(roomId)) {
|
||||
// The search is for a single encrypted room, use our local
|
||||
// search method.
|
||||
searchPromise = localSearch(term, roomId);
|
||||
searchPromise = localSearchProcess(term, roomId);
|
||||
} else {
|
||||
// The search is for a single non-encrypted room, use the
|
||||
// server-side search.
|
||||
searchPromise = serverSideSearch(term, roomId);
|
||||
searchPromise = serverSideSearchProcess(term, roomId);
|
||||
}
|
||||
} else {
|
||||
// Search across all rooms, combine a server side search and a
|
||||
|
|
@ -155,9 +554,45 @@ function eventIndexSearch(term, roomId = undefined) {
|
|||
return searchPromise;
|
||||
}
|
||||
|
||||
function eventIndexSearchPagination(searchResult) {
|
||||
const client = MatrixClientPeg.get();
|
||||
|
||||
const seshatQuery = searchResult.seshatQuery;
|
||||
const serverQuery = searchResult._query;
|
||||
|
||||
if (!seshatQuery) {
|
||||
// This is a search in a non-encrypted room. Do the normal server-side
|
||||
// pagination.
|
||||
return client.backPaginateRoomEventsSearch(searchResult);
|
||||
} else if (!serverQuery) {
|
||||
// This is a search in a encrypted room. Do a local pagination.
|
||||
const promise = localPagination(searchResult);
|
||||
searchResult.pendingRequest = promise;
|
||||
|
||||
return promise;
|
||||
} else {
|
||||
// We have both queries around, this is a search across all rooms so a
|
||||
// combined pagination needs to be done.
|
||||
const promise = combinedPagination(searchResult);
|
||||
searchResult.pendingRequest = promise;
|
||||
|
||||
return promise;
|
||||
}
|
||||
}
|
||||
|
||||
export function searchPagination(searchResult) {
|
||||
const eventIndex = EventIndexPeg.get();
|
||||
const client = MatrixClientPeg.get();
|
||||
|
||||
if (searchResult.pendingRequest) return searchResult.pendingRequest;
|
||||
|
||||
if (eventIndex === null) return client.backPaginateRoomEventsSearch(searchResult);
|
||||
else return eventIndexSearchPagination(searchResult);
|
||||
}
|
||||
|
||||
export default function eventSearch(term, roomId = undefined) {
|
||||
const eventIndex = EventIndexPeg.get();
|
||||
|
||||
if (eventIndex === null) return serverSideSearch(term, roomId);
|
||||
if (eventIndex === null) return serverSideSearchProcess(term, roomId);
|
||||
else return eventIndexSearch(term, roomId);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ export class Command {
|
|||
|
||||
run(roomId: string, args: string, cmd: string) {
|
||||
// if it has no runFn then its an ignored/nop command (autocomplete only) e.g `/me`
|
||||
if (!this.runFn) return;
|
||||
if (!this.runFn) return reject(_t("Command error"));
|
||||
return this.runFn.bind(this)(roomId, args, cmd);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ export default class TagOrderActions {
|
|||
// For an optimistic update
|
||||
return {tags, removedTags};
|
||||
});
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates an action thunk that will do an asynchronous request to
|
||||
|
|
|
|||
|
|
@ -20,23 +20,25 @@ import PropTypes from 'prop-types';
|
|||
import * as sdk from '../../../../index';
|
||||
import {MatrixClientPeg} from '../../../../MatrixClientPeg';
|
||||
import FileSaver from 'file-saver';
|
||||
import {_t} from '../../../../languageHandler';
|
||||
import {_t, _td} from '../../../../languageHandler';
|
||||
import Modal from '../../../../Modal';
|
||||
import { promptForBackupPassphrase } from '../../../../CrossSigningManager';
|
||||
import {copyNode} from "../../../../utils/strings";
|
||||
import {SSOAuthEntry} from "../../../../components/views/auth/InteractiveAuthEntryComponents";
|
||||
import AccessibleButton from "../../../../components/views/elements/AccessibleButton";
|
||||
import DialogButtons from "../../../../components/views/elements/DialogButtons";
|
||||
import InlineSpinner from "../../../../components/views/elements/InlineSpinner";
|
||||
|
||||
import PassphraseField from "../../../../components/views/auth/PassphraseField";
|
||||
|
||||
const PHASE_LOADING = 0;
|
||||
const PHASE_LOADERROR = 1;
|
||||
const PHASE_MIGRATE = 2;
|
||||
const PHASE_INTRO = 3;
|
||||
const PHASE_SHOWKEY = 4;
|
||||
const PHASE_STORING = 5;
|
||||
const PHASE_CONFIRM_SKIP = 6;
|
||||
const PHASE_PASSPHRASE = 3;
|
||||
const PHASE_PASSPHRASE_CONFIRM = 4;
|
||||
const PHASE_SHOWKEY = 5;
|
||||
const PHASE_KEEPITSAFE = 6;
|
||||
const PHASE_STORING = 7;
|
||||
const PHASE_DONE = 8;
|
||||
const PHASE_CONFIRM_SKIP = 9;
|
||||
|
||||
const PASSWORD_MIN_SCORE = 4; // So secure, many characters, much complex, wow, etc, etc.
|
||||
|
||||
/*
|
||||
* Walks the user through the process of creating a passphrase to guard Secure
|
||||
|
|
@ -63,32 +65,34 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
|
|||
|
||||
this.state = {
|
||||
phase: PHASE_LOADING,
|
||||
downloaded: false,
|
||||
passPhrase: '',
|
||||
passPhraseValid: false,
|
||||
passPhraseConfirm: '',
|
||||
copied: false,
|
||||
downloaded: false,
|
||||
backupInfo: null,
|
||||
backupInfoFetched: false,
|
||||
backupInfoFetchError: null,
|
||||
backupSigStatus: null,
|
||||
// does the server offer a UI auth flow with just m.login.password
|
||||
// for /keys/device_signing/upload? (If we have an account password, we
|
||||
// assume that it can)
|
||||
// for /keys/device_signing/upload?
|
||||
canUploadKeysWithPasswordOnly: null,
|
||||
canUploadKeyCheckInProgress: false,
|
||||
accountPassword: props.accountPassword || "",
|
||||
accountPasswordCorrect: null,
|
||||
// No toggle for this: if we really don't want one, remove it & just hard code true
|
||||
// status of the key backup toggle switch
|
||||
useKeyBackup: true,
|
||||
};
|
||||
|
||||
if (props.accountPassword) {
|
||||
// If we have an account password, we assume we can upload keys with
|
||||
// just a password (otherwise leave it as null so we poll to check)
|
||||
this.state.canUploadKeysWithPasswordOnly = true;
|
||||
}
|
||||
|
||||
this._passphraseField = createRef();
|
||||
|
||||
this.loadData();
|
||||
this._fetchBackupInfo();
|
||||
if (this.state.accountPassword) {
|
||||
// If we have an account password in memory, let's simplify and
|
||||
// assume it means password auth is also supported for device
|
||||
// signing key upload as well. This avoids hitting the server to
|
||||
// test auth flows, which may be slow under high load.
|
||||
this.state.canUploadKeysWithPasswordOnly = true;
|
||||
} else {
|
||||
this._queryKeyUploadAuth();
|
||||
}
|
||||
|
||||
MatrixClientPeg.get().on('crypto.keyBackupStatus', this._onKeyBackupStatusChange);
|
||||
}
|
||||
|
|
@ -105,11 +109,13 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
|
|||
MatrixClientPeg.get().isCryptoEnabled() && await MatrixClientPeg.get().isKeyBackupTrusted(backupInfo)
|
||||
);
|
||||
|
||||
const { force } = this.props;
|
||||
const phase = (backupInfo && !force) ? PHASE_MIGRATE : PHASE_PASSPHRASE;
|
||||
|
||||
this.setState({
|
||||
backupInfoFetched: true,
|
||||
phase,
|
||||
backupInfo,
|
||||
backupSigStatus,
|
||||
backupInfoFetchError: null,
|
||||
});
|
||||
|
||||
return {
|
||||
|
|
@ -117,25 +123,20 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
|
|||
backupSigStatus,
|
||||
};
|
||||
} catch (e) {
|
||||
this.setState({backupInfoFetchError: e});
|
||||
this.setState({phase: PHASE_LOADERROR});
|
||||
}
|
||||
}
|
||||
|
||||
async _queryKeyUploadAuth() {
|
||||
try {
|
||||
this.setState({canUploadKeyCheckInProgress: true});
|
||||
await MatrixClientPeg.get().uploadDeviceSigningKeys(null, {});
|
||||
// We should never get here: the server should always require
|
||||
// UI auth to upload device signing keys. If we do, we upload
|
||||
// no keys which would be a no-op.
|
||||
console.log("uploadDeviceSigningKeys unexpectedly succeeded without UI auth!");
|
||||
this.setState({canUploadKeyCheckInProgress: false});
|
||||
} catch (error) {
|
||||
if (!error.data || !error.data.flows) {
|
||||
console.log("uploadDeviceSigningKeys advertised no flows!");
|
||||
this.setState({
|
||||
canUploadKeyCheckInProgress: false,
|
||||
});
|
||||
return;
|
||||
}
|
||||
const canUploadKeysWithPasswordOnly = error.data.flows.some(f => {
|
||||
|
|
@ -143,18 +144,10 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
|
|||
});
|
||||
this.setState({
|
||||
canUploadKeysWithPasswordOnly,
|
||||
canUploadKeyCheckInProgress: false,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
async _createRecoveryKey() {
|
||||
this._recoveryKey = await MatrixClientPeg.get().createRecoveryKeyFromPassphrase();
|
||||
this.setState({
|
||||
phase: PHASE_SHOWKEY,
|
||||
});
|
||||
}
|
||||
|
||||
_onKeyBackupStatusChange = () => {
|
||||
if (this.state.phase === PHASE_MIGRATE) this._fetchBackupInfo();
|
||||
}
|
||||
|
|
@ -163,6 +156,12 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
|
|||
this._recoveryKeyNode = n;
|
||||
}
|
||||
|
||||
_onUseKeyBackupChange = (enabled) => {
|
||||
this.setState({
|
||||
useKeyBackup: enabled,
|
||||
});
|
||||
}
|
||||
|
||||
_onMigrateFormSubmit = (e) => {
|
||||
e.preventDefault();
|
||||
if (this.state.backupSigStatus.usable) {
|
||||
|
|
@ -172,15 +171,12 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
|
|||
}
|
||||
}
|
||||
|
||||
_onIntroContinueClick = () => {
|
||||
this._createRecoveryKey();
|
||||
}
|
||||
|
||||
_onCopyClick = () => {
|
||||
const successful = copyNode(this._recoveryKeyNode);
|
||||
if (successful) {
|
||||
this.setState({
|
||||
copied: true,
|
||||
phase: PHASE_KEEPITSAFE,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -190,8 +186,10 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
|
|||
type: 'text/plain;charset=us-ascii',
|
||||
});
|
||||
FileSaver.saveAs(blob, 'recovery-key.txt');
|
||||
|
||||
this.setState({
|
||||
downloaded: true,
|
||||
phase: PHASE_KEEPITSAFE,
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -247,9 +245,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
|
|||
|
||||
_bootstrapSecretStorage = async () => {
|
||||
this.setState({
|
||||
// we use LOADING here rather than STORING as STORING still shows the 'show key'
|
||||
// screen which is not relevant: LOADING is just a generic spinner.
|
||||
phase: PHASE_LOADING,
|
||||
phase: PHASE_STORING,
|
||||
error: null,
|
||||
});
|
||||
|
||||
|
|
@ -290,7 +286,9 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
|
|||
},
|
||||
});
|
||||
}
|
||||
this.props.onFinished(true);
|
||||
this.setState({
|
||||
phase: PHASE_DONE,
|
||||
});
|
||||
} catch (e) {
|
||||
if (this.state.canUploadKeysWithPasswordOnly && e.httpStatus === 401 && e.data.flows) {
|
||||
this.setState({
|
||||
|
|
@ -309,6 +307,10 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
|
|||
this.props.onFinished(false);
|
||||
}
|
||||
|
||||
_onDone = () => {
|
||||
this.props.onFinished(true);
|
||||
}
|
||||
|
||||
_restoreBackup = async () => {
|
||||
// It's possible we'll need the backup key later on for bootstrapping,
|
||||
// so let's stash it here, rather than prompting for it twice.
|
||||
|
|
@ -335,41 +337,88 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
|
|||
}
|
||||
}
|
||||
|
||||
_onShowKeyContinueClick = () => {
|
||||
this._bootstrapSecretStorage();
|
||||
}
|
||||
|
||||
_onLoadRetryClick = () => {
|
||||
this.loadData();
|
||||
}
|
||||
|
||||
async loadData() {
|
||||
this.setState({phase: PHASE_LOADING});
|
||||
const proms = [];
|
||||
|
||||
if (!this.state.backupInfoFetched) proms.push(this._fetchBackupInfo());
|
||||
if (this.state.canUploadKeysWithPasswordOnly === null) proms.push(this._queryKeyUploadAuth());
|
||||
|
||||
await Promise.all(proms);
|
||||
if (this.state.canUploadKeysWithPasswordOnly === null || this.state.backupInfoFetchError) {
|
||||
this.setState({phase: PHASE_LOADERROR});
|
||||
} else if (this.state.backupInfo && !this.props.force) {
|
||||
this.setState({phase: PHASE_MIGRATE});
|
||||
} else {
|
||||
this.setState({phase: PHASE_INTRO});
|
||||
}
|
||||
this._fetchBackupInfo();
|
||||
}
|
||||
|
||||
_onSkipSetupClick = () => {
|
||||
this.setState({phase: PHASE_CONFIRM_SKIP});
|
||||
}
|
||||
|
||||
_onGoBackClick = () => {
|
||||
if (this.state.backupInfo && !this.props.force) {
|
||||
this.setState({phase: PHASE_MIGRATE});
|
||||
} else {
|
||||
this.setState({phase: PHASE_INTRO});
|
||||
_onSetUpClick = () => {
|
||||
this.setState({phase: PHASE_PASSPHRASE});
|
||||
}
|
||||
|
||||
_onSkipPassPhraseClick = async () => {
|
||||
this._recoveryKey =
|
||||
await MatrixClientPeg.get().createRecoveryKeyFromPassphrase();
|
||||
this.setState({
|
||||
copied: false,
|
||||
downloaded: false,
|
||||
phase: PHASE_SHOWKEY,
|
||||
});
|
||||
}
|
||||
|
||||
_onPassPhraseNextClick = async (e) => {
|
||||
e.preventDefault();
|
||||
if (!this._passphraseField.current) return; // unmounting
|
||||
|
||||
await this._passphraseField.current.validate({ allowEmpty: false });
|
||||
if (!this._passphraseField.current.state.valid) {
|
||||
this._passphraseField.current.focus();
|
||||
this._passphraseField.current.validate({ allowEmpty: false, focused: true });
|
||||
return;
|
||||
}
|
||||
|
||||
this.setState({phase: PHASE_PASSPHRASE_CONFIRM});
|
||||
};
|
||||
|
||||
_onPassPhraseConfirmNextClick = async (e) => {
|
||||
e.preventDefault();
|
||||
|
||||
if (this.state.passPhrase !== this.state.passPhraseConfirm) return;
|
||||
|
||||
this._recoveryKey =
|
||||
await MatrixClientPeg.get().createRecoveryKeyFromPassphrase(this.state.passPhrase);
|
||||
this.setState({
|
||||
copied: false,
|
||||
downloaded: false,
|
||||
phase: PHASE_SHOWKEY,
|
||||
});
|
||||
}
|
||||
|
||||
_onSetAgainClick = () => {
|
||||
this.setState({
|
||||
passPhrase: '',
|
||||
passPhraseValid: false,
|
||||
passPhraseConfirm: '',
|
||||
phase: PHASE_PASSPHRASE,
|
||||
});
|
||||
}
|
||||
|
||||
_onKeepItSafeBackClick = () => {
|
||||
this.setState({
|
||||
phase: PHASE_SHOWKEY,
|
||||
});
|
||||
}
|
||||
|
||||
_onPassPhraseValidate = (result) => {
|
||||
this.setState({
|
||||
passPhraseValid: result.valid,
|
||||
});
|
||||
};
|
||||
|
||||
_onPassPhraseChange = (e) => {
|
||||
this.setState({
|
||||
passPhrase: e.target.value,
|
||||
});
|
||||
}
|
||||
|
||||
_onPassPhraseConfirmChange = (e) => {
|
||||
this.setState({
|
||||
passPhraseConfirm: e.target.value,
|
||||
});
|
||||
}
|
||||
|
||||
_onAccountPasswordChange = (e) => {
|
||||
|
|
@ -384,14 +433,12 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
|
|||
// Once we're confident enough in this (and it's supported enough) we can do
|
||||
// it automatically.
|
||||
// https://github.com/vector-im/riot-web/issues/11696
|
||||
const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
|
||||
const Field = sdk.getComponent('views.elements.Field');
|
||||
|
||||
let authPrompt;
|
||||
let nextCaption = _t("Next");
|
||||
if (!this.state.backupSigStatus.usable) {
|
||||
authPrompt = null;
|
||||
nextCaption = _t("Upload");
|
||||
} else if (this.state.canUploadKeysWithPasswordOnly && !this.props.accountPassword) {
|
||||
if (this.state.canUploadKeysWithPasswordOnly) {
|
||||
authPrompt = <div>
|
||||
<div>{_t("Enter your account password to confirm the upgrade:")}</div>
|
||||
<div><Field
|
||||
|
|
@ -403,6 +450,11 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
|
|||
autoFocus={true}
|
||||
/></div>
|
||||
</div>;
|
||||
} else if (!this.state.backupSigStatus.usable) {
|
||||
authPrompt = <div>
|
||||
<div>{_t("Restore your key backup to upgrade your encryption")}</div>
|
||||
</div>;
|
||||
nextCaption = _t("Restore");
|
||||
} else {
|
||||
authPrompt = <p>
|
||||
{_t("You'll need to authenticate with the server to confirm the upgrade.")}
|
||||
|
|
@ -411,9 +463,9 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
|
|||
|
||||
return <form onSubmit={this._onMigrateFormSubmit}>
|
||||
<p>{_t(
|
||||
"Upgrade your Recovery Key to store encryption keys & secrets " +
|
||||
"with your account data. If you lose access to this login you'll " +
|
||||
"need it to unlock your data.",
|
||||
"Upgrade this session to allow it to verify other sessions, " +
|
||||
"granting them access to encrypted messages and marking them " +
|
||||
"as trusted for other users.",
|
||||
)}</p>
|
||||
<div>{authPrompt}</div>
|
||||
<DialogButtons
|
||||
|
|
@ -429,49 +481,185 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
|
|||
</form>;
|
||||
}
|
||||
|
||||
_renderPhaseShowKey() {
|
||||
let continueButton;
|
||||
if (this.state.phase === PHASE_SHOWKEY) {
|
||||
continueButton = <DialogButtons primaryButton={_t("Continue")}
|
||||
disabled={!this.state.downloaded && !this.state.copied}
|
||||
onPrimaryButtonClick={this._onShowKeyContinueClick}
|
||||
_renderPhasePassPhrase() {
|
||||
const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
|
||||
const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
|
||||
const LabelledToggleSwitch = sdk.getComponent('views.elements.LabelledToggleSwitch');
|
||||
|
||||
return <form onSubmit={this._onPassPhraseNextClick}>
|
||||
<p>{_t(
|
||||
"Set a recovery passphrase to secure encrypted information and recover it if you log out. " +
|
||||
"This should be different to your account password:",
|
||||
)}</p>
|
||||
|
||||
<div className="mx_CreateSecretStorageDialog_passPhraseContainer">
|
||||
<PassphraseField
|
||||
className="mx_CreateSecretStorageDialog_passPhraseField"
|
||||
onChange={this._onPassPhraseChange}
|
||||
minScore={PASSWORD_MIN_SCORE}
|
||||
value={this.state.passPhrase}
|
||||
onValidate={this._onPassPhraseValidate}
|
||||
fieldRef={this._passphraseField}
|
||||
autoFocus={true}
|
||||
label={_td("Enter a recovery passphrase")}
|
||||
labelEnterPassword={_td("Enter a recovery passphrase")}
|
||||
labelStrongPassword={_td("Great! This recovery passphrase looks strong enough.")}
|
||||
labelAllowedButUnsafe={_td("Great! This recovery passphrase looks strong enough.")}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<LabelledToggleSwitch
|
||||
label={ _t("Back up encrypted message keys")}
|
||||
onChange={this._onUseKeyBackupChange} value={this.state.useKeyBackup}
|
||||
/>
|
||||
|
||||
<DialogButtons
|
||||
primaryButton={_t('Continue')}
|
||||
onPrimaryButtonClick={this._onPassPhraseNextClick}
|
||||
hasCancel={false}
|
||||
/>;
|
||||
} else {
|
||||
continueButton = <div className="mx_CreateSecretStorageDialog_continueSpinner">
|
||||
<InlineSpinner />
|
||||
</div>;
|
||||
disabled={!this.state.passPhraseValid}
|
||||
>
|
||||
<button type="button"
|
||||
onClick={this._onSkipSetupClick}
|
||||
className="danger"
|
||||
>{_t("Skip")}</button>
|
||||
</DialogButtons>
|
||||
|
||||
<details>
|
||||
<summary>{_t("Advanced")}</summary>
|
||||
<AccessibleButton kind='primary' onClick={this._onSkipPassPhraseClick} >
|
||||
{_t("Set up with a recovery key")}
|
||||
</AccessibleButton>
|
||||
</details>
|
||||
</form>;
|
||||
}
|
||||
|
||||
_renderPhasePassPhraseConfirm() {
|
||||
const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
|
||||
const Field = sdk.getComponent('views.elements.Field');
|
||||
|
||||
let matchText;
|
||||
let changeText;
|
||||
if (this.state.passPhraseConfirm === this.state.passPhrase) {
|
||||
matchText = _t("That matches!");
|
||||
changeText = _t("Use a different passphrase?");
|
||||
} else if (!this.state.passPhrase.startsWith(this.state.passPhraseConfirm)) {
|
||||
// only tell them they're wrong if they've actually gone wrong.
|
||||
// Security concious readers will note that if you left riot-web unattended
|
||||
// on this screen, this would make it easy for a malicious person to guess
|
||||
// your passphrase one letter at a time, but they could get this faster by
|
||||
// just opening the browser's developer tools and reading it.
|
||||
// Note that not having typed anything at all will not hit this clause and
|
||||
// fall through so empty box === no hint.
|
||||
matchText = _t("That doesn't match.");
|
||||
changeText = _t("Go back to set it again.");
|
||||
}
|
||||
|
||||
let passPhraseMatch = null;
|
||||
if (matchText) {
|
||||
passPhraseMatch = <div>
|
||||
<div>{matchText}</div>
|
||||
<div>
|
||||
<AccessibleButton element="span" className="mx_linkButton" onClick={this._onSetAgainClick}>
|
||||
{changeText}
|
||||
</AccessibleButton>
|
||||
</div>
|
||||
</div>;
|
||||
}
|
||||
const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
|
||||
return <form onSubmit={this._onPassPhraseConfirmNextClick}>
|
||||
<p>{_t(
|
||||
"Enter your recovery passphrase a second time to confirm it.",
|
||||
)}</p>
|
||||
<div className="mx_CreateSecretStorageDialog_passPhraseContainer">
|
||||
<Field
|
||||
type="password"
|
||||
onChange={this._onPassPhraseConfirmChange}
|
||||
value={this.state.passPhraseConfirm}
|
||||
className="mx_CreateSecretStorageDialog_passPhraseField"
|
||||
label={_t("Confirm your recovery passphrase")}
|
||||
autoFocus={true}
|
||||
autoComplete="new-password"
|
||||
/>
|
||||
<div className="mx_CreateSecretStorageDialog_passPhraseMatch">
|
||||
{passPhraseMatch}
|
||||
</div>
|
||||
</div>
|
||||
<DialogButtons
|
||||
primaryButton={_t('Continue')}
|
||||
onPrimaryButtonClick={this._onPassPhraseConfirmNextClick}
|
||||
hasCancel={false}
|
||||
disabled={this.state.passPhrase !== this.state.passPhraseConfirm}
|
||||
>
|
||||
<button type="button"
|
||||
onClick={this._onSkipSetupClick}
|
||||
className="danger"
|
||||
>{_t("Skip")}</button>
|
||||
</DialogButtons>
|
||||
</form>;
|
||||
}
|
||||
|
||||
_renderPhaseShowKey() {
|
||||
const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
|
||||
return <div>
|
||||
<p>{_t(
|
||||
"Store your Recovery Key somewhere safe, it can be used to unlock your encrypted messages & data.",
|
||||
"Your recovery key is a safety net - you can use it to restore " +
|
||||
"access to your encrypted messages if you forget your recovery passphrase.",
|
||||
)}</p>
|
||||
<p>{_t(
|
||||
"Keep a copy of it somewhere secure, like a password manager or even a safe.",
|
||||
)}</p>
|
||||
<div className="mx_CreateSecretStorageDialog_primaryContainer">
|
||||
<div className="mx_CreateSecretStorageDialog_recoveryKeyHeader">
|
||||
{_t("Your recovery key")}
|
||||
</div>
|
||||
<div className="mx_CreateSecretStorageDialog_recoveryKeyContainer">
|
||||
<div className="mx_CreateSecretStorageDialog_recoveryKey">
|
||||
<code ref={this._collectRecoveryKeyNode}>{this._recoveryKey.encodedPrivateKey}</code>
|
||||
</div>
|
||||
<div className="mx_CreateSecretStorageDialog_recoveryKeyButtons">
|
||||
<AccessibleButton kind='primary' className="mx_Dialog_primary"
|
||||
onClick={this._onDownloadClick}
|
||||
disabled={this.state.phase === PHASE_STORING}
|
||||
>
|
||||
{_t("Download")}
|
||||
</AccessibleButton>
|
||||
<span>{_t("or")}</span>
|
||||
<AccessibleButton
|
||||
kind='primary'
|
||||
className="mx_Dialog_primary mx_CreateSecretStorageDialog_recoveryKeyButtons_copyBtn"
|
||||
onClick={this._onCopyClick}
|
||||
disabled={this.state.phase === PHASE_STORING}
|
||||
>
|
||||
{this.state.copied ? _t("Copied!") : _t("Copy")}
|
||||
{_t("Copy")}
|
||||
</AccessibleButton>
|
||||
<AccessibleButton kind='primary' className="mx_Dialog_primary" onClick={this._onDownloadClick}>
|
||||
{_t("Download")}
|
||||
</AccessibleButton>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{continueButton}
|
||||
</div>;
|
||||
}
|
||||
|
||||
_renderPhaseKeepItSafe() {
|
||||
let introText;
|
||||
if (this.state.copied) {
|
||||
introText = _t(
|
||||
"Your recovery key has been <b>copied to your clipboard</b>, paste it to:",
|
||||
{}, {b: s => <b>{s}</b>},
|
||||
);
|
||||
} else if (this.state.downloaded) {
|
||||
introText = _t(
|
||||
"Your recovery key is in your <b>Downloads</b> folder.",
|
||||
{}, {b: s => <b>{s}</b>},
|
||||
);
|
||||
}
|
||||
const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
|
||||
return <div>
|
||||
{introText}
|
||||
<ul>
|
||||
<li>{_t("<b>Print it</b> and store it somewhere safe", {}, {b: s => <b>{s}</b>})}</li>
|
||||
<li>{_t("<b>Save it</b> on a USB key or backup drive", {}, {b: s => <b>{s}</b>})}</li>
|
||||
<li>{_t("<b>Copy it</b> to your personal cloud storage", {}, {b: s => <b>{s}</b>})}</li>
|
||||
</ul>
|
||||
<DialogButtons primaryButton={_t("Continue")}
|
||||
onPrimaryButtonClick={this._bootstrapSecretStorage}
|
||||
hasCancel={false}>
|
||||
<button onClick={this._onKeepItSafeBackClick}>{_t("Back")}</button>
|
||||
</DialogButtons>
|
||||
</div>;
|
||||
}
|
||||
|
||||
|
|
@ -483,6 +671,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
|
|||
}
|
||||
|
||||
_renderPhaseLoadError() {
|
||||
const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
|
||||
return <div>
|
||||
<p>{_t("Unable to query secret storage status")}</p>
|
||||
<div className="mx_Dialog_buttons">
|
||||
|
|
@ -495,44 +684,29 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
|
|||
</div>;
|
||||
}
|
||||
|
||||
_renderPhaseIntro() {
|
||||
let cancelButton;
|
||||
if (this.props.force) {
|
||||
// if this is a forced key reset then aborting will just leave the old keys
|
||||
// in place, and is thereforece just 'cancel'
|
||||
cancelButton = <button type="button" onClick={this._onCancel}>{_t('Cancel')}</button>;
|
||||
} else {
|
||||
// if it's setting up from scratch then aborting leaves the user without
|
||||
// crypto set up, so they skipping the setup.
|
||||
cancelButton = <button type="button"
|
||||
className="danger" onClick={this._onSkipSetupClick}
|
||||
>{_t('Skip')}</button>;
|
||||
}
|
||||
|
||||
_renderPhaseDone() {
|
||||
const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
|
||||
return <div>
|
||||
<p>{_t(
|
||||
"Create a Recovery Key to store encryption keys & secrets with your account data. " +
|
||||
"If you lose access to this login you’ll need it to unlock your data.",
|
||||
"You can now verify your other devices, " +
|
||||
"and other users to keep your chats safe.",
|
||||
)}</p>
|
||||
<div className="mx_Dialog_buttons">
|
||||
<DialogButtons primaryButton={_t('Continue')}
|
||||
onPrimaryButtonClick={this._onIntroContinueClick}
|
||||
hasCancel={false}
|
||||
>
|
||||
{cancelButton}
|
||||
</DialogButtons>
|
||||
</div>
|
||||
<DialogButtons primaryButton={_t('OK')}
|
||||
onPrimaryButtonClick={this._onDone}
|
||||
hasCancel={false}
|
||||
/>
|
||||
</div>;
|
||||
}
|
||||
|
||||
_renderPhaseSkipConfirm() {
|
||||
const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
|
||||
return <div>
|
||||
{_t(
|
||||
"Without completing security on this session, it won’t have " +
|
||||
"access to encrypted messages.",
|
||||
)}
|
||||
<DialogButtons primaryButton={_t('Go back')}
|
||||
onPrimaryButtonClick={this._onGoBackClick}
|
||||
onPrimaryButtonClick={this._onSetUpClick}
|
||||
hasCancel={false}
|
||||
>
|
||||
<button type="button" className="danger" onClick={this._onCancel}>{_t('Skip')}</button>
|
||||
|
|
@ -542,15 +716,21 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
|
|||
|
||||
_titleForPhase(phase) {
|
||||
switch (phase) {
|
||||
case PHASE_INTRO:
|
||||
return _t('Create a Recovery Key');
|
||||
case PHASE_MIGRATE:
|
||||
return _t('Upgrade your Recovery Key');
|
||||
return _t('Upgrade your encryption');
|
||||
case PHASE_PASSPHRASE:
|
||||
return _t('Set up encryption');
|
||||
case PHASE_PASSPHRASE_CONFIRM:
|
||||
return _t('Confirm recovery passphrase');
|
||||
case PHASE_CONFIRM_SKIP:
|
||||
return _t('Are you sure?');
|
||||
case PHASE_SHOWKEY:
|
||||
case PHASE_KEEPITSAFE:
|
||||
return _t('Make a copy of your recovery key');
|
||||
case PHASE_STORING:
|
||||
return _t('Store your Recovery Key');
|
||||
return _t('Setting up keys');
|
||||
case PHASE_DONE:
|
||||
return _t("You're done!");
|
||||
default:
|
||||
return '';
|
||||
}
|
||||
|
|
@ -561,6 +741,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
|
|||
|
||||
let content;
|
||||
if (this.state.error) {
|
||||
const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
|
||||
content = <div>
|
||||
<p>{_t("Unable to set up secret storage")}</p>
|
||||
<div className="mx_Dialog_buttons">
|
||||
|
|
@ -579,16 +760,27 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
|
|||
case PHASE_LOADERROR:
|
||||
content = this._renderPhaseLoadError();
|
||||
break;
|
||||
case PHASE_INTRO:
|
||||
content = this._renderPhaseIntro();
|
||||
break;
|
||||
case PHASE_MIGRATE:
|
||||
content = this._renderPhaseMigrate();
|
||||
break;
|
||||
case PHASE_PASSPHRASE:
|
||||
content = this._renderPhasePassPhrase();
|
||||
break;
|
||||
case PHASE_PASSPHRASE_CONFIRM:
|
||||
content = this._renderPhasePassPhraseConfirm();
|
||||
break;
|
||||
case PHASE_SHOWKEY:
|
||||
case PHASE_STORING:
|
||||
content = this._renderPhaseShowKey();
|
||||
break;
|
||||
case PHASE_KEEPITSAFE:
|
||||
content = this._renderPhaseKeepItSafe();
|
||||
break;
|
||||
case PHASE_STORING:
|
||||
content = this._renderBusyPhase();
|
||||
break;
|
||||
case PHASE_DONE:
|
||||
content = this._renderPhaseDone();
|
||||
break;
|
||||
case PHASE_CONFIRM_SKIP:
|
||||
content = this._renderPhaseSkipConfirm();
|
||||
break;
|
||||
|
|
@ -605,7 +797,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
|
|||
onFinished={this.props.onFinished}
|
||||
title={this._titleForPhase(this.state.phase)}
|
||||
headerImage={headerImage}
|
||||
hasCancel={this.props.hasCancel}
|
||||
hasCancel={this.props.hasCancel && [PHASE_PASSPHRASE].includes(this.state.phase)}
|
||||
fixedWidth={false}
|
||||
>
|
||||
<div>
|
||||
|
|
|
|||
|
|
@ -35,15 +35,15 @@ export interface ISelectionRange {
|
|||
|
||||
export interface ICompletion {
|
||||
type: "at-room" | "command" | "community" | "room" | "user";
|
||||
completion: string,
|
||||
completion: string;
|
||||
completionId?: string;
|
||||
component?: ReactElement,
|
||||
range: ISelectionRange,
|
||||
command?: string,
|
||||
component?: ReactElement;
|
||||
range: ISelectionRange;
|
||||
command?: string;
|
||||
suffix?: string;
|
||||
// If provided, apply a LINK entity to the completion with the
|
||||
// data = { url: href }.
|
||||
href?: string,
|
||||
href?: string;
|
||||
}
|
||||
|
||||
const PROVIDERS = [
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ export const TextualCompletion = forwardRef<ITextualCompletionProps, any>((props
|
|||
});
|
||||
|
||||
interface IPillCompletionProps extends ITextualCompletionProps {
|
||||
children?: React.ReactNode,
|
||||
children?: React.ReactNode;
|
||||
}
|
||||
|
||||
export const PillCompletion = forwardRef<IPillCompletionProps, any>((props, ref) => {
|
||||
|
|
|
|||
|
|
@ -17,8 +17,6 @@ limitations under the License.
|
|||
*/
|
||||
|
||||
import _at from 'lodash/at';
|
||||
import _flatMap from 'lodash/flatMap';
|
||||
import _sortBy from 'lodash/sortBy';
|
||||
import _uniq from 'lodash/uniq';
|
||||
|
||||
function stripDiacritics(str: string): string {
|
||||
|
|
@ -35,8 +33,9 @@ interface IOptions<T extends {}> {
|
|||
/**
|
||||
* Simple search matcher that matches any results with the query string anywhere
|
||||
* in the search string. Returns matches in the order the query string appears
|
||||
* in the search key, earliest first, then in the order the items appeared in
|
||||
* the source array.
|
||||
* in the search key, earliest first, then in the order the search key appears
|
||||
* in the provided array of keys, then in the order the items appeared in the
|
||||
* source array.
|
||||
*
|
||||
* @param {Object[]} objects Initial list of objects. Equivalent to calling
|
||||
* setObjects() after construction
|
||||
|
|
@ -49,7 +48,7 @@ export default class QueryMatcher<T extends Object> {
|
|||
private _options: IOptions<T>;
|
||||
private _keys: IOptions<T>["keys"];
|
||||
private _funcs: Required<IOptions<T>["funcs"]>;
|
||||
private _items: Map<string, T[]>;
|
||||
private _items: Map<string, {object: T, keyWeight: number}[]>;
|
||||
|
||||
constructor(objects: T[], options: IOptions<T> = { keys: [] }) {
|
||||
this._options = options;
|
||||
|
|
@ -85,13 +84,16 @@ export default class QueryMatcher<T extends Object> {
|
|||
keyValues.push(f(object));
|
||||
}
|
||||
|
||||
for (const keyValue of keyValues) {
|
||||
for (const [index, keyValue] of Object.entries(keyValues)) {
|
||||
if (!keyValue) continue; // skip falsy keyValues
|
||||
const key = stripDiacritics(keyValue).toLowerCase();
|
||||
if (!this._items.has(key)) {
|
||||
this._items.set(key, []);
|
||||
}
|
||||
this._items.get(key).push(object);
|
||||
this._items.get(key).push({
|
||||
keyWeight: Number(index),
|
||||
object,
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -104,32 +106,40 @@ export default class QueryMatcher<T extends Object> {
|
|||
if (query.length === 0) {
|
||||
return [];
|
||||
}
|
||||
const results = [];
|
||||
const matches = [];
|
||||
// Iterate through the map & check each key.
|
||||
// ES6 Map iteration order is defined to be insertion order, so results
|
||||
// here will come out in the order they were put in.
|
||||
for (const key of this._items.keys()) {
|
||||
for (const [key, candidates] of this._items.entries()) {
|
||||
let resultKey = key;
|
||||
if (this._options.shouldMatchWordsOnly) {
|
||||
resultKey = resultKey.replace(/[^\w]/g, '');
|
||||
}
|
||||
const index = resultKey.indexOf(query);
|
||||
if (index !== -1 && (!this._options.shouldMatchPrefix || index === 0)) {
|
||||
results.push({key, index});
|
||||
matches.push(
|
||||
...candidates.map((candidate) => ({index, ...candidate}))
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// Sort them by where the query appeared in the search key
|
||||
// lodash sortBy is a stable sort, so results where the query
|
||||
// appeared in the same place will retain their order with
|
||||
// respect to each other.
|
||||
const sortedResults = _sortBy(results, (candidate) => {
|
||||
return candidate.index;
|
||||
// Sort matches by where the query appeared in the search key, then by
|
||||
// where the matched key appeared in the provided array of keys.
|
||||
matches.sort((a, b) => {
|
||||
if (a.index < b.index) {
|
||||
return -1;
|
||||
} else if (a.index === b.index) {
|
||||
if (a.keyWeight < b.keyWeight) {
|
||||
return -1;
|
||||
} else if (a.keyWeight === b.keyWeight) {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
return 1;
|
||||
});
|
||||
|
||||
// Now map the keys to the result objects. Each result object is a list, so
|
||||
// flatMap will flatten those lists out into a single list. Also remove any
|
||||
// duplicates.
|
||||
return _uniq(_flatMap(sortedResults, (candidate) => this._items.get(candidate.key)));
|
||||
// Now map the keys to the result objects. Also remove any duplicates.
|
||||
return _uniq(matches.map((match) => match.object));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@ limitations under the License.
|
|||
*/
|
||||
|
||||
import * as React from "react";
|
||||
import { createRef } from "react";
|
||||
import TagPanel from "./TagPanel";
|
||||
import classNames from "classnames";
|
||||
import dis from "../../dispatcher/dispatcher";
|
||||
import { _t } from "../../languageHandler";
|
||||
import SearchBox from "./SearchBox";
|
||||
import RoomList2 from "../views/rooms/RoomList2";
|
||||
import { Action } from "../../dispatcher/actions";
|
||||
import { MatrixClientPeg } from "../../MatrixClientPeg";
|
||||
|
|
@ -30,6 +30,10 @@ import AccessibleButton from "../views/elements/AccessibleButton";
|
|||
import RoomBreadcrumbs2 from "../views/rooms/RoomBreadcrumbs2";
|
||||
import { BreadcrumbsStore } from "../../stores/BreadcrumbsStore";
|
||||
import { UPDATE_EVENT } from "../../stores/AsyncStore";
|
||||
import ResizeNotifier from "../../utils/ResizeNotifier";
|
||||
import { MatrixEvent } from "matrix-js-sdk/src/models/event";
|
||||
import { throttle } from 'lodash';
|
||||
import { OwnProfileStore } from "../../stores/OwnProfileStore";
|
||||
|
||||
/*******************************************************************
|
||||
* CAUTION *
|
||||
|
|
@ -41,6 +45,7 @@ import { UPDATE_EVENT } from "../../stores/AsyncStore";
|
|||
|
||||
interface IProps {
|
||||
isMinimized: boolean;
|
||||
resizeNotifier: ResizeNotifier;
|
||||
}
|
||||
|
||||
interface IState {
|
||||
|
|
@ -49,6 +54,8 @@ interface IState {
|
|||
}
|
||||
|
||||
export default class LeftPanel2 extends React.Component<IProps, IState> {
|
||||
private listContainerRef: React.RefObject<HTMLDivElement> = createRef();
|
||||
|
||||
// TODO: Properly support TagPanel
|
||||
// TODO: Properly support searching/filtering
|
||||
// TODO: Properly support breadcrumbs
|
||||
|
|
@ -65,12 +72,36 @@ export default class LeftPanel2 extends React.Component<IProps, IState> {
|
|||
};
|
||||
|
||||
BreadcrumbsStore.instance.on(UPDATE_EVENT, this.onBreadcrumbsUpdate);
|
||||
|
||||
// We watch the middle panel because we don't actually get resized, the middle panel does.
|
||||
// We listen to the noisy channel to avoid choppy reaction times.
|
||||
this.props.resizeNotifier.on("middlePanelResizedNoisy", this.onResize);
|
||||
|
||||
OwnProfileStore.instance.on(UPDATE_EVENT, this.onProfileUpdate);
|
||||
}
|
||||
|
||||
public componentWillUnmount() {
|
||||
BreadcrumbsStore.instance.off(UPDATE_EVENT, this.onBreadcrumbsUpdate);
|
||||
this.props.resizeNotifier.off("middlePanelResizedNoisy", this.onResize);
|
||||
OwnProfileStore.instance.off(UPDATE_EVENT, this.onProfileUpdate);
|
||||
}
|
||||
|
||||
// TSLint wants this to be a member, but we don't want that.
|
||||
// tslint:disable-next-line
|
||||
private onRoomStateUpdate = throttle((ev: MatrixEvent) => {
|
||||
const myUserId = MatrixClientPeg.get().getUserId();
|
||||
if (ev.getType() === 'm.room.member' && ev.getSender() === myUserId && ev.getStateKey() === myUserId) {
|
||||
// noinspection JSIgnoredPromiseFromCall
|
||||
this.onProfileUpdate();
|
||||
}
|
||||
}, 200, {trailing: true, leading: true});
|
||||
|
||||
private onProfileUpdate = async () => {
|
||||
// the store triggered an update, so force a layout update. We don't
|
||||
// have any state to store here for that to magically happen.
|
||||
this.forceUpdate();
|
||||
};
|
||||
|
||||
private onSearch = (term: string): void => {
|
||||
this.setState({searchFilter: term});
|
||||
};
|
||||
|
|
@ -86,21 +117,60 @@ export default class LeftPanel2 extends React.Component<IProps, IState> {
|
|||
}
|
||||
};
|
||||
|
||||
private handleStickyHeaders(list: HTMLDivElement) {
|
||||
const rlRect = list.getBoundingClientRect();
|
||||
const bottom = rlRect.bottom;
|
||||
const top = rlRect.top;
|
||||
const sublists = list.querySelectorAll<HTMLDivElement>(".mx_RoomSublist2");
|
||||
const headerHeight = 32; // Note: must match the CSS!
|
||||
const headerRightMargin = 24; // calculated from margins and widths to align with non-sticky tiles
|
||||
|
||||
const headerStickyWidth = rlRect.width - headerRightMargin;
|
||||
|
||||
let gotBottom = false;
|
||||
for (const sublist of sublists) {
|
||||
const slRect = sublist.getBoundingClientRect();
|
||||
|
||||
const header = sublist.querySelector<HTMLDivElement>(".mx_RoomSublist2_stickable");
|
||||
|
||||
if (slRect.top + headerHeight > bottom && !gotBottom) {
|
||||
header.classList.add("mx_RoomSublist2_headerContainer_sticky");
|
||||
header.classList.add("mx_RoomSublist2_headerContainer_stickyBottom");
|
||||
header.style.width = `${headerStickyWidth}px`;
|
||||
header.style.top = `unset`;
|
||||
gotBottom = true;
|
||||
} else if (slRect.top < top) {
|
||||
header.classList.add("mx_RoomSublist2_headerContainer_sticky");
|
||||
header.classList.add("mx_RoomSublist2_headerContainer_stickyTop");
|
||||
header.style.width = `${headerStickyWidth}px`;
|
||||
header.style.top = `${rlRect.top}px`;
|
||||
} else {
|
||||
header.classList.remove("mx_RoomSublist2_headerContainer_sticky");
|
||||
header.classList.remove("mx_RoomSublist2_headerContainer_stickyTop");
|
||||
header.classList.remove("mx_RoomSublist2_headerContainer_stickyBottom");
|
||||
header.style.width = `unset`;
|
||||
header.style.top = `unset`;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: Apply this on resize, init, etc for reliability
|
||||
private onScroll = (ev: React.MouseEvent<HTMLDivElement>) => {
|
||||
const list = ev.target as HTMLDivElement;
|
||||
this.handleStickyHeaders(list);
|
||||
};
|
||||
|
||||
private onResize = () => {
|
||||
if (!this.listContainerRef.current) return; // ignore: no headers to sticky
|
||||
this.handleStickyHeaders(this.listContainerRef.current);
|
||||
};
|
||||
|
||||
private renderHeader(): React.ReactNode {
|
||||
// TODO: Update when profile info changes
|
||||
// TODO: Presence
|
||||
// TODO: Breadcrumbs toggle
|
||||
// TODO: Menu button
|
||||
const avatarSize = 32;
|
||||
// TODO: Don't do this profile lookup in render()
|
||||
const client = MatrixClientPeg.get();
|
||||
let displayName = client.getUserId();
|
||||
let avatarUrl: string = null;
|
||||
const myUser = client.getUser(client.getUserId());
|
||||
if (myUser) {
|
||||
displayName = myUser.rawDisplayName;
|
||||
avatarUrl = myUser.avatarUrl;
|
||||
}
|
||||
const avatarSize = 32; // should match border-radius of the avatar
|
||||
|
||||
let breadcrumbs;
|
||||
if (this.state.showBreadcrumbs) {
|
||||
|
|
@ -111,7 +181,7 @@ export default class LeftPanel2 extends React.Component<IProps, IState> {
|
|||
);
|
||||
}
|
||||
|
||||
let name = <span className="mx_LeftPanel2_userName">{displayName}</span>;
|
||||
let name = <span className="mx_LeftPanel2_userName">{OwnProfileStore.instance.displayName}</span>;
|
||||
let buttons = (
|
||||
<span className="mx_LeftPanel2_headerButtons">
|
||||
<UserMenuButton />
|
||||
|
|
@ -128,8 +198,8 @@ export default class LeftPanel2 extends React.Component<IProps, IState> {
|
|||
<span className="mx_LeftPanel2_userAvatarContainer">
|
||||
<BaseAvatar
|
||||
idName={MatrixClientPeg.get().getUserId()}
|
||||
name={displayName}
|
||||
url={avatarUrl}
|
||||
name={OwnProfileStore.instance.displayName || MatrixClientPeg.get().getUserId()}
|
||||
url={OwnProfileStore.instance.getHttpAvatarUrl(avatarSize)}
|
||||
width={avatarSize}
|
||||
height={avatarSize}
|
||||
resizeMethod="crop"
|
||||
|
|
@ -191,9 +261,11 @@ export default class LeftPanel2 extends React.Component<IProps, IState> {
|
|||
<aside className="mx_LeftPanel2_roomListContainer">
|
||||
{this.renderHeader()}
|
||||
{this.renderSearchExplore()}
|
||||
<div className="mx_LeftPanel2_actualRoomListContainer">
|
||||
{roomList}
|
||||
</div>
|
||||
<div
|
||||
className="mx_LeftPanel2_actualRoomListContainer"
|
||||
onScroll={this.onScroll}
|
||||
ref={this.listContainerRef}
|
||||
>{roomList}</div>
|
||||
</aside>
|
||||
</div>
|
||||
);
|
||||
|
|
|
|||
|
|
@ -677,7 +677,10 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
|
|||
if (SettingsStore.isFeatureEnabled("feature_new_room_list")) {
|
||||
// TODO: Supply props like collapsed and disabled to LeftPanel2
|
||||
leftPanel = (
|
||||
<LeftPanel2 isMinimized={this.props.collapseLhs || false} />
|
||||
<LeftPanel2
|
||||
isMinimized={this.props.collapseLhs || false}
|
||||
resizeNotifier={this.props.resizeNotifier}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -151,9 +151,9 @@ interface IProps { // TODO type things better
|
|||
// Represents the screen to display as a result of parsing the initial window.location
|
||||
initialScreenAfterLogin?: IScreen;
|
||||
// displayname, if any, to set on the device when logging in/registering.
|
||||
defaultDeviceDisplayName?: string,
|
||||
defaultDeviceDisplayName?: string;
|
||||
// A function that makes a registration URL
|
||||
makeRegistrationUrl: (object) => string,
|
||||
makeRegistrationUrl: (object) => string;
|
||||
}
|
||||
|
||||
interface IState {
|
||||
|
|
@ -1870,42 +1870,35 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
|
|||
this.accountPasswordTimer = null;
|
||||
}, 60 * 5 * 1000);
|
||||
|
||||
// Wait for the client to be logged in (but not started)
|
||||
// which is enough to ask the server about account data.
|
||||
const loggedIn = new Promise(resolve => {
|
||||
const actionHandlerRef = dis.register(payload => {
|
||||
if (payload.action !== "on_logged_in") {
|
||||
return;
|
||||
}
|
||||
dis.unregister(actionHandlerRef);
|
||||
resolve();
|
||||
});
|
||||
});
|
||||
|
||||
// Create and start the client in the background
|
||||
const setLoggedInPromise = Lifecycle.setLoggedIn(credentials);
|
||||
await loggedIn;
|
||||
// Create and start the client
|
||||
await Lifecycle.setLoggedIn(credentials);
|
||||
|
||||
const cli = MatrixClientPeg.get();
|
||||
// We're checking `isCryptoAvailable` here instead of `isCryptoEnabled`
|
||||
// because the client hasn't been started yet.
|
||||
const cryptoAvailable = isCryptoAvailable();
|
||||
if (!cryptoAvailable) {
|
||||
const cryptoEnabled = cli.isCryptoEnabled();
|
||||
if (!cryptoEnabled) {
|
||||
this.onLoggedIn();
|
||||
}
|
||||
|
||||
this.setState({ pendingInitialSync: true });
|
||||
await this.firstSyncPromise.promise;
|
||||
|
||||
if (!cryptoAvailable) {
|
||||
this.setState({ pendingInitialSync: false });
|
||||
return setLoggedInPromise;
|
||||
const promisesList = [this.firstSyncPromise.promise];
|
||||
if (cryptoEnabled) {
|
||||
// wait for the client to finish downloading cross-signing keys for us so we
|
||||
// know whether or not we have keys set up on this account
|
||||
promisesList.push(cli.downloadKeys([cli.getUserId()]));
|
||||
}
|
||||
|
||||
// Test for the master cross-signing key in SSSS as a quick proxy for
|
||||
// whether cross-signing has been set up on the account.
|
||||
const masterKeyInStorage = !!cli.getAccountData("m.cross_signing.master");
|
||||
if (masterKeyInStorage) {
|
||||
// Now update the state to say we're waiting for the first sync to complete rather
|
||||
// than for the login to finish.
|
||||
this.setState({ pendingInitialSync: true });
|
||||
|
||||
await Promise.all(promisesList);
|
||||
|
||||
if (!cryptoEnabled) {
|
||||
this.setState({ pendingInitialSync: false });
|
||||
return;
|
||||
}
|
||||
|
||||
const crossSigningIsSetUp = cli.getStoredCrossSigningForUser(cli.getUserId());
|
||||
if (crossSigningIsSetUp) {
|
||||
this.setStateForNewView({ view: Views.COMPLETE_SECURITY });
|
||||
} else if (await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing")) {
|
||||
this.setStateForNewView({ view: Views.E2E_SETUP });
|
||||
|
|
@ -1913,8 +1906,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
|
|||
this.onLoggedIn();
|
||||
}
|
||||
this.setState({ pendingInitialSync: false });
|
||||
|
||||
return setLoggedInPromise;
|
||||
};
|
||||
|
||||
// complete security / e2e setup has finished
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ import Tinter from '../../Tinter';
|
|||
import rate_limited_func from '../../ratelimitedfunc';
|
||||
import * as ObjectUtils from '../../ObjectUtils';
|
||||
import * as Rooms from '../../Rooms';
|
||||
import eventSearch from '../../Searching';
|
||||
import eventSearch, {searchPagination} from '../../Searching';
|
||||
|
||||
import {isOnlyCtrlOrCmdIgnoreShiftKeyEvent, isOnlyCtrlOrCmdKeyEvent, Key} from '../../Keyboard';
|
||||
|
||||
|
|
@ -166,7 +166,7 @@ export default createReactClass({
|
|||
canReact: false,
|
||||
canReply: false,
|
||||
|
||||
useIRCLayout: SettingsStore.getValue("feature_irc_ui"),
|
||||
useIRCLayout: SettingsStore.getValue("useIRCLayout"),
|
||||
|
||||
matrixClientIsReady: this.context && this.context.isInitialSyncComplete(),
|
||||
};
|
||||
|
|
@ -199,7 +199,7 @@ export default createReactClass({
|
|||
this._roomView = createRef();
|
||||
this._searchResultsPanel = createRef();
|
||||
|
||||
this._layoutWatcherRef = SettingsStore.watchSetting("feature_irc_ui", null, this.onLayoutChange);
|
||||
this._layoutWatcherRef = SettingsStore.watchSetting("useIRCLayout", null, this.onLayoutChange);
|
||||
},
|
||||
|
||||
_onReadReceiptsChange: function() {
|
||||
|
|
@ -546,7 +546,7 @@ export default createReactClass({
|
|||
|
||||
onLayoutChange: function() {
|
||||
this.setState({
|
||||
useIRCLayout: SettingsStore.getValue("feature_irc_ui"),
|
||||
useIRCLayout: SettingsStore.getValue("useIRCLayout"),
|
||||
});
|
||||
},
|
||||
|
||||
|
|
@ -1036,8 +1036,7 @@ export default createReactClass({
|
|||
|
||||
if (this.state.searchResults.next_batch) {
|
||||
debuglog("requesting more search results");
|
||||
const searchPromise = this.context.backPaginateRoomEventsSearch(
|
||||
this.state.searchResults);
|
||||
const searchPromise = searchPagination(this.state.searchResults);
|
||||
return this._handleSearchResult(searchPromise);
|
||||
} else {
|
||||
debuglog("no more search results");
|
||||
|
|
@ -1314,6 +1313,14 @@ export default createReactClass({
|
|||
const mxEv = result.context.getEvent();
|
||||
const roomId = mxEv.getRoomId();
|
||||
const room = this.context.getRoom(roomId);
|
||||
if (!room) {
|
||||
// if we do not have the room in js-sdk stores then hide it as we cannot easily show it
|
||||
// As per the spec, an all rooms search can create this condition,
|
||||
// it happens with Seshat but not Synapse.
|
||||
// It will make the result count not match the displayed count.
|
||||
console.log("Hiding search result from an unknown room", roomId);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (!haveTileForEvent(mxEv)) {
|
||||
// XXX: can this ever happen? It will make the result count
|
||||
|
|
@ -1322,16 +1329,9 @@ export default createReactClass({
|
|||
}
|
||||
|
||||
if (this.state.searchScope === 'All') {
|
||||
if (roomId != lastRoomId) {
|
||||
|
||||
// XXX: if we've left the room, we might not know about
|
||||
// it. We should tell the js sdk to go and find out about
|
||||
// it. But that's not an issue currently, as synapse only
|
||||
// returns results for rooms we're joined to.
|
||||
const roomName = room ? room.name : _t("Unknown room %(roomId)s", { roomId: roomId });
|
||||
|
||||
if (roomId !== lastRoomId) {
|
||||
ret.push(<li key={mxEv.getId() + "-room"}>
|
||||
<h2>{ _t("Room") }: { roomName }</h2>
|
||||
<h2>{ _t("Room") }: { room.name }</h2>
|
||||
</li>);
|
||||
lastRoomId = roomId;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ limitations under the License.
|
|||
*/
|
||||
|
||||
import * as React from "react";
|
||||
import {User} from "matrix-js-sdk/src/models/user";
|
||||
import { MatrixClientPeg } from "../../MatrixClientPeg";
|
||||
import defaultDispatcher from "../../dispatcher/dispatcher";
|
||||
import { ActionPayload } from "../../dispatcher/payloads";
|
||||
|
|
@ -34,12 +33,13 @@ import {getHostingLink} from "../../utils/HostingLink";
|
|||
import AccessibleButton, {ButtonEvent} from "../views/elements/AccessibleButton";
|
||||
import SdkConfig from "../../SdkConfig";
|
||||
import {getHomePageUrl} from "../../utils/pages";
|
||||
import { OwnProfileStore } from "../../stores/OwnProfileStore";
|
||||
import { UPDATE_EVENT } from "../../stores/AsyncStore";
|
||||
|
||||
interface IProps {
|
||||
}
|
||||
|
||||
interface IState {
|
||||
user: User;
|
||||
menuDisplayed: boolean;
|
||||
isDarkTheme: boolean;
|
||||
}
|
||||
|
|
@ -54,19 +54,10 @@ export default class UserMenuButton extends React.Component<IProps, IState> {
|
|||
|
||||
this.state = {
|
||||
menuDisplayed: false,
|
||||
user: MatrixClientPeg.get().getUser(MatrixClientPeg.get().getUserId()),
|
||||
isDarkTheme: this.isUserOnDarkTheme(),
|
||||
};
|
||||
}
|
||||
|
||||
private get displayName(): string {
|
||||
if (MatrixClientPeg.get().isGuest()) {
|
||||
return _t("Guest");
|
||||
} else if (this.state.user) {
|
||||
return this.state.user.displayName;
|
||||
} else {
|
||||
return MatrixClientPeg.get().getUserId();
|
||||
}
|
||||
OwnProfileStore.instance.on(UPDATE_EVENT, this.onProfileUpdate);
|
||||
}
|
||||
|
||||
private get hasHomePage(): boolean {
|
||||
|
|
@ -81,6 +72,7 @@ export default class UserMenuButton extends React.Component<IProps, IState> {
|
|||
public componentWillUnmount() {
|
||||
if (this.themeWatcherRef) SettingsStore.unwatchSetting(this.themeWatcherRef);
|
||||
if (this.dispatcherRef) defaultDispatcher.unregister(this.dispatcherRef);
|
||||
OwnProfileStore.instance.off(UPDATE_EVENT, this.onProfileUpdate);
|
||||
}
|
||||
|
||||
private isUserOnDarkTheme(): boolean {
|
||||
|
|
@ -91,6 +83,12 @@ export default class UserMenuButton extends React.Component<IProps, IState> {
|
|||
return theme === "dark";
|
||||
}
|
||||
|
||||
private onProfileUpdate = async () => {
|
||||
// the store triggered an update, so force a layout update. We don't
|
||||
// have any state to store here for that to magically happen.
|
||||
this.forceUpdate();
|
||||
};
|
||||
|
||||
private onThemeChanged = () => {
|
||||
this.setState({isDarkTheme: this.isUserOnDarkTheme()});
|
||||
};
|
||||
|
|
@ -117,7 +115,7 @@ export default class UserMenuButton extends React.Component<IProps, IState> {
|
|||
SettingsStore.setValue("use_system_theme", null, SettingLevel.DEVICE, false);
|
||||
|
||||
const newTheme = this.state.isDarkTheme ? "light" : "dark";
|
||||
SettingsStore.setValue("theme", null, SettingLevel.ACCOUNT, newTheme);
|
||||
SettingsStore.setValue("theme", null, SettingLevel.DEVICE, newTheme); // set at same level as Appearance tab
|
||||
};
|
||||
|
||||
private onSettingsOpen = (ev: ButtonEvent, tabId: string) => {
|
||||
|
|
@ -190,7 +188,7 @@ export default class UserMenuButton extends React.Component<IProps, IState> {
|
|||
homeButton = (
|
||||
<li>
|
||||
<AccessibleButton onClick={this.onHomeClick}>
|
||||
<img src={require("../../../res/img/feather-customised/home.svg")} width={16} />
|
||||
<span className="mx_IconizedContextMenu_icon mx_UserMenuButton_iconHome" />
|
||||
<span>{_t("Home")}</span>
|
||||
</AccessibleButton>
|
||||
</li>
|
||||
|
|
@ -209,7 +207,7 @@ export default class UserMenuButton extends React.Component<IProps, IState> {
|
|||
<div className="mx_UserMenuButton_contextMenu_header">
|
||||
<div className="mx_UserMenuButton_contextMenu_name">
|
||||
<span className="mx_UserMenuButton_contextMenu_displayName">
|
||||
{this.displayName}
|
||||
{OwnProfileStore.instance.displayName}
|
||||
</span>
|
||||
<span className="mx_UserMenuButton_contextMenu_userId">
|
||||
{MatrixClientPeg.get().getUserId()}
|
||||
|
|
@ -233,31 +231,31 @@ export default class UserMenuButton extends React.Component<IProps, IState> {
|
|||
{homeButton}
|
||||
<li>
|
||||
<AccessibleButton onClick={(e) => this.onSettingsOpen(e, USER_NOTIFICATIONS_TAB)}>
|
||||
<img src={require("../../../res/img/feather-customised/notifications.svg")} width={16} />
|
||||
<span className="mx_IconizedContextMenu_icon mx_UserMenuButton_iconBell" />
|
||||
<span>{_t("Notification settings")}</span>
|
||||
</AccessibleButton>
|
||||
</li>
|
||||
<li>
|
||||
<AccessibleButton onClick={(e) => this.onSettingsOpen(e, USER_SECURITY_TAB)}>
|
||||
<img src={require("../../../res/img/feather-customised/lock.svg")} width={16} />
|
||||
<span className="mx_IconizedContextMenu_icon mx_UserMenuButton_iconLock" />
|
||||
<span>{_t("Security & privacy")}</span>
|
||||
</AccessibleButton>
|
||||
</li>
|
||||
<li>
|
||||
<AccessibleButton onClick={(e) => this.onSettingsOpen(e, null)}>
|
||||
<img src={require("../../../res/img/feather-customised/settings.svg")} width={16} />
|
||||
<span className="mx_IconizedContextMenu_icon mx_UserMenuButton_iconSettings" />
|
||||
<span>{_t("All settings")}</span>
|
||||
</AccessibleButton>
|
||||
</li>
|
||||
<li>
|
||||
<AccessibleButton onClick={this.onShowArchived}>
|
||||
<img src={require("../../../res/img/feather-customised/archive.svg")} width={16} />
|
||||
<span className="mx_IconizedContextMenu_icon mx_UserMenuButton_iconArchive" />
|
||||
<span>{_t("Archived rooms")}</span>
|
||||
</AccessibleButton>
|
||||
</li>
|
||||
<li>
|
||||
<AccessibleButton onClick={this.onProvideFeedback}>
|
||||
<img src={require("../../../res/img/feather-customised/message-circle.svg")} width={16} />
|
||||
<span className="mx_IconizedContextMenu_icon mx_UserMenuButton_iconMessage" />
|
||||
<span>{_t("Feedback")}</span>
|
||||
</AccessibleButton>
|
||||
</li>
|
||||
|
|
@ -267,7 +265,7 @@ export default class UserMenuButton extends React.Component<IProps, IState> {
|
|||
<ul>
|
||||
<li>
|
||||
<AccessibleButton onClick={this.onSignOutClick}>
|
||||
<img src={require("../../../res/img/feather-customised/sign-out.svg")} width={16} />
|
||||
<span className="mx_IconizedContextMenu_icon mx_UserMenuButton_iconSignOut" />
|
||||
<span>{_t("Sign out")}</span>
|
||||
</AccessibleButton>
|
||||
</li>
|
||||
|
|
@ -287,10 +285,10 @@ export default class UserMenuButton extends React.Component<IProps, IState> {
|
|||
label={_t("Account settings")}
|
||||
isExpanded={this.state.menuDisplayed}
|
||||
>
|
||||
<img src={require("../../../res/img/feather-customised/more-horizontal.svg")} alt="..." width={14} />
|
||||
<span>{/* masked image in CSS */}</span>
|
||||
</ContextMenuButton>
|
||||
{contextMenu}
|
||||
</React.Fragment>
|
||||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@ import * as sdk from '../../../index';
|
|||
import {
|
||||
SetupEncryptionStore,
|
||||
PHASE_INTRO,
|
||||
PHASE_RECOVERY_KEY,
|
||||
PHASE_BUSY,
|
||||
PHASE_DONE,
|
||||
PHASE_CONFIRM_SKIP,
|
||||
|
|
@ -62,9 +61,6 @@ export default class CompleteSecurity extends React.Component {
|
|||
if (phase === PHASE_INTRO) {
|
||||
icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning" />;
|
||||
title = _t("Verify this login");
|
||||
} else if (phase === PHASE_RECOVERY_KEY) {
|
||||
icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_verified" />;
|
||||
title = _t("Recovery Key");
|
||||
} else if (phase === PHASE_DONE) {
|
||||
icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_verified" />;
|
||||
title = _t("Session verified");
|
||||
|
|
|
|||
|
|
@ -378,7 +378,7 @@ export default createReactClass({
|
|||
}
|
||||
|
||||
if (response.access_token) {
|
||||
const cli = await this.props.onLoggedIn({
|
||||
await this.props.onLoggedIn({
|
||||
userId: response.user_id,
|
||||
deviceId: response.device_id,
|
||||
homeserverUrl: this.state.matrixClient.getHomeserverUrl(),
|
||||
|
|
@ -386,7 +386,7 @@ export default createReactClass({
|
|||
accessToken: response.access_token,
|
||||
}, this.state.formVals.password);
|
||||
|
||||
this._setupPushers(cli);
|
||||
this._setupPushers();
|
||||
// we're still busy until we get unmounted: don't show the registration form again
|
||||
newState.busy = true;
|
||||
} else {
|
||||
|
|
@ -397,10 +397,11 @@ export default createReactClass({
|
|||
this.setState(newState);
|
||||
},
|
||||
|
||||
_setupPushers: function(matrixClient) {
|
||||
_setupPushers: function() {
|
||||
if (!this.props.brand) {
|
||||
return Promise.resolve();
|
||||
}
|
||||
const matrixClient = MatrixClientPeg.get();
|
||||
return matrixClient.getPushers().then((resp)=>{
|
||||
const pushers = resp.pushers;
|
||||
for (let i = 0; i < pushers.length; ++i) {
|
||||
|
|
|
|||
|
|
@ -19,12 +19,9 @@ import PropTypes from 'prop-types';
|
|||
import { _t } from '../../../languageHandler';
|
||||
import { MatrixClientPeg } from '../../../MatrixClientPeg';
|
||||
import * as sdk from '../../../index';
|
||||
import withValidation from '../../views/elements/Validation';
|
||||
import { decodeRecoveryKey } from 'matrix-js-sdk/src/crypto/recoverykey';
|
||||
import {
|
||||
SetupEncryptionStore,
|
||||
PHASE_INTRO,
|
||||
PHASE_RECOVERY_KEY,
|
||||
PHASE_BUSY,
|
||||
PHASE_DONE,
|
||||
PHASE_CONFIRM_SKIP,
|
||||
|
|
@ -56,11 +53,6 @@ export default class SetupEncryptionBody extends React.Component {
|
|||
// Because of the latter, it lives in the state.
|
||||
verificationRequest: store.verificationRequest,
|
||||
backupInfo: store.backupInfo,
|
||||
recoveryKey: '',
|
||||
// whether the recovery key is a valid recovery key
|
||||
recoveryKeyValid: null,
|
||||
// whether the recovery key is the correct key or not
|
||||
recoveryKeyCorrect: null,
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -83,19 +75,9 @@ export default class SetupEncryptionBody extends React.Component {
|
|||
store.stop();
|
||||
}
|
||||
|
||||
_onResetClick = () => {
|
||||
_onUsePassphraseClick = async () => {
|
||||
const store = SetupEncryptionStore.sharedInstance();
|
||||
store.startKeyReset();
|
||||
}
|
||||
|
||||
_onUseRecoveryKeyClick = async () => {
|
||||
const store = SetupEncryptionStore.sharedInstance();
|
||||
store.useRecoveryKey();
|
||||
}
|
||||
|
||||
_onRecoveryKeyCancelClick() {
|
||||
const store = SetupEncryptionStore.sharedInstance();
|
||||
store.cancelUseRecoveryKey();
|
||||
store.usePassPhrase();
|
||||
}
|
||||
|
||||
onSkipClick = () => {
|
||||
|
|
@ -118,66 +100,6 @@ export default class SetupEncryptionBody extends React.Component {
|
|||
store.done();
|
||||
}
|
||||
|
||||
_onUsePassphraseClick = () => {
|
||||
const store = SetupEncryptionStore.sharedInstance();
|
||||
store.usePassPhrase();
|
||||
}
|
||||
|
||||
_onRecoveryKeyChange = (e) => {
|
||||
this.setState({recoveryKey: e.target.value});
|
||||
}
|
||||
|
||||
_onRecoveryKeyValidate = async (fieldState) => {
|
||||
const result = await this._validateRecoveryKey(fieldState);
|
||||
this.setState({recoveryKeyValid: result.valid});
|
||||
return result;
|
||||
}
|
||||
|
||||
_validateRecoveryKey = withValidation({
|
||||
rules: [
|
||||
{
|
||||
key: "required",
|
||||
test: async (state) => {
|
||||
try {
|
||||
const decodedKey = decodeRecoveryKey(state.value);
|
||||
const correct = await MatrixClientPeg.get().checkSecretStorageKey(
|
||||
decodedKey, SetupEncryptionStore.sharedInstance().keyInfo,
|
||||
);
|
||||
this.setState({
|
||||
recoveryKeyValid: true,
|
||||
recoveryKeyCorrect: correct,
|
||||
});
|
||||
return correct;
|
||||
} catch (e) {
|
||||
this.setState({
|
||||
recoveryKeyValid: false,
|
||||
recoveryKeyCorrect: false,
|
||||
});
|
||||
return false;
|
||||
}
|
||||
},
|
||||
invalid: function() {
|
||||
if (this.state.recoveryKeyValid) {
|
||||
return _t("This isn't the recovery key for your account");
|
||||
} else {
|
||||
return _t("This isn't a valid recovery key");
|
||||
}
|
||||
},
|
||||
valid: function() {
|
||||
return _t("Looks good!");
|
||||
},
|
||||
},
|
||||
],
|
||||
})
|
||||
|
||||
_onRecoveryKeyFormSubmit = (e) => {
|
||||
e.preventDefault();
|
||||
if (!this.state.recoveryKeyCorrect) return;
|
||||
|
||||
const store = SetupEncryptionStore.sharedInstance();
|
||||
store.setupWithRecoveryKey(decodeRecoveryKey(this.state.recoveryKey));
|
||||
}
|
||||
|
||||
render() {
|
||||
const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
|
||||
|
||||
|
|
@ -196,11 +118,19 @@ export default class SetupEncryptionBody extends React.Component {
|
|||
} else if (phase === PHASE_INTRO) {
|
||||
const store = SetupEncryptionStore.sharedInstance();
|
||||
let recoveryKeyPrompt;
|
||||
if (keyHasPassphrase(store.keyInfo)) {
|
||||
if (store.keyInfo && keyHasPassphrase(store.keyInfo)) {
|
||||
recoveryKeyPrompt = _t("Use Recovery Key or Passphrase");
|
||||
} else {
|
||||
} else if (store.keyInfo) {
|
||||
recoveryKeyPrompt = _t("Use Recovery Key");
|
||||
}
|
||||
|
||||
let useRecoveryKeyButton;
|
||||
if (recoveryKeyPrompt) {
|
||||
useRecoveryKeyButton = <AccessibleButton kind="link" onClick={this._onUsePassphraseClick}>
|
||||
{recoveryKeyPrompt}
|
||||
</AccessibleButton>;
|
||||
}
|
||||
|
||||
return (
|
||||
<div>
|
||||
<p>{_t(
|
||||
|
|
@ -224,67 +154,13 @@ export default class SetupEncryptionBody extends React.Component {
|
|||
</div>
|
||||
|
||||
<div className="mx_CompleteSecurity_actionRow">
|
||||
<AccessibleButton kind="link" onClick={this._onUseRecoveryKeyClick}>
|
||||
{recoveryKeyPrompt}
|
||||
</AccessibleButton>
|
||||
{useRecoveryKeyButton}
|
||||
<AccessibleButton kind="danger" onClick={this.onSkipClick}>
|
||||
{_t("Skip")}
|
||||
</AccessibleButton>
|
||||
</div>
|
||||
<div className="mx_CompleteSecurity_resetText">{_t(
|
||||
"If you've forgotten your recovery key you can " +
|
||||
"<button>set up new recovery options</button>", {}, {
|
||||
button: sub => <AccessibleButton
|
||||
element="span" className="mx_linkButton" onClick={this._onResetClick}
|
||||
>
|
||||
{sub}
|
||||
</AccessibleButton>,
|
||||
},
|
||||
)}</div>
|
||||
</div>
|
||||
);
|
||||
} else if (phase === PHASE_RECOVERY_KEY) {
|
||||
const store = SetupEncryptionStore.sharedInstance();
|
||||
let keyPrompt;
|
||||
if (keyHasPassphrase(store.keyInfo)) {
|
||||
keyPrompt = _t(
|
||||
"Enter your Recovery Key or enter a <a>Recovery Passphrase</a> to continue.", {},
|
||||
{
|
||||
a: sub => <AccessibleButton
|
||||
element="span"
|
||||
className="mx_linkButton"
|
||||
onClick={this._onUsePassphraseClick}
|
||||
>{sub}</AccessibleButton>,
|
||||
},
|
||||
);
|
||||
} else {
|
||||
keyPrompt = _t("Enter your Recovery Key to continue.");
|
||||
}
|
||||
|
||||
const Field = sdk.getComponent('elements.Field');
|
||||
return <form onSubmit={this._onRecoveryKeyFormSubmit}>
|
||||
<p>{keyPrompt}</p>
|
||||
<div className="mx_CompleteSecurity_recoveryKeyEntry">
|
||||
<Field
|
||||
type="text"
|
||||
label={_t('Recovery Key')}
|
||||
value={this.state.recoveryKey}
|
||||
onChange={this._onRecoveryKeyChange}
|
||||
onValidate={this._onRecoveryKeyValidate}
|
||||
/>
|
||||
</div>
|
||||
<div className="mx_CompleteSecurity_actionRow">
|
||||
<AccessibleButton kind="secondary" onClick={this._onRecoveryKeyCancelClick}>
|
||||
{_t("Cancel")}
|
||||
</AccessibleButton>
|
||||
<AccessibleButton kind="primary"
|
||||
disabled={!this.state.recoveryKeyCorrect}
|
||||
onClick={this._onRecoveryKeyFormSubmit}
|
||||
>
|
||||
{_t("Continue")}
|
||||
</AccessibleButton>
|
||||
</div>
|
||||
</form>;
|
||||
} else if (phase === PHASE_DONE) {
|
||||
let message;
|
||||
if (this.state.backupInfo) {
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ class PassphraseField extends PureComponent<IProps, IState> {
|
|||
value={this.props.value}
|
||||
onChange={this.props.onChange}
|
||||
onValidate={this.onValidate}
|
||||
/>
|
||||
/>;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
|
|||
|
||||
_onResetRecoveryClick = () => {
|
||||
this.props.onFinished(false);
|
||||
accessSecretStorage(() => {}, {forceReset: true});
|
||||
accessSecretStorage(() => {}, /* forceReset = */ true);
|
||||
}
|
||||
|
||||
_onRecoveryKeyChange = (e) => {
|
||||
|
|
|
|||
|
|
@ -32,9 +32,6 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
|
|||
keyInfo: PropTypes.object.isRequired,
|
||||
// Function from one of { passphrase, recoveryKey } -> boolean
|
||||
checkPrivateKey: PropTypes.func.isRequired,
|
||||
// If true, only prompt for a passphrase and do not offer to restore with
|
||||
// a recovery key or reset keys.
|
||||
passphraseOnly: PropTypes.bool,
|
||||
}
|
||||
|
||||
constructor(props) {
|
||||
|
|
@ -61,7 +58,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
|
|||
_onResetRecoveryClick = () => {
|
||||
// Re-enter the access flow, but resetting storage this time around.
|
||||
this.props.onFinished(false);
|
||||
accessSecretStorage(() => {}, {forceReset: true});
|
||||
accessSecretStorage(() => {}, /* forceReset = */ true);
|
||||
}
|
||||
|
||||
_onRecoveryKeyChange = (e) => {
|
||||
|
|
@ -167,7 +164,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
|
|||
primaryDisabled={this.state.passPhrase.length === 0}
|
||||
/>
|
||||
</form>
|
||||
{this.props.passphraseOnly ? null : _t(
|
||||
{_t(
|
||||
"If you've forgotten your recovery passphrase you can "+
|
||||
"<button1>use your recovery key</button1> or " +
|
||||
"<button2>set up new recovery options</button2>."
|
||||
|
|
@ -237,7 +234,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
|
|||
primaryDisabled={!this.state.recoveryKeyValid}
|
||||
/>
|
||||
</form>
|
||||
{this.props.passphraseOnly ? null : _t(
|
||||
{_t(
|
||||
"If you've forgotten your recovery key you can "+
|
||||
"<button>set up new recovery options</button>."
|
||||
, {}, {
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ import React from 'react';
|
|||
import {Key} from '../../../Keyboard';
|
||||
import classnames from 'classnames';
|
||||
|
||||
export type ButtonEvent = React.MouseEvent<Element> | React.KeyboardEvent<Element>
|
||||
export type ButtonEvent = React.MouseEvent<Element> | React.KeyboardEvent<Element>;
|
||||
|
||||
/**
|
||||
* children: React's magic prop. Represents all children given to the element.
|
||||
|
|
@ -40,7 +40,7 @@ interface IProps extends React.InputHTMLAttributes<Element> {
|
|||
disabled?: boolean;
|
||||
className?: string;
|
||||
onClick?(e?: ButtonEvent): void;
|
||||
};
|
||||
}
|
||||
|
||||
interface IAccessibleButtonProps extends React.InputHTMLAttributes<Element> {
|
||||
ref?: React.Ref<Element>;
|
||||
|
|
|
|||
|
|
@ -17,20 +17,20 @@ limitations under the License.
|
|||
import React from 'react';
|
||||
|
||||
interface IProps {
|
||||
className: string,
|
||||
dragFunc: (currentLocation: ILocationState, event: MouseEvent) => ILocationState,
|
||||
onMouseUp: (event: MouseEvent) => void,
|
||||
className: string;
|
||||
dragFunc: (currentLocation: ILocationState, event: MouseEvent) => ILocationState;
|
||||
onMouseUp: (event: MouseEvent) => void;
|
||||
}
|
||||
|
||||
interface IState {
|
||||
onMouseMove: (event: MouseEvent) => void,
|
||||
onMouseUp: (event: MouseEvent) => void,
|
||||
location: ILocationState,
|
||||
onMouseMove: (event: MouseEvent) => void;
|
||||
onMouseUp: (event: MouseEvent) => void;
|
||||
location: ILocationState;
|
||||
}
|
||||
|
||||
export interface ILocationState {
|
||||
currentX: number,
|
||||
currentY: number,
|
||||
currentX: number;
|
||||
currentY: number;
|
||||
}
|
||||
|
||||
export default class Draggable extends React.Component<IProps, IState> {
|
||||
|
|
@ -58,13 +58,13 @@ export default class Draggable extends React.Component<IProps, IState> {
|
|||
|
||||
document.addEventListener("mousemove", this.state.onMouseMove);
|
||||
document.addEventListener("mouseup", this.state.onMouseUp);
|
||||
}
|
||||
};
|
||||
|
||||
private onMouseUp = (event: MouseEvent): void => {
|
||||
document.removeEventListener("mousemove", this.state.onMouseMove);
|
||||
document.removeEventListener("mouseup", this.state.onMouseUp);
|
||||
this.props.onMouseUp(event);
|
||||
}
|
||||
};
|
||||
|
||||
private onMouseMove(event: MouseEvent): void {
|
||||
const newLocation = this.props.dragFunc(this.state.location, event);
|
||||
|
|
@ -75,7 +75,7 @@ export default class Draggable extends React.Component<IProps, IState> {
|
|||
}
|
||||
|
||||
render() {
|
||||
return <div className={this.props.className} onMouseDown={this.onMouseDown.bind(this)} />
|
||||
return <div className={this.props.className} onMouseDown={this.onMouseDown.bind(this)} />;
|
||||
}
|
||||
|
||||
}
|
||||
129
src/components/views/elements/EventTilePreview.tsx
Normal file
129
src/components/views/elements/EventTilePreview.tsx
Normal file
|
|
@ -0,0 +1,129 @@
|
|||
/*
|
||||
Copyright 2020 The Matrix.org Foundation C.I.C.
|
||||
|
||||
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 React from 'react';
|
||||
import classnames from 'classnames';
|
||||
import { MatrixEvent } from 'matrix-js-sdk/src/models/event';
|
||||
|
||||
import * as Avatar from '../../../Avatar';
|
||||
import { MatrixClientPeg } from '../../../MatrixClientPeg';
|
||||
import EventTile from '../rooms/EventTile';
|
||||
|
||||
interface IProps {
|
||||
/**
|
||||
* The text to be displayed in the message preview
|
||||
*/
|
||||
message: string;
|
||||
|
||||
/**
|
||||
* Whether to use the irc layout or not
|
||||
*/
|
||||
useIRCLayout: boolean;
|
||||
|
||||
/**
|
||||
* classnames to apply to the wrapper of the preview
|
||||
*/
|
||||
className: string;
|
||||
}
|
||||
|
||||
interface IState {
|
||||
userId: string;
|
||||
displayname: string;
|
||||
avatar_url: string;
|
||||
}
|
||||
|
||||
const AVATAR_SIZE = 32;
|
||||
|
||||
export default class EventTilePreview extends React.Component<IProps, IState> {
|
||||
constructor(props: IProps) {
|
||||
super(props);
|
||||
|
||||
this.state = {
|
||||
userId: "@erim:fink.fink",
|
||||
displayname: "Erimayas Fink",
|
||||
avatar_url: null,
|
||||
};
|
||||
}
|
||||
|
||||
async componentDidMount() {
|
||||
// Fetch current user data
|
||||
const client = MatrixClientPeg.get();
|
||||
const userId = client.getUserId();
|
||||
const profileInfo = await client.getProfileInfo(userId);
|
||||
const avatar_url = Avatar.avatarUrlForUser(
|
||||
{avatarUrl: profileInfo.avatar_url},
|
||||
AVATAR_SIZE, AVATAR_SIZE, "crop");
|
||||
|
||||
this.setState({
|
||||
userId,
|
||||
displayname: profileInfo.displayname,
|
||||
avatar_url,
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
private fakeEvent({userId, displayname, avatar_url}: IState) {
|
||||
// Fake it till we make it
|
||||
const event = new MatrixEvent(JSON.parse(`{
|
||||
"type": "m.room.message",
|
||||
"sender": "${userId}",
|
||||
"content": {
|
||||
"m.new_content": {
|
||||
"msgtype": "m.text",
|
||||
"body": "${this.props.message}",
|
||||
"displayname": "${displayname}",
|
||||
"avatar_url": "${avatar_url}"
|
||||
},
|
||||
"msgtype": "m.text",
|
||||
"body": "${this.props.message}",
|
||||
"displayname": "${displayname}",
|
||||
"avatar_url": "${avatar_url}"
|
||||
},
|
||||
"unsigned": {
|
||||
"age": 97
|
||||
},
|
||||
"event_id": "$9999999999999999999999999999999999999999999",
|
||||
"room_id": "!999999999999999999:matrix.org"
|
||||
}`));
|
||||
|
||||
// Fake it more
|
||||
event.sender = {
|
||||
name: displayname,
|
||||
userId: userId,
|
||||
getAvatarUrl: (..._) => {
|
||||
return avatar_url;
|
||||
},
|
||||
};
|
||||
|
||||
return event;
|
||||
}
|
||||
|
||||
public render() {
|
||||
const event = this.fakeEvent(this.state);
|
||||
|
||||
let className = classnames(
|
||||
this.props.className,
|
||||
{
|
||||
"mx_IRCLayout": this.props.useIRCLayout,
|
||||
"mx_GroupLayout": !this.props.useIRCLayout,
|
||||
}
|
||||
);
|
||||
|
||||
return <div className={className}>
|
||||
<EventTile mxEvent={event} useIRCLayout={this.props.useIRCLayout} />
|
||||
</div>;
|
||||
}
|
||||
}
|
||||
|
|
@ -54,6 +54,8 @@ interface IProps {
|
|||
// If specified, contents will appear as a tooltip on the element and
|
||||
// validation feedback tooltips will be suppressed.
|
||||
tooltipContent?: React.ReactNode;
|
||||
// If specified the tooltip will be shown regardless of feedback
|
||||
forceTooltipVisible?: boolean;
|
||||
// If specified alongside tooltipContent, the class name to apply to the
|
||||
// tooltip itself.
|
||||
tooltipClassName?: string;
|
||||
|
|
@ -85,20 +87,20 @@ interface ITextareaProps extends IProps, TextareaHTMLAttributes<HTMLTextAreaElem
|
|||
type PropShapes = IInputProps | ISelectProps | ITextareaProps;
|
||||
|
||||
interface IState {
|
||||
valid: boolean,
|
||||
feedback: React.ReactNode,
|
||||
feedbackVisible: boolean,
|
||||
focused: boolean,
|
||||
valid: boolean;
|
||||
feedback: React.ReactNode;
|
||||
feedbackVisible: boolean;
|
||||
focused: boolean;
|
||||
}
|
||||
|
||||
export default class Field extends React.PureComponent<PropShapes, IState> {
|
||||
private id: string;
|
||||
private input: HTMLInputElement;
|
||||
|
||||
private static defaultProps = {
|
||||
public static readonly defaultProps = {
|
||||
element: "input",
|
||||
type: "text",
|
||||
}
|
||||
};
|
||||
|
||||
/*
|
||||
* This was changed from throttle to debounce: this is more traditional for
|
||||
|
|
@ -242,10 +244,9 @@ export default class Field extends React.PureComponent<PropShapes, IState> {
|
|||
const Tooltip = sdk.getComponent("elements.Tooltip");
|
||||
let fieldTooltip;
|
||||
if (tooltipContent || this.state.feedback) {
|
||||
const addlClassName = tooltipClassName ? tooltipClassName : '';
|
||||
fieldTooltip = <Tooltip
|
||||
tooltipClassName={`mx_Field_tooltip ${addlClassName}`}
|
||||
visible={this.state.feedbackVisible}
|
||||
tooltipClassName={classNames("mx_Field_tooltip", tooltipClassName)}
|
||||
visible={(this.state.focused && this.props.forceTooltipVisible) || this.state.feedbackVisible}
|
||||
label={tooltipContent || this.state.feedback}
|
||||
/>;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,15 +20,15 @@ import Draggable, {ILocationState} from './Draggable';
|
|||
|
||||
interface IProps {
|
||||
// Current room
|
||||
roomId: string,
|
||||
minWidth: number,
|
||||
maxWidth: number,
|
||||
};
|
||||
roomId: string;
|
||||
minWidth: number;
|
||||
maxWidth: number;
|
||||
}
|
||||
|
||||
interface IState {
|
||||
width: number,
|
||||
IRCLayoutRoot: HTMLElement,
|
||||
};
|
||||
width: number;
|
||||
IRCLayoutRoot: HTMLElement;
|
||||
}
|
||||
|
||||
export default class IRCTimelineProfileResizer extends React.Component<IProps, IState> {
|
||||
constructor(props: IProps) {
|
||||
|
|
@ -37,20 +37,19 @@ export default class IRCTimelineProfileResizer extends React.Component<IProps, I
|
|||
this.state = {
|
||||
width: SettingsStore.getValue("ircDisplayNameWidth", this.props.roomId),
|
||||
IRCLayoutRoot: null,
|
||||
}
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
componentDidMount() {
|
||||
this.setState({
|
||||
IRCLayoutRoot: document.querySelector(".mx_IRCLayout") as HTMLElement,
|
||||
}, () => this.updateCSSWidth(this.state.width))
|
||||
}, () => this.updateCSSWidth(this.state.width));
|
||||
}
|
||||
|
||||
private dragFunc = (location: ILocationState, event: React.MouseEvent<Element, MouseEvent>): ILocationState => {
|
||||
const offset = event.clientX - location.currentX;
|
||||
const newWidth = this.state.width + offset;
|
||||
|
||||
console.log({offset})
|
||||
// If we're trying to go smaller than min width, don't.
|
||||
if (newWidth < this.props.minWidth) {
|
||||
return location;
|
||||
|
|
@ -69,8 +68,8 @@ export default class IRCTimelineProfileResizer extends React.Component<IProps, I
|
|||
return {
|
||||
currentX: event.clientX,
|
||||
currentY: location.currentY,
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
private updateCSSWidth(newWidth: number) {
|
||||
this.state.IRCLayoutRoot.style.setProperty("--name-width", newWidth + "px");
|
||||
|
|
@ -83,6 +82,10 @@ export default class IRCTimelineProfileResizer extends React.Component<IProps, I
|
|||
}
|
||||
|
||||
render() {
|
||||
return <Draggable className="mx_ProfileResizer" dragFunc={this.dragFunc.bind(this)} onMouseUp={this.onMoueUp.bind(this)}/>
|
||||
return <Draggable
|
||||
className="mx_ProfileResizer"
|
||||
dragFunc={this.dragFunc.bind(this)}
|
||||
onMouseUp={this.onMoueUp.bind(this)}
|
||||
/>;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,18 +48,18 @@ export default class SettingsFlag extends React.Component<IProps, IState> {
|
|||
this.props.roomId,
|
||||
this.props.isExplicit,
|
||||
),
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
private onChange = (checked: boolean): void => {
|
||||
this.save(checked);
|
||||
this.setState({ value: checked });
|
||||
if (this.props.onChange) this.props.onChange(checked);
|
||||
}
|
||||
};
|
||||
|
||||
private checkBoxOnChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
||||
this.onChange(e.target.checked);
|
||||
}
|
||||
};
|
||||
|
||||
private save = (val?: boolean): void => {
|
||||
return SettingsStore.setValue(
|
||||
|
|
@ -68,7 +68,7 @@ export default class SettingsFlag extends React.Component<IProps, IState> {
|
|||
this.props.level,
|
||||
val !== undefined ? val : this.state.value,
|
||||
);
|
||||
}
|
||||
};
|
||||
|
||||
public render() {
|
||||
const canChange = SettingsStore.canSetValue(this.props.name, this.props.roomId, this.props.level);
|
||||
|
|
|
|||
|
|
@ -65,9 +65,9 @@ export default class Slider extends React.Component<IProps> {
|
|||
|
||||
const intervalWidth = 1 / (values.length - 1);
|
||||
|
||||
const linearInterpolation = (value - closestLessValue) / (closestGreaterValue - closestLessValue)
|
||||
const linearInterpolation = (value - closestLessValue) / (closestGreaterValue - closestLessValue);
|
||||
|
||||
return 100 * (closest - 1 + linearInterpolation) * intervalWidth
|
||||
return 100 * (closest - 1 + linearInterpolation) * intervalWidth;
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -87,7 +87,7 @@ export default class Slider extends React.Component<IProps> {
|
|||
selection = <div className="mx_Slider_selection">
|
||||
<div className="mx_Slider_selectionDot" style={{left: "calc(-0.55em + " + offset + "%)"}} />
|
||||
<hr style={{width: offset + "%"}} />
|
||||
</div>
|
||||
</div>;
|
||||
}
|
||||
|
||||
return <div className="mx_Slider">
|
||||
|
|
@ -115,13 +115,13 @@ export default class Slider extends React.Component<IProps> {
|
|||
|
||||
interface IDotProps {
|
||||
// Callback for behavior onclick
|
||||
onClick: () => void,
|
||||
onClick: () => void;
|
||||
|
||||
// Whether the dot should appear active
|
||||
active: boolean,
|
||||
active: boolean;
|
||||
|
||||
// The label on the dot
|
||||
label: string,
|
||||
label: string;
|
||||
|
||||
// Whether the slider is disabled
|
||||
disabled: boolean;
|
||||
|
|
@ -129,7 +129,7 @@ interface IDotProps {
|
|||
|
||||
class Dot extends React.PureComponent<IDotProps> {
|
||||
render(): React.ReactNode {
|
||||
let className = "mx_Slider_dot"
|
||||
let className = "mx_Slider_dot";
|
||||
if (!this.props.disabled && this.props.active) {
|
||||
className += " mx_Slider_dotActive";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ export default class StyledCheckbox extends React.PureComponent<IProps, IState>
|
|||
|
||||
public static readonly defaultProps = {
|
||||
className: "",
|
||||
}
|
||||
};
|
||||
|
||||
constructor(props: IProps) {
|
||||
super(props);
|
||||
|
|
@ -51,6 +51,6 @@ export default class StyledCheckbox extends React.PureComponent<IProps, IState>
|
|||
{ this.props.children }
|
||||
</div>
|
||||
</label>
|
||||
</span>
|
||||
</span>;
|
||||
}
|
||||
}
|
||||
|
|
@ -26,7 +26,7 @@ interface IState {
|
|||
export default class StyledRadioButton extends React.PureComponent<IProps, IState> {
|
||||
public static readonly defaultProps = {
|
||||
className: '',
|
||||
}
|
||||
};
|
||||
|
||||
public render() {
|
||||
const { children, className, disabled, ...otherProps } = this.props;
|
||||
|
|
@ -36,6 +36,7 @@ export default class StyledRadioButton extends React.PureComponent<IProps, IStat
|
|||
{
|
||||
"mx_RadioButton_disabled": disabled,
|
||||
"mx_RadioButton_enabled": !disabled,
|
||||
"mx_RadioButton_checked": this.props.checked,
|
||||
});
|
||||
return <label className={_className}>
|
||||
<input type='radio' disabled={disabled} {...otherProps} />
|
||||
|
|
@ -43,6 +44,6 @@ export default class StyledRadioButton extends React.PureComponent<IProps, IStat
|
|||
<div><div></div></div>
|
||||
<span>{children}</span>
|
||||
<div className="mx_RadioButton_spacer" />
|
||||
</label>
|
||||
</label>;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ interface IProps {
|
|||
|
||||
// Called when the checked state changes. First argument will be the new state.
|
||||
onChange(checked: boolean): void;
|
||||
};
|
||||
}
|
||||
|
||||
// Controlled Toggle Switch element, written with Accessibility in mind
|
||||
export default ({checked, disabled = false, onChange, ...props}: IProps) => {
|
||||
|
|
|
|||
|
|
@ -29,15 +29,15 @@ const MIN_TOOLTIP_HEIGHT = 25;
|
|||
|
||||
interface IProps {
|
||||
// Class applied to the element used to position the tooltip
|
||||
className: string,
|
||||
className: string;
|
||||
// Class applied to the tooltip itself
|
||||
tooltipClassName?: string,
|
||||
tooltipClassName?: string;
|
||||
// Whether the tooltip is visible or hidden.
|
||||
// The hidden state allows animating the tooltip away via CSS.
|
||||
// Defaults to visible if unset.
|
||||
visible?: boolean,
|
||||
visible?: boolean;
|
||||
// the react element to put into the tooltip
|
||||
label: React.ReactNode,
|
||||
label: React.ReactNode;
|
||||
}
|
||||
|
||||
export default class Tooltip extends React.Component<IProps> {
|
||||
|
|
@ -126,7 +126,7 @@ export default class Tooltip extends React.Component<IProps> {
|
|||
tooltip: this.tooltip,
|
||||
parent: parent,
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
public render() {
|
||||
// Render a placeholder
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ export const E2E_STATE = {
|
|||
WARNING: "warning",
|
||||
UNKNOWN: "unknown",
|
||||
NORMAL: "normal",
|
||||
UNAUTHENTICATED: "unauthenticated",
|
||||
};
|
||||
|
||||
const crossSigningUserTitles = {
|
||||
|
|
|
|||
|
|
@ -313,35 +313,52 @@ export default createReactClass({
|
|||
return;
|
||||
}
|
||||
|
||||
// If we directly trust the device, short-circuit here
|
||||
const verified = await this.context.isEventSenderVerified(mxEvent);
|
||||
if (verified) {
|
||||
const encryptionInfo = this.context.getEventEncryptionInfo(mxEvent);
|
||||
const senderId = mxEvent.getSender();
|
||||
const userTrust = this.context.checkUserTrust(senderId);
|
||||
|
||||
if (encryptionInfo.mismatchedSender) {
|
||||
// something definitely wrong is going on here
|
||||
this.setState({
|
||||
verified: E2E_STATE.VERIFIED,
|
||||
}, () => {
|
||||
// Decryption may have caused a change in size
|
||||
this.props.onHeightChanged();
|
||||
});
|
||||
verified: E2E_STATE.WARNING,
|
||||
}, this.props.onHeightChanged); // Decryption may have caused a change in size
|
||||
return;
|
||||
}
|
||||
|
||||
if (!this.context.checkUserTrust(mxEvent.getSender()).isCrossSigningVerified()) {
|
||||
if (!userTrust.isCrossSigningVerified()) {
|
||||
// user is not verified, so default to everything is normal
|
||||
this.setState({
|
||||
verified: E2E_STATE.NORMAL,
|
||||
}, this.props.onHeightChanged);
|
||||
}, this.props.onHeightChanged); // Decryption may have caused a change in size
|
||||
return;
|
||||
}
|
||||
|
||||
const eventSenderTrust = await this.context.checkEventSenderTrust(mxEvent);
|
||||
const eventSenderTrust = this.context.checkDeviceTrust(
|
||||
senderId, encryptionInfo.sender.deviceId,
|
||||
);
|
||||
if (!eventSenderTrust) {
|
||||
this.setState({
|
||||
verified: E2E_STATE.UNKNOWN,
|
||||
}, this.props.onHeightChanged); // Decryption may have cause a change in size
|
||||
}, this.props.onHeightChanged); // Decryption may have caused a change in size
|
||||
return;
|
||||
}
|
||||
|
||||
if (!eventSenderTrust.isVerified()) {
|
||||
this.setState({
|
||||
verified: E2E_STATE.WARNING,
|
||||
}, this.props.onHeightChanged); // Decryption may have caused a change in size
|
||||
return;
|
||||
}
|
||||
|
||||
if (!encryptionInfo.authenticated) {
|
||||
this.setState({
|
||||
verified: E2E_STATE.UNAUTHENTICATED,
|
||||
}, this.props.onHeightChanged); // Decryption may have caused a change in size
|
||||
return;
|
||||
}
|
||||
|
||||
this.setState({
|
||||
verified: eventSenderTrust.isVerified() ? E2E_STATE.VERIFIED : E2E_STATE.WARNING,
|
||||
verified: E2E_STATE.VERIFIED,
|
||||
}, this.props.onHeightChanged); // Decryption may have caused a change in size
|
||||
},
|
||||
|
||||
|
|
@ -526,6 +543,8 @@ export default createReactClass({
|
|||
return; // no icon if we've not even cross-signed the user
|
||||
} else if (this.state.verified === E2E_STATE.VERIFIED) {
|
||||
return; // no icon for verified
|
||||
} else if (this.state.verified === E2E_STATE.UNAUTHENTICATED) {
|
||||
return (<E2ePadlockUnauthenticated />);
|
||||
} else if (this.state.verified === E2E_STATE.UNKNOWN) {
|
||||
return (<E2ePadlockUnknown />);
|
||||
} else {
|
||||
|
|
@ -976,6 +995,12 @@ function E2ePadlockUnknown(props) {
|
|||
);
|
||||
}
|
||||
|
||||
function E2ePadlockUnauthenticated(props) {
|
||||
return (
|
||||
<E2ePadlock title={_t("The authenticity of this encrypted message can't be guaranteed on this device.")} icon="unauthenticated" {...props} />
|
||||
);
|
||||
}
|
||||
|
||||
class E2ePadlock extends React.Component {
|
||||
static propTypes = {
|
||||
icon: PropTypes.string.isRequired,
|
||||
|
|
|
|||
|
|
@ -18,27 +18,24 @@ import React from "react";
|
|||
import classNames from "classnames";
|
||||
import { formatMinimalBadgeCount } from "../../../utils/FormattingUtils";
|
||||
import { Room } from "matrix-js-sdk/src/models/room";
|
||||
import { RovingTabIndexWrapper } from "../../../accessibility/RovingTabIndex";
|
||||
import AccessibleButton from "../../views/elements/AccessibleButton";
|
||||
import RoomAvatar from "../../views/avatars/RoomAvatar";
|
||||
import dis from '../../../dispatcher/dispatcher';
|
||||
import { Key } from "../../../Keyboard";
|
||||
import * as RoomNotifs from '../../../RoomNotifs';
|
||||
import { EffectiveMembership, getEffectiveMembership } from "../../../stores/room-list/membership";
|
||||
import * as Unread from '../../../Unread';
|
||||
import { MatrixClientPeg } from "../../../MatrixClientPeg";
|
||||
import { MatrixEvent } from "matrix-js-sdk/src/models/event";
|
||||
import ActiveRoomObserver from "../../../ActiveRoomObserver";
|
||||
import { EventEmitter } from "events";
|
||||
import { arrayDiff } from "../../../utils/arrays";
|
||||
import { IDestroyable } from "../../../utils/IDestroyable";
|
||||
import SettingsStore from "../../../settings/SettingsStore";
|
||||
import { DefaultTagID, TagID } from "../../../stores/room-list/models";
|
||||
import { readReceiptChangeIsFor } from "../../../utils/read-receipts";
|
||||
|
||||
export const NOTIFICATION_STATE_UPDATE = "update";
|
||||
|
||||
export enum NotificationColor {
|
||||
// Inverted (None -> Red) because we do integer comparisons on this
|
||||
None, // nothing special
|
||||
Bold, // no badge, show as unread
|
||||
Bold, // no badge, show as unread // TODO: This goes away with new notification structures
|
||||
Grey, // unread notified messages
|
||||
Red, // unread pings
|
||||
}
|
||||
|
|
@ -53,18 +50,45 @@ interface IProps {
|
|||
notification: INotificationState;
|
||||
|
||||
/**
|
||||
* If true, the badge will conditionally display a badge without count for the user.
|
||||
* If true, the badge will show a count if at all possible. This is typically
|
||||
* used to override the user's preference for things like room sublists.
|
||||
*/
|
||||
allowNoCount: boolean;
|
||||
forceCount: boolean;
|
||||
|
||||
/**
|
||||
* The room ID, if any, the badge represents.
|
||||
*/
|
||||
roomId?: string;
|
||||
}
|
||||
|
||||
interface IState {
|
||||
showCounts: boolean; // whether or not to show counts. Independent of props.forceCount
|
||||
}
|
||||
|
||||
export default class NotificationBadge extends React.PureComponent<IProps, IState> {
|
||||
private countWatcherRef: string;
|
||||
|
||||
constructor(props: IProps) {
|
||||
super(props);
|
||||
this.props.notification.on(NOTIFICATION_STATE_UPDATE, this.onNotificationUpdate);
|
||||
|
||||
this.state = {
|
||||
showCounts: SettingsStore.getValue("Notifications.alwaysShowBadgeCounts", this.roomId),
|
||||
};
|
||||
|
||||
this.countWatcherRef = SettingsStore.watchSetting(
|
||||
"Notifications.alwaysShowBadgeCounts", this.roomId,
|
||||
this.countPreferenceChanged,
|
||||
);
|
||||
}
|
||||
|
||||
private get roomId(): string {
|
||||
// We should convert this to null for safety with the SettingsStore
|
||||
return this.props.roomId || null;
|
||||
}
|
||||
|
||||
public componentWillUnmount() {
|
||||
SettingsStore.unwatchSetting(this.countWatcherRef);
|
||||
}
|
||||
|
||||
public componentDidUpdate(prevProps: Readonly<IProps>) {
|
||||
|
|
@ -75,24 +99,34 @@ export default class NotificationBadge extends React.PureComponent<IProps, IStat
|
|||
this.props.notification.on(NOTIFICATION_STATE_UPDATE, this.onNotificationUpdate);
|
||||
}
|
||||
|
||||
private countPreferenceChanged = () => {
|
||||
this.setState({showCounts: SettingsStore.getValue("Notifications.alwaysShowBadgeCounts", this.roomId)});
|
||||
};
|
||||
|
||||
private onNotificationUpdate = () => {
|
||||
this.forceUpdate(); // notification state changed - update
|
||||
};
|
||||
|
||||
public render(): React.ReactElement {
|
||||
// Don't show a badge if we don't need to
|
||||
if (this.props.notification.color <= NotificationColor.Bold) return null;
|
||||
if (this.props.notification.color <= NotificationColor.None) return null;
|
||||
|
||||
const hasNotif = this.props.notification.color >= NotificationColor.Red;
|
||||
const hasCount = this.props.notification.color >= NotificationColor.Grey;
|
||||
const isEmptyBadge = this.props.allowNoCount && !localStorage.getItem("mx_rl_rt_badgeCount");
|
||||
const hasUnread = this.props.notification.color >= NotificationColor.Bold;
|
||||
const couldBeEmpty = (!this.state.showCounts || hasUnread) && !hasNotif;
|
||||
let isEmptyBadge = couldBeEmpty && (!this.state.showCounts || !hasCount);
|
||||
if (this.props.forceCount) {
|
||||
isEmptyBadge = false;
|
||||
if (!hasCount) return null; // Can't render a badge
|
||||
}
|
||||
|
||||
let symbol = this.props.notification.symbol || formatMinimalBadgeCount(this.props.notification.count);
|
||||
if (isEmptyBadge) symbol = "";
|
||||
|
||||
const classes = classNames({
|
||||
'mx_NotificationBadge': true,
|
||||
'mx_NotificationBadge_visible': hasCount,
|
||||
'mx_NotificationBadge_visible': isEmptyBadge ? true : hasCount,
|
||||
'mx_NotificationBadge_highlighted': hasNotif,
|
||||
'mx_NotificationBadge_dot': isEmptyBadge,
|
||||
'mx_NotificationBadge_2char': symbol.length > 0 && symbol.length < 3,
|
||||
|
|
@ -107,14 +141,14 @@ export default class NotificationBadge extends React.PureComponent<IProps, IStat
|
|||
}
|
||||
}
|
||||
|
||||
export class RoomNotificationState extends EventEmitter implements IDestroyable {
|
||||
export class RoomNotificationState extends EventEmitter implements IDestroyable, INotificationState {
|
||||
private _symbol: string;
|
||||
private _count: number;
|
||||
private _color: NotificationColor;
|
||||
|
||||
constructor(private room: Room) {
|
||||
super();
|
||||
this.room.on("Room.receipt", this.handleRoomEventUpdate);
|
||||
this.room.on("Room.receipt", this.handleReadReceipt);
|
||||
this.room.on("Room.timeline", this.handleRoomEventUpdate);
|
||||
this.room.on("Room.redaction", this.handleRoomEventUpdate);
|
||||
MatrixClientPeg.get().on("Event.decrypted", this.handleRoomEventUpdate);
|
||||
|
|
@ -138,7 +172,7 @@ export class RoomNotificationState extends EventEmitter implements IDestroyable
|
|||
}
|
||||
|
||||
public destroy(): void {
|
||||
this.room.removeListener("Room.receipt", this.handleRoomEventUpdate);
|
||||
this.room.removeListener("Room.receipt", this.handleReadReceipt);
|
||||
this.room.removeListener("Room.timeline", this.handleRoomEventUpdate);
|
||||
this.room.removeListener("Room.redaction", this.handleRoomEventUpdate);
|
||||
if (MatrixClientPeg.get()) {
|
||||
|
|
@ -146,6 +180,12 @@ export class RoomNotificationState extends EventEmitter implements IDestroyable
|
|||
}
|
||||
}
|
||||
|
||||
private handleReadReceipt = (event: MatrixEvent, room: Room) => {
|
||||
if (!readReceiptChangeIsFor(event, MatrixClientPeg.get())) return; // not our own - ignore
|
||||
if (room.roomId !== this.room.roomId) return; // not for us - ignore
|
||||
this.updateNotificationState();
|
||||
};
|
||||
|
||||
private handleRoomEventUpdate = (event: MatrixEvent) => {
|
||||
const roomId = event.getRoomId();
|
||||
|
||||
|
|
@ -205,13 +245,38 @@ export class RoomNotificationState extends EventEmitter implements IDestroyable
|
|||
}
|
||||
}
|
||||
|
||||
export class ListNotificationState extends EventEmitter implements IDestroyable {
|
||||
export class TagSpecificNotificationState extends RoomNotificationState {
|
||||
private static TAG_TO_COLOR: {
|
||||
// @ts-ignore - TS wants this to be a string key, but we know better
|
||||
[tagId: TagID]: NotificationColor,
|
||||
} = {
|
||||
[DefaultTagID.DM]: NotificationColor.Red,
|
||||
};
|
||||
|
||||
private readonly colorWhenNotIdle?: NotificationColor;
|
||||
|
||||
constructor(room: Room, tagId: TagID) {
|
||||
super(room);
|
||||
|
||||
const specificColor = TagSpecificNotificationState.TAG_TO_COLOR[tagId];
|
||||
if (specificColor) this.colorWhenNotIdle = specificColor;
|
||||
}
|
||||
|
||||
public get color(): NotificationColor {
|
||||
if (!this.colorWhenNotIdle) return super.color;
|
||||
|
||||
if (super.color !== NotificationColor.None) return this.colorWhenNotIdle;
|
||||
return super.color;
|
||||
}
|
||||
}
|
||||
|
||||
export class ListNotificationState extends EventEmitter implements IDestroyable, INotificationState {
|
||||
private _count: number;
|
||||
private _color: NotificationColor;
|
||||
private rooms: Room[] = [];
|
||||
private states: { [roomId: string]: RoomNotificationState } = {};
|
||||
|
||||
constructor(private byTileCount = false) {
|
||||
constructor(private byTileCount = false, private tagId: TagID) {
|
||||
super();
|
||||
}
|
||||
|
||||
|
|
@ -240,12 +305,13 @@ export class ListNotificationState extends EventEmitter implements IDestroyable
|
|||
this.rooms = rooms;
|
||||
for (const oldRoom of diff.removed) {
|
||||
const state = this.states[oldRoom.roomId];
|
||||
if (!state) continue; // We likely just didn't have a badge (race condition)
|
||||
delete this.states[oldRoom.roomId];
|
||||
state.off(NOTIFICATION_STATE_UPDATE, this.onRoomNotificationStateUpdate);
|
||||
state.destroy();
|
||||
}
|
||||
for (const newRoom of diff.added) {
|
||||
const state = new RoomNotificationState(newRoom);
|
||||
const state = new TagSpecificNotificationState(newRoom, this.tagId);
|
||||
state.on(NOTIFICATION_STATE_UPDATE, this.onRoomNotificationStateUpdate);
|
||||
if (this.states[newRoom.roomId]) {
|
||||
// "Should never happen" disclaimer.
|
||||
|
|
@ -258,6 +324,12 @@ export class ListNotificationState extends EventEmitter implements IDestroyable
|
|||
this.calculateTotalState();
|
||||
}
|
||||
|
||||
public getForRoom(room: Room) {
|
||||
const state = this.states[room.roomId];
|
||||
if (!state) throw new Error("Unknown room for notification state");
|
||||
return state;
|
||||
}
|
||||
|
||||
public destroy() {
|
||||
for (const state of Object.values(this.states)) {
|
||||
state.destroy();
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ export default class RoomBreadcrumbs2 extends React.PureComponent<IProps, IState
|
|||
>
|
||||
<RoomAvatar room={r} width={32} height={32}/>
|
||||
</AccessibleButton>
|
||||
)
|
||||
);
|
||||
});
|
||||
|
||||
if (tiles.length > 0) {
|
||||
|
|
|
|||
|
|
@ -193,6 +193,7 @@ export default class RoomList2 extends React.Component<IProps, IState> {
|
|||
components.push(
|
||||
<RoomSublist2
|
||||
key={`sublist-${orderedTagId}`}
|
||||
tagId={orderedTagId}
|
||||
forRooms={true}
|
||||
rooms={orderedRooms}
|
||||
startAsHidden={aesthetics.defaultHidden}
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ import StyledCheckbox from "../elements/StyledCheckbox";
|
|||
import StyledRadioButton from "../elements/StyledRadioButton";
|
||||
import RoomListStore from "../../../stores/room-list/RoomListStore2";
|
||||
import { ListAlgorithm, SortAlgorithm } from "../../../stores/room-list/algorithms/models";
|
||||
import { TagID } from "../../../stores/room-list/models";
|
||||
|
||||
/*******************************************************************
|
||||
* CAUTION *
|
||||
|
|
@ -41,6 +42,11 @@ import { ListAlgorithm, SortAlgorithm } from "../../../stores/room-list/algorith
|
|||
* warning disappears. *
|
||||
*******************************************************************/
|
||||
|
||||
const SHOW_N_BUTTON_HEIGHT = 32; // As defined by CSS
|
||||
const RESIZE_HANDLE_HEIGHT = 4; // As defined by CSS
|
||||
|
||||
const MAX_PADDING_HEIGHT = SHOW_N_BUTTON_HEIGHT + RESIZE_HANDLE_HEIGHT;
|
||||
|
||||
interface IProps {
|
||||
forRooms: boolean;
|
||||
rooms?: Room[];
|
||||
|
|
@ -51,6 +57,7 @@ interface IProps {
|
|||
isInvite: boolean;
|
||||
layout: ListLayout;
|
||||
isMinimized: boolean;
|
||||
tagId: TagID;
|
||||
|
||||
// TODO: Collapsed state
|
||||
// TODO: Group invites
|
||||
|
|
@ -73,7 +80,7 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
|
|||
super(props);
|
||||
|
||||
this.state = {
|
||||
notificationState: new ListNotificationState(this.props.isInvite),
|
||||
notificationState: new ListNotificationState(this.props.isInvite, this.props.tagId),
|
||||
menuDisplayed: false,
|
||||
};
|
||||
this.state.notificationState.setRooms(this.props.rooms);
|
||||
|
|
@ -105,7 +112,12 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
|
|||
};
|
||||
|
||||
private onShowAllClick = () => {
|
||||
this.props.layout.visibleTiles = this.numTiles;
|
||||
this.props.layout.visibleTiles = this.props.layout.tilesWithPadding(this.numTiles, MAX_PADDING_HEIGHT);
|
||||
this.forceUpdate(); // because the layout doesn't trigger a re-render
|
||||
};
|
||||
|
||||
private onShowLessClick = () => {
|
||||
this.props.layout.visibleTiles = this.props.layout.minVisibleTiles;
|
||||
this.forceUpdate(); // because the layout doesn't trigger a re-render
|
||||
};
|
||||
|
||||
|
|
@ -120,13 +132,13 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
|
|||
};
|
||||
|
||||
private onUnreadFirstChanged = async () => {
|
||||
const isUnreadFirst = RoomListStore.instance.getListOrder(this.props.layout.tagId) === ListAlgorithm.Importance;
|
||||
const isUnreadFirst = RoomListStore.instance.getListOrder(this.props.tagId) === ListAlgorithm.Importance;
|
||||
const newAlgorithm = isUnreadFirst ? ListAlgorithm.Natural : ListAlgorithm.Importance;
|
||||
await RoomListStore.instance.setListOrder(this.props.layout.tagId, newAlgorithm);
|
||||
await RoomListStore.instance.setListOrder(this.props.tagId, newAlgorithm);
|
||||
};
|
||||
|
||||
private onTagSortChanged = async (sort: SortAlgorithm) => {
|
||||
await RoomListStore.instance.setTagSorting(this.props.layout.tagId, sort);
|
||||
await RoomListStore.instance.setTagSorting(this.props.tagId, sort);
|
||||
};
|
||||
|
||||
private onMessagePreviewChanged = () => {
|
||||
|
|
@ -134,7 +146,28 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
|
|||
this.forceUpdate(); // because the layout doesn't trigger a re-render
|
||||
};
|
||||
|
||||
private onHeaderClick = (ev: React.MouseEvent<HTMLDivElement>) => {
|
||||
let target = ev.target as HTMLDivElement;
|
||||
if (!target.classList.contains('mx_RoomSublist2_headerText')) {
|
||||
// If we don't have the headerText class, the user clicked the span in the headerText.
|
||||
target = target.parentElement as HTMLDivElement;
|
||||
}
|
||||
|
||||
const possibleSticky = target.parentElement;
|
||||
const sublist = possibleSticky.parentElement.parentElement;
|
||||
if (possibleSticky.classList.contains('mx_RoomSublist2_headerContainer_sticky')) {
|
||||
// is sticky - jump to list
|
||||
sublist.scrollIntoView({behavior: 'smooth'});
|
||||
} else {
|
||||
// on screen - toggle collapse
|
||||
this.props.layout.isCollapsed = !this.props.layout.isCollapsed;
|
||||
this.forceUpdate(); // because the layout doesn't trigger an update
|
||||
}
|
||||
};
|
||||
|
||||
private renderTiles(): React.ReactElement[] {
|
||||
if (this.props.layout && this.props.layout.isCollapsed) return []; // don't waste time on rendering
|
||||
|
||||
const tiles: React.ReactElement[] = [];
|
||||
|
||||
if (this.props.rooms) {
|
||||
|
|
@ -145,6 +178,7 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
|
|||
key={`room-${room.roomId}`}
|
||||
showMessagePreview={this.props.layout.showPreviews}
|
||||
isMinimized={this.props.isMinimized}
|
||||
tag={this.props.tagId}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
|
@ -157,8 +191,8 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
|
|||
let contextMenu = null;
|
||||
if (this.state.menuDisplayed) {
|
||||
const elementRect = this.menuButtonRef.current.getBoundingClientRect();
|
||||
const isAlphabetical = RoomListStore.instance.getTagSorting(this.props.layout.tagId) === SortAlgorithm.Alphabetic;
|
||||
const isUnreadFirst = RoomListStore.instance.getListOrder(this.props.layout.tagId) === ListAlgorithm.Importance;
|
||||
const isAlphabetical = RoomListStore.instance.getTagSorting(this.props.tagId) === SortAlgorithm.Alphabetic;
|
||||
const isUnreadFirst = RoomListStore.instance.getListOrder(this.props.tagId) === ListAlgorithm.Importance;
|
||||
contextMenu = (
|
||||
<ContextMenu
|
||||
chevronFace="none"
|
||||
|
|
@ -172,14 +206,14 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
|
|||
<StyledRadioButton
|
||||
onChange={() => this.onTagSortChanged(SortAlgorithm.Recent)}
|
||||
checked={!isAlphabetical}
|
||||
name={`mx_${this.props.layout.tagId}_sortBy`}
|
||||
name={`mx_${this.props.tagId}_sortBy`}
|
||||
>
|
||||
{_t("Activity")}
|
||||
</StyledRadioButton>
|
||||
<StyledRadioButton
|
||||
onChange={() => this.onTagSortChanged(SortAlgorithm.Alphabetic)}
|
||||
checked={isAlphabetical}
|
||||
name={`mx_${this.props.layout.tagId}_sortBy`}
|
||||
name={`mx_${this.props.tagId}_sortBy`}
|
||||
>
|
||||
{_t("A-Z")}
|
||||
</StyledRadioButton>
|
||||
|
|
@ -235,7 +269,7 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
|
|||
|
||||
// TODO: Collapsed state
|
||||
|
||||
const badge = <NotificationBadge allowNoCount={false} notification={this.state.notificationState}/>;
|
||||
const badge = <NotificationBadge forceCount={true} notification={this.state.notificationState}/>;
|
||||
|
||||
let addRoomButton = null;
|
||||
if (!!this.props.onAddRoom) {
|
||||
|
|
@ -249,28 +283,48 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
|
|||
);
|
||||
}
|
||||
|
||||
const collapseClasses = classNames({
|
||||
'mx_RoomSublist2_collapseBtn': true,
|
||||
'mx_RoomSublist2_collapseBtn_collapsed': this.props.layout && this.props.layout.isCollapsed,
|
||||
});
|
||||
|
||||
const classes = classNames({
|
||||
'mx_RoomSublist2_headerContainer': true,
|
||||
'mx_RoomSublist2_headerContainer_withAux': !!addRoomButton,
|
||||
});
|
||||
|
||||
const badgeContainer = (
|
||||
<div className="mx_RoomSublist2_badgeContainer">
|
||||
{badge}
|
||||
</div>
|
||||
);
|
||||
|
||||
// TODO: a11y (see old component)
|
||||
// Note: the addRoomButton conditionally gets moved around
|
||||
// the DOM depending on whether or not the list is minimized.
|
||||
// If we're minimized, we want it below the header so it
|
||||
// doesn't become sticky.
|
||||
// The same applies to the notification badge.
|
||||
return (
|
||||
<div className={classes}>
|
||||
<AccessibleButton
|
||||
inputRef={ref}
|
||||
tabIndex={tabIndex}
|
||||
className={"mx_RoomSublist2_headerText"}
|
||||
role="treeitem"
|
||||
aria-level={1}
|
||||
>
|
||||
<span>{this.props.label}</span>
|
||||
</AccessibleButton>
|
||||
{this.renderMenu()}
|
||||
{addRoomButton}
|
||||
<div className="mx_RoomSublist2_badgeContainer">
|
||||
{badge}
|
||||
<div className='mx_RoomSublist2_stickable'>
|
||||
<AccessibleButton
|
||||
inputRef={ref}
|
||||
tabIndex={tabIndex}
|
||||
className={"mx_RoomSublist2_headerText"}
|
||||
role="treeitem"
|
||||
aria-level={1}
|
||||
onClick={this.onHeaderClick}
|
||||
>
|
||||
<span className={collapseClasses} />
|
||||
<span>{this.props.label}</span>
|
||||
</AccessibleButton>
|
||||
{this.renderMenu()}
|
||||
{this.props.isMinimized ? null : addRoomButton}
|
||||
{this.props.isMinimized ? null : badgeContainer}
|
||||
</div>
|
||||
{this.props.isMinimized ? badgeContainer : null}
|
||||
{this.props.isMinimized ? addRoomButton : null}
|
||||
</div>
|
||||
);
|
||||
}}
|
||||
|
|
@ -303,25 +357,42 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
|
|||
const visibleTiles = tiles.slice(0, nVisible);
|
||||
|
||||
// If we're hiding rooms, show a 'show more' button to the user. This button
|
||||
// floats above the resize handle, if we have one present
|
||||
let showMoreButton = null;
|
||||
// floats above the resize handle, if we have one present. If the user has all
|
||||
// tiles visible, it becomes 'show less'.
|
||||
let showNButton = null;
|
||||
if (tiles.length > nVisible) {
|
||||
// we have a cutoff condition - add the button to show all
|
||||
const numMissing = tiles.length - visibleTiles.length;
|
||||
let showMoreText = (
|
||||
<span className='mx_RoomSublist2_showMoreButtonText'>
|
||||
<span className='mx_RoomSublist2_showNButtonText'>
|
||||
{_t("Show %(count)s more", {count: numMissing})}
|
||||
</span>
|
||||
);
|
||||
if (this.props.isMinimized) showMoreText = null;
|
||||
showMoreButton = (
|
||||
<div onClick={this.onShowAllClick} className='mx_RoomSublist2_showMoreButton'>
|
||||
<span className='mx_RoomSublist2_showMoreButtonChevron'>
|
||||
showNButton = (
|
||||
<div onClick={this.onShowAllClick} className='mx_RoomSublist2_showNButton'>
|
||||
<span className='mx_RoomSublist2_showMoreButtonChevron mx_RoomSublist2_showNButtonChevron'>
|
||||
{/* set by CSS masking */}
|
||||
</span>
|
||||
{showMoreText}
|
||||
</div>
|
||||
);
|
||||
} else if (tiles.length <= nVisible && tiles.length > this.props.layout.minVisibleTiles) {
|
||||
// we have all tiles visible - add a button to show less
|
||||
let showLessText = (
|
||||
<span className='mx_RoomSublist2_showNButtonText'>
|
||||
{_t("Show less")}
|
||||
</span>
|
||||
);
|
||||
if (this.props.isMinimized) showLessText = null;
|
||||
showNButton = (
|
||||
<div onClick={this.onShowLessClick} className='mx_RoomSublist2_showNButton'>
|
||||
<span className='mx_RoomSublist2_showLessButtonChevron mx_RoomSublist2_showNButtonChevron'>
|
||||
{/* set by CSS masking */}
|
||||
</span>
|
||||
{showLessText}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
// Figure out if we need a handle
|
||||
|
|
@ -340,18 +411,16 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
|
|||
// goes backwards and can become wildly incorrect (visibleTiles says 18 when there's
|
||||
// only mathematically 7 possible).
|
||||
|
||||
const showMoreHeight = 32; // As defined by CSS
|
||||
const resizeHandleHeight = 4; // As defined by CSS
|
||||
|
||||
// The padding is variable though, so figure out what we need padding for.
|
||||
let padding = 0;
|
||||
if (showMoreButton) padding += showMoreHeight;
|
||||
if (handles.length > 0) padding += resizeHandleHeight;
|
||||
if (showNButton) padding += SHOW_N_BUTTON_HEIGHT;
|
||||
padding += RESIZE_HANDLE_HEIGHT; // always append the handle height
|
||||
|
||||
const minTilesPx = layout.calculateTilesToPixelsMin(tiles.length, layout.minVisibleTiles, padding);
|
||||
const relativeTiles = layout.tilesWithPadding(tiles.length, padding);
|
||||
const minTilesPx = layout.calculateTilesToPixelsMin(relativeTiles, layout.minVisibleTiles, padding);
|
||||
const maxTilesPx = layout.tilesToPixelsWithPadding(tiles.length, padding);
|
||||
const tilesWithoutPadding = Math.min(tiles.length, layout.visibleTiles);
|
||||
const tilesPx = layout.calculateTilesToPixelsMin(tiles.length, tilesWithoutPadding, padding);
|
||||
const tilesWithoutPadding = Math.min(relativeTiles, layout.visibleTiles);
|
||||
const tilesPx = layout.calculateTilesToPixelsMin(relativeTiles, tilesWithoutPadding, padding);
|
||||
|
||||
content = (
|
||||
<ResizableBox
|
||||
|
|
@ -365,9 +434,9 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
|
|||
className="mx_RoomSublist2_resizeBox"
|
||||
>
|
||||
{visibleTiles}
|
||||
{showMoreButton}
|
||||
{showNButton}
|
||||
</ResizableBox>
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
// TODO: onKeyDown support
|
||||
|
|
|
|||
|
|
@ -21,16 +21,21 @@ import React, { createRef } from "react";
|
|||
import { Room } from "matrix-js-sdk/src/models/room";
|
||||
import classNames from "classnames";
|
||||
import { RovingTabIndexWrapper } from "../../../accessibility/RovingTabIndex";
|
||||
import AccessibleButton, {ButtonEvent} from "../../views/elements/AccessibleButton";
|
||||
import AccessibleButton, { ButtonEvent } from "../../views/elements/AccessibleButton";
|
||||
import RoomAvatar from "../../views/avatars/RoomAvatar";
|
||||
import dis from '../../../dispatcher/dispatcher';
|
||||
import { Key } from "../../../Keyboard";
|
||||
import ActiveRoomObserver from "../../../ActiveRoomObserver";
|
||||
import NotificationBadge, { INotificationState, NotificationColor, RoomNotificationState } from "./NotificationBadge";
|
||||
import NotificationBadge, {
|
||||
INotificationState,
|
||||
NotificationColor,
|
||||
TagSpecificNotificationState
|
||||
} from "./NotificationBadge";
|
||||
import { _t } from "../../../languageHandler";
|
||||
import { ContextMenu, ContextMenuButton } from "../../structures/ContextMenu";
|
||||
import { DefaultTagID, TagID } from "../../../stores/room-list/models";
|
||||
import { MessagePreviewStore } from "../../../stores/MessagePreviewStore";
|
||||
import RoomTileIcon from "./RoomTileIcon";
|
||||
|
||||
/*******************************************************************
|
||||
* CAUTION *
|
||||
|
|
@ -44,6 +49,7 @@ interface IProps {
|
|||
room: Room;
|
||||
showMessagePreview: boolean;
|
||||
isMinimized: boolean;
|
||||
tag: TagID;
|
||||
|
||||
// TODO: Allow falsifying counts (for invites and stuff)
|
||||
// TODO: Transparency? Was this ever used?
|
||||
|
|
@ -77,7 +83,7 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
|
|||
|
||||
this.state = {
|
||||
hover: false,
|
||||
notificationState: new RoomNotificationState(this.props.room),
|
||||
notificationState: new TagSpecificNotificationState(this.props.room, this.props.tag),
|
||||
selected: ActiveRoomObserver.activeRoomId === this.props.room.roomId,
|
||||
generalMenuDisplayed: false,
|
||||
};
|
||||
|
|
@ -230,7 +236,7 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
|
|||
/>
|
||||
{contextMenu}
|
||||
</React.Fragment>
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
public render(): React.ReactElement {
|
||||
|
|
@ -246,7 +252,13 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
|
|||
'mx_RoomTile2_minimized': this.props.isMinimized,
|
||||
});
|
||||
|
||||
const badge = <NotificationBadge notification={this.state.notificationState} allowNoCount={true} />;
|
||||
const badge = (
|
||||
<NotificationBadge
|
||||
notification={this.state.notificationState}
|
||||
forceCount={false}
|
||||
roomId={this.props.room.roomId}
|
||||
/>
|
||||
);
|
||||
|
||||
// TODO: the original RoomTile uses state for the room name. Do we need to?
|
||||
let name = this.props.room.name;
|
||||
|
|
@ -303,7 +315,8 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
|
|||
role="treeitem"
|
||||
>
|
||||
<div className="mx_RoomTile2_avatarContainer">
|
||||
<RoomAvatar room={this.props.room} width={avatarSize} height={avatarSize}/>
|
||||
<RoomAvatar room={this.props.room} width={avatarSize} height={avatarSize} />
|
||||
<RoomTileIcon room={this.props.room} tag={this.props.tag} />
|
||||
</div>
|
||||
{nameContainer}
|
||||
<div className="mx_RoomTile2_badgeContainer">
|
||||
|
|
|
|||
150
src/components/views/rooms/RoomTileIcon.tsx
Normal file
150
src/components/views/rooms/RoomTileIcon.tsx
Normal file
|
|
@ -0,0 +1,150 @@
|
|||
/*
|
||||
Copyright 2020 The Matrix.org Foundation C.I.C.
|
||||
|
||||
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 React from "react";
|
||||
import { Room } from "matrix-js-sdk/src/models/room";
|
||||
import { DefaultTagID, TagID } from "../../../stores/room-list/models";
|
||||
import { User } from "matrix-js-sdk/src/models/user";
|
||||
import { MatrixEvent } from "matrix-js-sdk/src/models/event";
|
||||
import DMRoomMap from "../../../utils/DMRoomMap";
|
||||
import { MatrixClientPeg } from "../../../MatrixClientPeg";
|
||||
import { isPresenceEnabled } from "../../../utils/presence";
|
||||
|
||||
enum Icon {
|
||||
// Note: the names here are used in CSS class names
|
||||
None = "NONE", // ... except this one
|
||||
Globe = "GLOBE",
|
||||
PresenceOnline = "ONLINE",
|
||||
PresenceAway = "AWAY",
|
||||
PresenceOffline = "OFFLINE",
|
||||
}
|
||||
|
||||
interface IProps {
|
||||
room: Room;
|
||||
tag: TagID;
|
||||
}
|
||||
|
||||
interface IState {
|
||||
icon: Icon;
|
||||
}
|
||||
|
||||
export default class RoomTileIcon extends React.Component<IProps, IState> {
|
||||
private _dmUser: User;
|
||||
private isUnmounted = false;
|
||||
private isWatchingTimeline = false;
|
||||
|
||||
constructor(props: IProps) {
|
||||
super(props);
|
||||
|
||||
this.state = {
|
||||
icon: this.calculateIcon(),
|
||||
};
|
||||
}
|
||||
|
||||
private get isPublicRoom(): boolean {
|
||||
const joinRules = this.props.room.currentState.getStateEvents("m.room.join_rules", "");
|
||||
const joinRule = joinRules && joinRules.getContent().join_rule;
|
||||
return joinRule === 'public';
|
||||
}
|
||||
|
||||
private get dmUser(): User {
|
||||
return this._dmUser;
|
||||
}
|
||||
|
||||
private set dmUser(val: User) {
|
||||
const oldUser = this._dmUser;
|
||||
this._dmUser = val;
|
||||
if (oldUser && oldUser !== this._dmUser) {
|
||||
oldUser.off('User.currentlyActive', this.onPresenceUpdate);
|
||||
oldUser.off('User.presence', this.onPresenceUpdate);
|
||||
}
|
||||
if (this._dmUser && oldUser !== this._dmUser) {
|
||||
this._dmUser.on('User.currentlyActive', this.onPresenceUpdate);
|
||||
this._dmUser.on('User.presence', this.onPresenceUpdate);
|
||||
}
|
||||
}
|
||||
|
||||
public componentWillUnmount() {
|
||||
this.isUnmounted = true;
|
||||
if (this.isWatchingTimeline) this.props.room.off('Room.timeline', this.onRoomTimeline);
|
||||
this.dmUser = null; // clear listeners, if any
|
||||
}
|
||||
|
||||
private onRoomTimeline = (ev: MatrixEvent, room: Room) => {
|
||||
if (this.isUnmounted) return;
|
||||
|
||||
// apparently these can happen?
|
||||
if (!room) return;
|
||||
if (this.props.room.roomId !== room.roomId) return;
|
||||
|
||||
if (ev.getType() === 'm.room.join_rules' || ev.getType() === 'm.room.member') {
|
||||
this.setState({icon: this.calculateIcon()});
|
||||
}
|
||||
};
|
||||
|
||||
private onPresenceUpdate = () => {
|
||||
if (this.isUnmounted) return;
|
||||
|
||||
let newIcon = this.getPresenceIcon();
|
||||
if (newIcon !== this.state.icon) this.setState({icon: newIcon});
|
||||
};
|
||||
|
||||
private getPresenceIcon(): Icon {
|
||||
if (!this.dmUser) return Icon.None;
|
||||
|
||||
let icon = Icon.None;
|
||||
|
||||
const isOnline = this.dmUser.currentlyActive || this.dmUser.presence === 'online';
|
||||
if (isOnline) {
|
||||
icon = Icon.PresenceOnline;
|
||||
} else if (this.dmUser.presence === 'offline') {
|
||||
icon = Icon.PresenceOffline;
|
||||
} else if (this.dmUser.presence === 'unavailable') {
|
||||
icon = Icon.PresenceAway;
|
||||
}
|
||||
|
||||
return icon;
|
||||
}
|
||||
|
||||
private calculateIcon(): Icon {
|
||||
let icon = Icon.None;
|
||||
|
||||
if (this.props.tag === DefaultTagID.DM && this.props.room.getJoinedMemberCount() === 2) {
|
||||
// Track presence, if available
|
||||
if (isPresenceEnabled()) {
|
||||
const otherUserId = DMRoomMap.shared().getUserIdForRoomId(this.props.room.roomId);
|
||||
if (otherUserId) {
|
||||
this.dmUser = MatrixClientPeg.get().getUser(otherUserId);
|
||||
icon = this.getPresenceIcon();
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// Track publicity
|
||||
icon = this.isPublicRoom ? Icon.Globe : Icon.None;
|
||||
if (!this.isWatchingTimeline) {
|
||||
this.props.room.on('Room.timeline', this.onRoomTimeline);
|
||||
this.isWatchingTimeline = true;
|
||||
}
|
||||
}
|
||||
return icon;
|
||||
}
|
||||
|
||||
public render(): React.ReactElement {
|
||||
if (this.state.icon === Icon.None) return null;
|
||||
|
||||
return <span className={`mx_RoomTileIcon mx_RoomTileIcon_${this.state.icon.toLowerCase()}`} />;
|
||||
}
|
||||
}
|
||||
|
|
@ -113,7 +113,7 @@ export default class CrossSigningPanel extends React.PureComponent {
|
|||
_bootstrapSecureSecretStorage = async (forceReset=false) => {
|
||||
this.setState({ error: null });
|
||||
try {
|
||||
await accessSecretStorage(() => undefined, {forceReset});
|
||||
await accessSecretStorage(() => undefined, forceReset);
|
||||
} catch (e) {
|
||||
this.setState({ error: e });
|
||||
console.error("Error bootstrapping secret storage", e);
|
||||
|
|
@ -154,13 +154,6 @@ export default class CrossSigningPanel extends React.PureComponent {
|
|||
errorSection = <div className="error">{error.toString()}</div>;
|
||||
}
|
||||
|
||||
// Whether the various keys exist on your account (but not necessarily
|
||||
// on this device).
|
||||
const enabledForAccount = (
|
||||
crossSigningPrivateKeysInStorage &&
|
||||
secretStorageKeyInAccount
|
||||
);
|
||||
|
||||
let summarisedStatus;
|
||||
if (homeserverSupportsCrossSigning === undefined) {
|
||||
const InlineSpinner = sdk.getComponent('views.elements.InlineSpinner');
|
||||
|
|
@ -184,8 +177,19 @@ export default class CrossSigningPanel extends React.PureComponent {
|
|||
)}</p>;
|
||||
}
|
||||
|
||||
const keysExistAnywhere = (
|
||||
secretStorageKeyInAccount ||
|
||||
crossSigningPrivateKeysInStorage ||
|
||||
crossSigningPublicKeysOnDevice
|
||||
);
|
||||
const keysExistEverywhere = (
|
||||
secretStorageKeyInAccount &&
|
||||
crossSigningPrivateKeysInStorage &&
|
||||
crossSigningPublicKeysOnDevice
|
||||
);
|
||||
|
||||
let resetButton;
|
||||
if (enabledForAccount) {
|
||||
if (keysExistAnywhere) {
|
||||
resetButton = (
|
||||
<div className="mx_CrossSigningPanel_buttonRow">
|
||||
<AccessibleButton kind="danger" onClick={this._destroySecureSecretStorage}>
|
||||
|
|
@ -197,10 +201,7 @@ export default class CrossSigningPanel extends React.PureComponent {
|
|||
|
||||
// TODO: determine how better to expose this to users in addition to prompts at login/toast
|
||||
let bootstrapButton;
|
||||
if (
|
||||
(!enabledForAccount || !crossSigningPublicKeysOnDevice) &&
|
||||
homeserverSupportsCrossSigning
|
||||
) {
|
||||
if (!keysExistEverywhere && homeserverSupportsCrossSigning) {
|
||||
bootstrapButton = (
|
||||
<div className="mx_CrossSigningPanel_buttonRow">
|
||||
<AccessibleButton kind="primary" onClick={this._onBootstrapClick}>
|
||||
|
|
|
|||
|
|
@ -19,10 +19,8 @@ limitations under the License.
|
|||
import React from 'react';
|
||||
import {_t} from "../../../../../languageHandler";
|
||||
import SettingsStore, {SettingLevel} from "../../../../../settings/SettingsStore";
|
||||
import * as sdk from "../../../../../index";
|
||||
import { enumerateThemes } from "../../../../../theme";
|
||||
import ThemeWatcher from "../../../../../settings/watchers/ThemeWatcher";
|
||||
import Field from "../../../elements/Field";
|
||||
import Slider from "../../../elements/Slider";
|
||||
import AccessibleButton from "../../../elements/AccessibleButton";
|
||||
import dis from "../../../../../dispatcher/dispatcher";
|
||||
|
|
@ -30,31 +28,42 @@ import { FontWatcher } from "../../../../../settings/watchers/FontWatcher";
|
|||
import { RecheckThemePayload } from '../../../../../dispatcher/payloads/RecheckThemePayload';
|
||||
import { Action } from '../../../../../dispatcher/actions';
|
||||
import { IValidationResult, IFieldState } from '../../../elements/Validation';
|
||||
import StyledRadioButton from '../../../elements/StyledRadioButton';
|
||||
import StyledCheckbox from '../../../elements/StyledCheckbox';
|
||||
import SettingsFlag from '../../../elements/SettingsFlag';
|
||||
import Field from '../../../elements/Field';
|
||||
import EventTilePreview from '../../../elements/EventTilePreview';
|
||||
|
||||
interface IProps {
|
||||
}
|
||||
|
||||
interface IThemeState {
|
||||
theme: string,
|
||||
useSystemTheme: boolean,
|
||||
theme: string;
|
||||
useSystemTheme: boolean;
|
||||
}
|
||||
|
||||
export interface CustomThemeMessage {
|
||||
isError: boolean,
|
||||
text: string
|
||||
};
|
||||
isError: boolean;
|
||||
text: string;
|
||||
}
|
||||
|
||||
interface IState extends IThemeState {
|
||||
// String displaying the current selected fontSize.
|
||||
// Needs to be string for things like '17.' without
|
||||
// trailing 0s.
|
||||
fontSize: string,
|
||||
customThemeUrl: string,
|
||||
customThemeMessage: CustomThemeMessage,
|
||||
useCustomFontSize: boolean,
|
||||
fontSize: string;
|
||||
customThemeUrl: string;
|
||||
customThemeMessage: CustomThemeMessage;
|
||||
useCustomFontSize: boolean;
|
||||
useSystemFont: boolean;
|
||||
systemFont: string;
|
||||
showAdvanced: boolean;
|
||||
useIRCLayout: boolean;
|
||||
}
|
||||
|
||||
|
||||
export default class AppearanceUserSettingsTab extends React.Component<IProps, IState> {
|
||||
private readonly MESSAGE_PREVIEW_TEXT = _t("Hey you. You're the best!");
|
||||
|
||||
private themeTimer: NodeJS.Timeout;
|
||||
|
||||
|
|
@ -67,6 +76,10 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
|
|||
customThemeUrl: "",
|
||||
customThemeMessage: {isError: false, text: ""},
|
||||
useCustomFontSize: SettingsStore.getValue("useCustomFontSize"),
|
||||
useSystemFont: SettingsStore.getValue("useSystemFont"),
|
||||
systemFont: SettingsStore.getValue("systemFont"),
|
||||
showAdvanced: false,
|
||||
useIRCLayout: SettingsStore.getValue("useIRCLayout"),
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -159,7 +172,7 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
|
|||
);
|
||||
|
||||
return {valid: true, feedback: _t('Use between %(min)s pt and %(max)s pt', {min, max})};
|
||||
}
|
||||
};
|
||||
|
||||
private onAddCustomTheme = async (): Promise<void> => {
|
||||
let currentThemes: string[] = SettingsStore.getValue("custom_themes");
|
||||
|
|
@ -197,11 +210,17 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
|
|||
this.setState({customThemeUrl: e.target.value});
|
||||
};
|
||||
|
||||
private renderThemeSection() {
|
||||
const SettingsFlag = sdk.getComponent("views.elements.SettingsFlag");
|
||||
const StyledCheckbox = sdk.getComponent("views.elements.StyledCheckbox");
|
||||
const StyledRadioButton = sdk.getComponent("views.elements.StyledRadioButton");
|
||||
private onLayoutChange = (e: React.ChangeEvent<HTMLInputElement>): void => {
|
||||
const val = e.target.value === "true";
|
||||
|
||||
this.setState({
|
||||
useIRCLayout: val,
|
||||
});
|
||||
|
||||
SettingsStore.setValue("useIRCLayout", null, SettingLevel.DEVICE, val);
|
||||
};
|
||||
|
||||
private renderThemeSection() {
|
||||
const themeWatcher = new ThemeWatcher();
|
||||
let systemThemeSection: JSX.Element;
|
||||
if (themeWatcher.isSystemThemeSupported()) {
|
||||
|
|
@ -263,7 +282,7 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
|
|||
return <StyledRadioButton
|
||||
key={theme.id}
|
||||
value={theme.id}
|
||||
name={"theme"}
|
||||
name="theme"
|
||||
disabled={this.state.useSystemTheme}
|
||||
checked={!this.state.useSystemTheme && theme.id === this.state.theme}
|
||||
className={"mx_ThemeSelector_" + theme.id}
|
||||
|
|
@ -279,9 +298,14 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
|
|||
}
|
||||
|
||||
private renderFontSection() {
|
||||
const SettingsFlag = sdk.getComponent("views.elements.SettingsFlag");
|
||||
return <div className="mx_SettingsTab_section mx_AppearanceUserSettingsTab_fontScaling">
|
||||
|
||||
<span className="mx_SettingsTab_subheading">{_t("Font size")}</span>
|
||||
<EventTilePreview
|
||||
className="mx_AppearanceUserSettingsTab_fontSlider_preview"
|
||||
message={this.MESSAGE_PREVIEW_TEXT}
|
||||
useIRCLayout={this.state.useIRCLayout}
|
||||
/>
|
||||
<div className="mx_AppearanceUserSettingsTab_fontSlider">
|
||||
<div className="mx_AppearanceUserSettingsTab_fontSlider_smallText">Aa</div>
|
||||
<Slider
|
||||
|
|
@ -293,12 +317,14 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
|
|||
/>
|
||||
<div className="mx_AppearanceUserSettingsTab_fontSlider_largeText">Aa</div>
|
||||
</div>
|
||||
|
||||
<SettingsFlag
|
||||
name="useCustomFontSize"
|
||||
level={SettingLevel.ACCOUNT}
|
||||
onChange={(checked) => this.setState({useCustomFontSize: checked})}
|
||||
useCheckbox={true}
|
||||
/>
|
||||
|
||||
<Field
|
||||
type="number"
|
||||
label={_t("Font size")}
|
||||
|
|
@ -314,6 +340,87 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
|
|||
</div>;
|
||||
}
|
||||
|
||||
private renderLayoutSection = () => {
|
||||
return <div className="mx_SettingsTab_section mx_AppearanceUserSettingsTab_Layout">
|
||||
<span className="mx_SettingsTab_subheading">{_t("Message layout")}</span>
|
||||
|
||||
<div className="mx_AppearanceUserSettingsTab_Layout_RadioButtons" >
|
||||
<div className="mx_AppearanceUserSettingsTab_Layout_RadioButton">
|
||||
<EventTilePreview
|
||||
className="mx_AppearanceUserSettingsTab_Layout_RadioButton_preview"
|
||||
message={this.MESSAGE_PREVIEW_TEXT}
|
||||
useIRCLayout={true}
|
||||
/>
|
||||
<StyledRadioButton
|
||||
name="layout"
|
||||
value="true"
|
||||
checked={this.state.useIRCLayout}
|
||||
onChange={this.onLayoutChange}
|
||||
>
|
||||
{_t("Compact")}
|
||||
</StyledRadioButton>
|
||||
</div>
|
||||
<div className="mx_AppearanceUserSettingsTab_spacer" />
|
||||
<div className="mx_AppearanceUserSettingsTab_Layout_RadioButton">
|
||||
<EventTilePreview
|
||||
className="mx_AppearanceUserSettingsTab_Layout_RadioButton_preview"
|
||||
message={this.MESSAGE_PREVIEW_TEXT}
|
||||
useIRCLayout={false}
|
||||
/>
|
||||
<StyledRadioButton
|
||||
name="layout"
|
||||
value="false"
|
||||
checked={!this.state.useIRCLayout}
|
||||
onChange={this.onLayoutChange}
|
||||
>
|
||||
{_t("Modern")}
|
||||
</StyledRadioButton>
|
||||
</div>
|
||||
</div>
|
||||
</div>;
|
||||
};
|
||||
|
||||
private renderAdvancedSection() {
|
||||
const toggle = <div
|
||||
className="mx_AppearanceUserSettingsTab_AdvancedToggle"
|
||||
onClick={() => this.setState({showAdvanced: !this.state.showAdvanced})}
|
||||
>
|
||||
{this.state.showAdvanced ? "Hide advanced" : "Show advanced"}
|
||||
</div>;
|
||||
|
||||
let advanced: React.ReactNode;
|
||||
|
||||
if (this.state.showAdvanced) {
|
||||
advanced = <div>
|
||||
<SettingsFlag
|
||||
name="useSystemFont"
|
||||
level={SettingLevel.DEVICE}
|
||||
useCheckbox={true}
|
||||
onChange={(checked) => this.setState({useSystemFont: checked})}
|
||||
/>
|
||||
<Field
|
||||
className="mx_AppearanceUserSettingsTab_systemFont"
|
||||
label={SettingsStore.getDisplayName("systemFont")}
|
||||
onChange={(value) => {
|
||||
this.setState({
|
||||
systemFont: value.target.value,
|
||||
});
|
||||
|
||||
SettingsStore.setValue("systemFont", null, SettingLevel.DEVICE, value.target.value);
|
||||
}}
|
||||
tooltipContent="Set the name of a font installed on your system & Riot will attempt to use it."
|
||||
forceTooltipVisible={true}
|
||||
disabled={!this.state.useSystemFont}
|
||||
value={this.state.systemFont}
|
||||
/>
|
||||
</div>;
|
||||
}
|
||||
return <div className="mx_SettingsTab_section mx_AppearanceUserSettingsTab_Advanced">
|
||||
{toggle}
|
||||
{advanced}
|
||||
</div>;
|
||||
}
|
||||
|
||||
render() {
|
||||
return (
|
||||
<div className="mx_SettingsTab mx_AppearanceUserSettingsTab">
|
||||
|
|
@ -323,6 +430,8 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
|
|||
</div>
|
||||
{this.renderThemeSection()}
|
||||
{SettingsStore.isFeatureEnabled("feature_font_scaling") ? this.renderFontSection() : null}
|
||||
{SettingsStore.isFeatureEnabled("feature_irc_ui") ? this.renderLayoutSection() : null}
|
||||
{this.renderAdvancedSection()}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -66,7 +66,6 @@ export default class LabsUserSettingsTab extends React.Component {
|
|||
<SettingsFlag name={"showHiddenEventsInTimeline"} level={SettingLevel.DEVICE} />
|
||||
<SettingsFlag name={"lowBandwidth"} level={SettingLevel.DEVICE} />
|
||||
<SettingsFlag name={"sendReadReceipts"} level={SettingLevel.ACCOUNT} />
|
||||
<SettingsFlag name={"keepSecretStoragePassphraseForSession"} level={SettingLevel.DEVICE} />
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ import React from "react";
|
|||
import PropTypes from "prop-types";
|
||||
import {_t, pickBestLanguage} from "../../../languageHandler";
|
||||
import * as sdk from "../../..";
|
||||
import {objectClone} from "../../../utils/objects";
|
||||
|
||||
export default class InlineTermsAgreement extends React.Component {
|
||||
static propTypes = {
|
||||
|
|
@ -56,7 +57,7 @@ export default class InlineTermsAgreement extends React.Component {
|
|||
}
|
||||
|
||||
_togglePolicy = (index) => {
|
||||
const policies = JSON.parse(JSON.stringify(this.state.policies)); // deep & cheap clone
|
||||
const policies = objectClone(this.state.policies);
|
||||
policies[index].checked = !policies[index].checked;
|
||||
this.setState({policies});
|
||||
};
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ export default class VerificationRequestToast extends React.PureComponent<IProps
|
|||
} catch (err) {
|
||||
console.error("Error while cancelling verification request", err);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
accept = async () => {
|
||||
ToastStore.sharedInstance().dismissToast(this.props.toastKey);
|
||||
|
|
|
|||
|
|
@ -69,4 +69,14 @@ export enum Action {
|
|||
* Opens the user menu (previously known as the top left menu). No additional payload information required.
|
||||
*/
|
||||
ToggleUserMenu = "toggle_user_menu",
|
||||
|
||||
/**
|
||||
* Sets the apps root font size. Should be used with UpdateFontSizePayload
|
||||
*/
|
||||
UpdateFontSize = "update_font_size",
|
||||
|
||||
/**
|
||||
* Sets a system font. Should be used with UpdateSystemFontPayload
|
||||
*/
|
||||
UpdateSystemFont = "update_system_font",
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ import { Action } from "../actions";
|
|||
import {UpdateCheckStatus} from "../../BasePlatform";
|
||||
|
||||
export interface CheckUpdatesPayload extends ActionPayload {
|
||||
action: Action.CheckUpdates,
|
||||
action: Action.CheckUpdates;
|
||||
|
||||
/**
|
||||
* The current phase of the manual update check.
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ import { ActionPayload } from "../payloads";
|
|||
import { Action } from "../actions";
|
||||
|
||||
export interface OpenToTabPayload extends ActionPayload {
|
||||
action: Action.ViewUserSettings | string, // TODO: Add room settings action
|
||||
action: Action.ViewUserSettings | string; // TODO: Add room settings action
|
||||
|
||||
/**
|
||||
* The tab ID to open in the settings view to start, if possible.
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ import { ActionPayload } from "../payloads";
|
|||
import { Action } from "../actions";
|
||||
|
||||
export interface RecheckThemePayload extends ActionPayload {
|
||||
action: Action.RecheckTheme,
|
||||
action: Action.RecheckTheme;
|
||||
|
||||
/**
|
||||
* Optionally specify the exact theme which is to be loaded.
|
||||
|
|
|
|||
27
src/dispatcher/payloads/UpdateFontSizePayload.ts
Normal file
27
src/dispatcher/payloads/UpdateFontSizePayload.ts
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
/*
|
||||
Copyright 2020 The Matrix.org Foundation C.I.C.
|
||||
|
||||
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 { ActionPayload } from "../payloads";
|
||||
import { Action } from "../actions";
|
||||
|
||||
export interface UpdateFontSizePayload extends ActionPayload {
|
||||
action: Action.UpdateFontSize;
|
||||
|
||||
/**
|
||||
* The font size to set the root to
|
||||
*/
|
||||
size: number;
|
||||
}
|
||||
32
src/dispatcher/payloads/UpdateSystemFontPayload.ts
Normal file
32
src/dispatcher/payloads/UpdateSystemFontPayload.ts
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
/*
|
||||
Copyright 2020 The Matrix.org Foundation C.I.C.
|
||||
|
||||
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 { ActionPayload } from "../payloads";
|
||||
import { Action } from "../actions";
|
||||
|
||||
export interface UpdateSystemFontPayload extends ActionPayload {
|
||||
action: Action.UpdateSystemFont;
|
||||
|
||||
/**
|
||||
* Specify whether to use a system font or the stylesheet font
|
||||
*/
|
||||
useSystemFont: boolean;
|
||||
|
||||
/**
|
||||
* The system font to use
|
||||
*/
|
||||
font: string;
|
||||
}
|
||||
|
|
@ -19,7 +19,7 @@ import { Action } from "../actions";
|
|||
import { Component } from "react";
|
||||
|
||||
export interface ViewTooltipPayload extends ActionPayload {
|
||||
action: Action.ViewTooltip,
|
||||
action: Action.ViewTooltip;
|
||||
|
||||
/*
|
||||
* The tooltip to render. If it's null the tooltip will not be rendered
|
||||
|
|
@ -31,5 +31,5 @@ export interface ViewTooltipPayload extends ActionPayload {
|
|||
* The parent under which to render the tooltip. Can be null to remove
|
||||
* the parent type.
|
||||
*/
|
||||
parent: null | Element
|
||||
parent: null | Element;
|
||||
}
|
||||
|
|
@ -19,7 +19,7 @@ import { ActionPayload } from "../payloads";
|
|||
import { Action } from "../actions";
|
||||
|
||||
export interface ViewUserPayload extends ActionPayload {
|
||||
action: Action.ViewUser,
|
||||
action: Action.ViewUser;
|
||||
|
||||
/**
|
||||
* The member to view. May be null or falsy to indicate that no member
|
||||
|
|
|
|||
|
|
@ -42,6 +42,10 @@ export function htmlSerializeIfNeeded(model: EditorModel, {forceHTML = false} =
|
|||
if (!parser.isPlainText() || forceHTML) {
|
||||
return parser.toHTML();
|
||||
}
|
||||
// ensure removal of escape backslashes in non-Markdown messages
|
||||
if (md.indexOf("\\") > -1) {
|
||||
return parser.toPlaintext();
|
||||
}
|
||||
}
|
||||
|
||||
export function textSerialize(model: EditorModel) {
|
||||
|
|
@ -62,16 +66,20 @@ export function textSerialize(model: EditorModel) {
|
|||
}
|
||||
|
||||
export function containsEmote(model: EditorModel) {
|
||||
return startsWith(model, "/me ");
|
||||
return startsWith(model, "/me ", false);
|
||||
}
|
||||
|
||||
export function startsWith(model: EditorModel, prefix: string) {
|
||||
export function startsWith(model: EditorModel, prefix: string, caseSensitive = true) {
|
||||
const firstPart = model.parts[0];
|
||||
// part type will be "plain" while editing,
|
||||
// and "command" while composing a message.
|
||||
return firstPart &&
|
||||
(firstPart.type === "plain" || firstPart.type === "command") &&
|
||||
firstPart.text.startsWith(prefix);
|
||||
let text = firstPart && firstPart.text;
|
||||
if (!caseSensitive) {
|
||||
prefix = prefix.toLowerCase();
|
||||
text = text.toLowerCase();
|
||||
}
|
||||
|
||||
return firstPart && (firstPart.type === "plain" || firstPart.type === "command") && text.startsWith(prefix);
|
||||
}
|
||||
|
||||
export function stripEmoteCommand(model: EditorModel) {
|
||||
|
|
|
|||
|
|
@ -1367,7 +1367,7 @@
|
|||
"Sends the given message coloured as a rainbow": "Sendet die Nachricht in Regenbogenfarben",
|
||||
"Adds a custom widget by URL to the room": "Fügt ein Benutzer-Widget über eine URL zum Raum hinzu",
|
||||
"Please supply a https:// or http:// widget URL": "Bitte gib eine https:// oder http:// Widget-URL an",
|
||||
"Sends the given emote coloured as a rainbow": "Sended das Emoji in Regenbogenfarben",
|
||||
"Sends the given emote coloured as a rainbow": "Sendet das Emoji in Regenbogenfarben",
|
||||
"%(senderName)s made no change.": "%(senderName)s hat keine Änderung vorgenommen.",
|
||||
"%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s hat die Einladung zum Raumbeitritt für %(targetDisplayName)s zurückgezogen.",
|
||||
"Cannot reach homeserver": "Der Heimserver ist nicht erreichbar",
|
||||
|
|
@ -2242,8 +2242,8 @@
|
|||
"An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "Beim Ändern der Benutzerrechte ist ein Fehler aufgetreten. Stelle sicher dass du die nötigen Berechtigungen besitzt und versuche es erneut.",
|
||||
"Unable to share email address": "E-Mail Adresse konnte nicht geteilt werden",
|
||||
"Please enter verification code sent via text.": "Gib den Verifikationscode ein, den du empfangen hast.",
|
||||
"Almost there! Is your other session showing the same shield?": "Fast geschafft! Zeigt deine andere Sitzung die gleichen Zeichen?",
|
||||
"Almost there! Is %(displayName)s showing the same shield?": "Fast geschafft! Werden bei %(displayName)s die gleichen Zeichen angezeigt?",
|
||||
"Almost there! Is your other session showing the same shield?": "Fast geschafft! Zeigt deine andere Sitzung das gleiche Schild?",
|
||||
"Almost there! Is %(displayName)s showing the same shield?": "Fast geschafft! Wird bei %(displayName)s das gleiche Schild angezeigt?",
|
||||
"Click the link in the email you received to verify and then click continue again.": "Klicke auf den Link in der Bestätigungs-E-Mail, und dann auf Weiter.",
|
||||
"Unable to revoke sharing for phone number": "Widerrufen der geteilten Telefonnummer nicht möglich",
|
||||
"Unable to share phone number": "Teilen der Telefonnummer nicht möglich",
|
||||
|
|
@ -2449,5 +2449,18 @@
|
|||
"Show %(count)s more|other": "Zeige %(count)s weitere",
|
||||
"Show %(count)s more|one": "Zeige %(count)s weitere",
|
||||
"Leave Room": "Verlasse Raum",
|
||||
"Room options": "Raumoptionen"
|
||||
"Room options": "Raumoptionen",
|
||||
"Activity": "Aktivität",
|
||||
"A-Z": "A-Z",
|
||||
"Recovery Key": "Wiederherstellungsschlüssel",
|
||||
"This isn't the recovery key for your account": "Das ist nicht der Wiederherstellungsschlüssel für dein Konto",
|
||||
"This isn't a valid recovery key": "Das ist kein gültiger Wiederherstellungsschlüssel",
|
||||
"Looks good!": "Sieht gut aus!",
|
||||
"Use Recovery Key or Passphrase": "Verwende einen Wiederherstellungsschlüssel oder deine Passphrase",
|
||||
"Use Recovery Key": "Verwende einen Wiederherstellungsschlüssel",
|
||||
"Enter your Recovery Key or enter a <a>Recovery Passphrase</a> to continue.": "Gib deinen Wiederherstellungsschlüssel oder eine <a>Wiederherstellungspassphrase</a> ein um fortzufahren.",
|
||||
"Enter your Recovery Key to continue.": "Gib deinen Wiederherstellungsschlüssel ein um fortzufahren.",
|
||||
"Create a Recovery Key": "Erzeuge einen Wiederherstellungsschlüssel",
|
||||
"Upgrade your Recovery Key": "Aktualisiere deinen Wiederherstellungsschlüssel",
|
||||
"Store your Recovery Key": "Speichere deinen Wiederherstellungsschlüssel"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -148,6 +148,7 @@
|
|||
"Actions": "Actions",
|
||||
"Advanced": "Advanced",
|
||||
"Other": "Other",
|
||||
"Command error": "Command error",
|
||||
"Usage": "Usage",
|
||||
"Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Prepends ¯\\_(ツ)_/¯ to a plain-text message",
|
||||
"Sends a message as plain text, without interpreting it as markdown": "Sends a message as plain text, without interpreting it as markdown",
|
||||
|
|
@ -421,6 +422,7 @@
|
|||
"Upgrade your Riot": "Upgrade your Riot",
|
||||
"A new version of Riot is available!": "A new version of Riot is available!",
|
||||
"You: %(message)s": "You: %(message)s",
|
||||
"Guest": "Guest",
|
||||
"There was an error joining the room": "There was an error joining the room",
|
||||
"Sorry, your homeserver is too old to participate in this room.": "Sorry, your homeserver is too old to participate in this room.",
|
||||
"Please contact your homeserver administrator.": "Please contact your homeserver administrator.",
|
||||
|
|
@ -432,12 +434,12 @@
|
|||
"Render simple counters in room header": "Render simple counters in room header",
|
||||
"Multiple integration managers": "Multiple integration managers",
|
||||
"Try out new ways to ignore people (experimental)": "Try out new ways to ignore people (experimental)",
|
||||
"Use the improved room list (in development - refresh to apply changes)": "Use the improved room list (in development - refresh to apply changes)",
|
||||
"Use the improved room list (will refresh to apply changes)": "Use the improved room list (will refresh to apply changes)",
|
||||
"Support adding custom themes": "Support adding custom themes",
|
||||
"Use IRC layout": "Use IRC layout",
|
||||
"Enable IRC layout option in the appearance tab": "Enable IRC layout option in the appearance tab",
|
||||
"Show info about bridges in room settings": "Show info about bridges in room settings",
|
||||
"Font size": "Font size",
|
||||
"Custom font size": "Custom font size",
|
||||
"Use custom size": "Use custom size",
|
||||
"Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing",
|
||||
"Use compact timeline layout": "Use compact timeline layout",
|
||||
"Show a placeholder for removed messages": "Show a placeholder for removed messages",
|
||||
|
|
@ -459,6 +461,8 @@
|
|||
"Mirror local video feed": "Mirror local video feed",
|
||||
"Enable Community Filter Panel": "Enable Community Filter Panel",
|
||||
"Match system theme": "Match system theme",
|
||||
"Use a system font": "Use a system font",
|
||||
"System font name": "System font name",
|
||||
"Allow Peer-to-Peer for 1:1 calls": "Allow Peer-to-Peer for 1:1 calls",
|
||||
"Send analytics data": "Send analytics data",
|
||||
"Never send encrypted messages to unverified sessions from this session": "Never send encrypted messages to unverified sessions from this session",
|
||||
|
|
@ -479,10 +483,10 @@
|
|||
"Send read receipts for messages (requires compatible homeserver to disable)": "Send read receipts for messages (requires compatible homeserver to disable)",
|
||||
"Show previews/thumbnails for images": "Show previews/thumbnails for images",
|
||||
"Enable message search in encrypted rooms": "Enable message search in encrypted rooms",
|
||||
"Keep recovery passphrase in memory for this session": "Keep recovery passphrase in memory for this session",
|
||||
"How fast should messages be downloaded.": "How fast should messages be downloaded.",
|
||||
"Manually verify all remote sessions": "Manually verify all remote sessions",
|
||||
"IRC display name width": "IRC display name width",
|
||||
"Use IRC layout": "Use IRC layout",
|
||||
"Collecting app version information": "Collecting app version information",
|
||||
"Collecting logs": "Collecting logs",
|
||||
"Uploading report": "Uploading report",
|
||||
|
|
@ -770,6 +774,7 @@
|
|||
"Downloading update...": "Downloading update...",
|
||||
"New version available. <a>Update now.</a>": "New version available. <a>Update now.</a>",
|
||||
"Check for update": "Check for update",
|
||||
"Hey you. You're the best!": "Hey you. You're the best!",
|
||||
"Size must be a number": "Size must be a number",
|
||||
"Custom font size can only be between %(min)s pt and %(max)s pt": "Custom font size can only be between %(min)s pt and %(max)s pt",
|
||||
"Use between %(min)s pt and %(max)s pt": "Use between %(min)s pt and %(max)s pt",
|
||||
|
|
@ -779,6 +784,9 @@
|
|||
"Custom theme URL": "Custom theme URL",
|
||||
"Add theme": "Add theme",
|
||||
"Theme": "Theme",
|
||||
"Message layout": "Message layout",
|
||||
"Compact": "Compact",
|
||||
"Modern": "Modern",
|
||||
"Customise your appearance": "Customise your appearance",
|
||||
"Appearance Settings only affect this Riot session.": "Appearance Settings only affect this Riot session.",
|
||||
"Flair": "Flair",
|
||||
|
|
@ -1023,6 +1031,7 @@
|
|||
"Encrypted by an unverified session": "Encrypted by an unverified session",
|
||||
"Unencrypted": "Unencrypted",
|
||||
"Encrypted by a deleted session": "Encrypted by a deleted session",
|
||||
"The authenticity of this encrypted message can't be guaranteed on this device.": "The authenticity of this encrypted message can't be guaranteed on this device.",
|
||||
"Please select the destination room for this message": "Please select the destination room for this message",
|
||||
"Invite only": "Invite only",
|
||||
"Scroll to most recent messages": "Scroll to most recent messages",
|
||||
|
|
@ -1170,7 +1179,6 @@
|
|||
"All Rooms": "All Rooms",
|
||||
"Search…": "Search…",
|
||||
"Server error": "Server error",
|
||||
"Command error": "Command error",
|
||||
"Server unavailable, overloaded, or something else went wrong.": "Server unavailable, overloaded, or something else went wrong.",
|
||||
"Unknown Command": "Unknown Command",
|
||||
"Unrecognised command: %(commandText)s": "Unrecognised command: %(commandText)s",
|
||||
|
|
@ -2039,7 +2047,6 @@
|
|||
"Search failed": "Search failed",
|
||||
"Server may be unavailable, overloaded, or search timed out :(": "Server may be unavailable, overloaded, or search timed out :(",
|
||||
"No more results": "No more results",
|
||||
"Unknown room %(roomId)s": "Unknown room %(roomId)s",
|
||||
"Room": "Room",
|
||||
"Failed to reject invite": "Failed to reject invite",
|
||||
"You have %(count)s unread notifications in a prior version of this room.|other": "You have %(count)s unread notifications in a prior version of this room.",
|
||||
|
|
@ -2053,7 +2060,6 @@
|
|||
"Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.",
|
||||
"Tried to load a specific point in this room's timeline, but was unable to find it.": "Tried to load a specific point in this room's timeline, but was unable to find it.",
|
||||
"Failed to load timeline position": "Failed to load timeline position",
|
||||
"Guest": "Guest",
|
||||
"Your profile": "Your profile",
|
||||
"Uploading %(filename)s and %(count)s others|other": "Uploading %(filename)s and %(count)s others",
|
||||
"Uploading %(filename)s and %(count)s others|zero": "Uploading %(filename)s",
|
||||
|
|
@ -2068,7 +2074,6 @@
|
|||
"Account settings": "Account settings",
|
||||
"Could not load user profile": "Could not load user profile",
|
||||
"Verify this login": "Verify this login",
|
||||
"Recovery Key": "Recovery Key",
|
||||
"Session verified": "Session verified",
|
||||
"Failed to send email": "Failed to send email",
|
||||
"The email address linked to your account must be entered.": "The email address linked to your account must be entered.",
|
||||
|
|
@ -2122,16 +2127,11 @@
|
|||
"You can now close this window or <a>log in</a> to your new account.": "You can now close this window or <a>log in</a> to your new account.",
|
||||
"Registration Successful": "Registration Successful",
|
||||
"Create your account": "Create your account",
|
||||
"This isn't the recovery key for your account": "This isn't the recovery key for your account",
|
||||
"This isn't a valid recovery key": "This isn't a valid recovery key",
|
||||
"Looks good!": "Looks good!",
|
||||
"Use Recovery Key or Passphrase": "Use Recovery Key or Passphrase",
|
||||
"Use Recovery Key": "Use Recovery Key",
|
||||
"Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.",
|
||||
"This requires the latest Riot on your other devices:": "This requires the latest Riot on your other devices:",
|
||||
"or another cross-signing capable Matrix client": "or another cross-signing capable Matrix client",
|
||||
"Enter your Recovery Key or enter a <a>Recovery Passphrase</a> to continue.": "Enter your Recovery Key or enter a <a>Recovery Passphrase</a> to continue.",
|
||||
"Enter your Recovery Key to continue.": "Enter your Recovery Key to continue.",
|
||||
"Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.",
|
||||
"Your new session is now verified. Other users will see it as trusted.": "Your new session is now verified. Other users will see it as trusted.",
|
||||
"Without completing security on this session, it won’t have access to encrypted messages.": "Without completing security on this session, it won’t have access to encrypted messages.",
|
||||
|
|
@ -2175,43 +2175,47 @@
|
|||
"Confirm encryption setup": "Confirm encryption setup",
|
||||
"Click the button below to confirm setting up encryption.": "Click the button below to confirm setting up encryption.",
|
||||
"Enter your account password to confirm the upgrade:": "Enter your account password to confirm the upgrade:",
|
||||
"Restore your key backup to upgrade your encryption": "Restore your key backup to upgrade your encryption",
|
||||
"Restore": "Restore",
|
||||
"You'll need to authenticate with the server to confirm the upgrade.": "You'll need to authenticate with the server to confirm the upgrade.",
|
||||
"Upgrade your Recovery Key to store encryption keys & secrets with your account data. If you lose access to this login you'll need it to unlock your data.": "Upgrade your Recovery Key to store encryption keys & secrets with your account data. If you lose access to this login you'll need it to unlock your data.",
|
||||
"Store your Recovery Key somewhere safe, it can be used to unlock your encrypted messages & data.": "Store your Recovery Key somewhere safe, it can be used to unlock your encrypted messages & data.",
|
||||
"Download": "Download",
|
||||
"Copy": "Copy",
|
||||
"Unable to query secret storage status": "Unable to query secret storage status",
|
||||
"Retry": "Retry",
|
||||
"Create a Recovery Key to store encryption keys & secrets with your account data. If you lose access to this login you’ll need it to unlock your data.": "Create a Recovery Key to store encryption keys & secrets with your account data. If you lose access to this login you’ll need it to unlock your data.",
|
||||
"Create a Recovery Key": "Create a Recovery Key",
|
||||
"Upgrade your Recovery Key": "Upgrade your Recovery Key",
|
||||
"Store your Recovery Key": "Store your Recovery Key",
|
||||
"Unable to set up secret storage": "Unable to set up secret storage",
|
||||
"We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.",
|
||||
"For maximum security, this should be different from your account password.": "For maximum security, this should be different from your account password.",
|
||||
"Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.",
|
||||
"Set a recovery passphrase to secure encrypted information and recover it if you log out. This should be different to your account password:": "Set a recovery passphrase to secure encrypted information and recover it if you log out. This should be different to your account password:",
|
||||
"Enter a recovery passphrase": "Enter a recovery passphrase",
|
||||
"Great! This recovery passphrase looks strong enough.": "Great! This recovery passphrase looks strong enough.",
|
||||
"Back up encrypted message keys": "Back up encrypted message keys",
|
||||
"Set up with a recovery key": "Set up with a recovery key",
|
||||
"That matches!": "That matches!",
|
||||
"Use a different passphrase?": "Use a different passphrase?",
|
||||
"That doesn't match.": "That doesn't match.",
|
||||
"Go back to set it again.": "Go back to set it again.",
|
||||
"Please enter your recovery passphrase a second time to confirm.": "Please enter your recovery passphrase a second time to confirm.",
|
||||
"Repeat your recovery passphrase...": "Repeat your recovery passphrase...",
|
||||
"Enter your recovery passphrase a second time to confirm it.": "Enter your recovery passphrase a second time to confirm it.",
|
||||
"Confirm your recovery passphrase": "Confirm your recovery passphrase",
|
||||
"Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.",
|
||||
"Keep a copy of it somewhere secure, like a password manager or even a safe.": "Keep a copy of it somewhere secure, like a password manager or even a safe.",
|
||||
"Your recovery key": "Your recovery key",
|
||||
"Copy": "Copy",
|
||||
"Download": "Download",
|
||||
"Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Your recovery key has been <b>copied to your clipboard</b>, paste it to:",
|
||||
"Your recovery key is in your <b>Downloads</b> folder.": "Your recovery key is in your <b>Downloads</b> folder.",
|
||||
"<b>Print it</b> and store it somewhere safe": "<b>Print it</b> and store it somewhere safe",
|
||||
"<b>Save it</b> on a USB key or backup drive": "<b>Save it</b> on a USB key or backup drive",
|
||||
"<b>Copy it</b> to your personal cloud storage": "<b>Copy it</b> to your personal cloud storage",
|
||||
"Unable to query secret storage status": "Unable to query secret storage status",
|
||||
"Retry": "Retry",
|
||||
"You can now verify your other devices, and other users to keep your chats safe.": "You can now verify your other devices, and other users to keep your chats safe.",
|
||||
"Upgrade your encryption": "Upgrade your encryption",
|
||||
"Confirm recovery passphrase": "Confirm recovery passphrase",
|
||||
"Make a copy of your recovery key": "Make a copy of your recovery key",
|
||||
"You're done!": "You're done!",
|
||||
"Unable to set up secret storage": "Unable to set up secret storage",
|
||||
"We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.",
|
||||
"For maximum security, this should be different from your account password.": "For maximum security, this should be different from your account password.",
|
||||
"Please enter your recovery passphrase a second time to confirm.": "Please enter your recovery passphrase a second time to confirm.",
|
||||
"Repeat your recovery passphrase...": "Repeat your recovery passphrase...",
|
||||
"Your keys are being backed up (the first backup could take a few minutes).": "Your keys are being backed up (the first backup could take a few minutes).",
|
||||
"Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.",
|
||||
"Set up Secure Message Recovery": "Set up Secure Message Recovery",
|
||||
"Secure your backup with a recovery passphrase": "Secure your backup with a recovery passphrase",
|
||||
"Confirm your recovery passphrase": "Confirm your recovery passphrase",
|
||||
"Make a copy of your recovery key": "Make a copy of your recovery key",
|
||||
"Starting backup...": "Starting backup...",
|
||||
"Success!": "Success!",
|
||||
"Create key backup": "Create key backup",
|
||||
|
|
|
|||
|
|
@ -2374,7 +2374,7 @@
|
|||
"Signing In...": "Salutante…",
|
||||
"If you've joined lots of rooms, this might take a while": "Se vi aliĝis al multaj ĉambroj, tio povas daŭri longe",
|
||||
"Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Konfirmu vian identecon per kontrolo de ĉi tiu saluto el unu el viaj aliaj salutaĵoj, permesante al ĝi legadon de ĉifritaj mesaĝoj.",
|
||||
"This requires the latest Riot on your other devices:": "Ĉi tio bezonas la plej freŝan version de Rion sur viaj aliaj aparatoj:",
|
||||
"This requires the latest Riot on your other devices:": "Ĉi tio bezonas la plej freŝan version de Riot en viaj aliaj aparatoj:",
|
||||
"or another cross-signing capable Matrix client": "aŭ alian Matrix-klienton kapablan je transiraj subskriboj",
|
||||
"Use Recovery Passphrase or Key": "Uzi rehavajn pasfrazon aŭ ŝlosilon",
|
||||
"Great! This recovery passphrase looks strong enough.": "Bonege! Ĉi tiu rehava pasfrazo ŝajnas sufiĉe forta.",
|
||||
|
|
|
|||
|
|
@ -977,10 +977,10 @@
|
|||
"User %(user_id)s does not exist": "El usuario %(user_id)s no existe",
|
||||
"User %(user_id)s may or may not exist": "El usuario %(user_id)s podría o no existir",
|
||||
"Unknown server error": "Error desconocido del servidor",
|
||||
"Use a few words, avoid common phrases": "Usa unas pocas palabras, evita frases comunes",
|
||||
"Use a few words, avoid common phrases": "Usa algunas palabras, evita frases comunes",
|
||||
"No need for symbols, digits, or uppercase letters": "No hacen falta símbolos, números o letrás en mayúscula",
|
||||
"Avoid repeated words and characters": "Evita repetir palabras y letras",
|
||||
"Avoid sequences": "Evita frases",
|
||||
"Avoid sequences": "Evita secuencias",
|
||||
"Avoid recent years": "Evita años recientes",
|
||||
"Avoid years that are associated with you": "Evita años que estén asociados contigo",
|
||||
"Avoid dates and years that are associated with you": "Evita fechas y años que están asociados contigo",
|
||||
|
|
@ -1176,10 +1176,10 @@
|
|||
"Incoming Verification Request": "Petición de verificación entrante",
|
||||
"%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s cambió la regla para unirse a %(rule)s",
|
||||
"%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s cambió el acceso para invitados a %(rule)s",
|
||||
"Use a longer keyboard pattern with more turns": "Usa un patrón de tecleo más largo y con más vueltas",
|
||||
"Use a longer keyboard pattern with more turns": "Usa un patrón de tecleo largo con más vueltas",
|
||||
"Enable Community Filter Panel": "Habilitar el Panel de Filtro de Comunidad",
|
||||
"Verify this user by confirming the following emoji appear on their screen.": "Verifica este usuario confirmando que los siguientes emojis aparecen en su pantalla.",
|
||||
"Your Riot is misconfigured": "Riot tiene un error de configuración",
|
||||
"Your Riot is misconfigured": "Tu Riot está mal configurado",
|
||||
"Whether or not you're logged in (we don't record your username)": "Hayas o no iniciado sesión (no guardamos tu nombre de usuario)",
|
||||
"Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Uses o no los 'breadcrumbs' (iconos sobre la lista de salas)",
|
||||
"A conference call could not be started because the integrations server is not available": "No se pudo iniciar la conferencia porque el servidor de integraciones no está disponible",
|
||||
|
|
@ -1557,7 +1557,7 @@
|
|||
"Use your account or create a new one to continue.": "Usa tu cuenta existente o crea una nueva para continuar.",
|
||||
"Create Account": "Crear cuenta",
|
||||
"Sign In": "Registrarse",
|
||||
"Sends a message as html, without interpreting it as markdown": "Envía un mensaje como html, sin interpretarlo como un markdown",
|
||||
"Sends a message as html, without interpreting it as markdown": "Envía un mensaje como html, sin interpretarlo en markdown",
|
||||
"Failed to set topic": "No se ha podido establecer el tema",
|
||||
"Command failed": "El comando falló",
|
||||
"Could not find user in room": "No pude encontrar el usuario en la sala",
|
||||
|
|
@ -1747,7 +1747,7 @@
|
|||
"Can't find this server or its room list": "No puedo encontrar este servidor o su lista de salas",
|
||||
"All rooms": "Todas las salas",
|
||||
"Your server": "Tu",
|
||||
"Are you sure you want to remove <b>%(serverName)s</b>": "¿Está seguro de querer eliminar <b>%(serverName)s</b>?",
|
||||
"Are you sure you want to remove <b>%(serverName)s</b>": "¿ Está seguro de querer eliminar <b>%(serverName)s</b>?",
|
||||
"Remove server": "Quitar servidor",
|
||||
"Matrix": "Matrix",
|
||||
"Add a new server": "Añadir un nuevo servidor",
|
||||
|
|
@ -2065,12 +2065,12 @@
|
|||
"Unable to restore backup": "No se pudo restaurar la copia de seguridad",
|
||||
"No backup found!": "¡No se encontró una copia de seguridad!",
|
||||
"Keys restored": "Se restauraron las claves",
|
||||
"Failed to decrypt %(failedCount)s sessions!": "¡Error en desencriptar %(failedCount) sesiones!",
|
||||
"Failed to decrypt %(failedCount)s sessions!": "¡Error en descifrar %(failedCount) sesiones!",
|
||||
"Successfully restored %(sessionCount)s keys": "%(sessionCount)s claves restauradas con éxito",
|
||||
"<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Advertencia</b>: sólo debes configurar la copia de seguridad de claves desde un ordenador de su confianza.",
|
||||
"<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Advertencia</b>: deberías configurar la copia de seguridad de claves solamente usando un ordenador de confianza.",
|
||||
"Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Acceda a su historial de mensajes seguros y configure la mensajería segura introduciendo su contraseña de recuperación.",
|
||||
"If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Si has olvidado tu contraseña de recuperación puedes <button1> usar tu clave de recuperación </button1> o <button2> configurar nuevas opciones de recuperación </button2>",
|
||||
"<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Advertencia</b>: Sólo debes configurar la copia de seguridad de claves desde un ordenador de su confianza.",
|
||||
"<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Advertencia</b>: Configurar la copia de seguridad de claves solamente usando un ordenador de confianza.",
|
||||
"Access your secure message history and set up secure messaging by entering your recovery key.": "Accede a tu historial de mensajes seguros y configura la mensajería segura introduciendo tu clave de recuperación.",
|
||||
"If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Si has olvidado tu clave de recuperación puedes <button> configurar nuevas opciones de recuperación</button>",
|
||||
"Resend edit": "Reenviar la edición",
|
||||
|
|
@ -2189,5 +2189,7 @@
|
|||
"Identity server URL does not appear to be a valid identity server": "La URL del servidor de identidad no parece ser un servidor de identidad válido",
|
||||
"General failure": "Error no especificado",
|
||||
"This homeserver does not support login using email address.": "Este servidor doméstico no admite iniciar sesión con una dirección de correo electrónico.",
|
||||
"This account has been deactivated.": "Esta cuenta ha sido desactivada."
|
||||
"This account has been deactivated.": "Esta cuenta ha sido desactivada.",
|
||||
"Room name or address": "Nombre o dirección de la sala",
|
||||
"Address (optional)": "Dirección (opcional)"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@
|
|||
"Matrix rooms": "Matrix'i jututoad",
|
||||
"Explore Room State": "Uuri jututoa olekut",
|
||||
"Explore Account Data": "Uuri konto andmeid",
|
||||
"Private Chat": "Privaatne vestlus",
|
||||
"Private Chat": "Omavaheline privaatne vestlus",
|
||||
"Public Chat": "Avalik vestlus",
|
||||
"Other users can invite you to rooms using your contact details": "Teades sinu kontaktinfot võivad teised kutsuda sind osalema jututubades",
|
||||
"Add rooms to the community summary": "Lisa jututoad kogukonna ülevaatesse",
|
||||
|
|
@ -147,7 +147,7 @@
|
|||
"Indexed rooms:": "Indekseeritud jututoad:",
|
||||
"Remove": "Eemalda",
|
||||
"You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "Sa peaksid enne ühenduse katkestamisst <b>eemaldama isiklikud andmed</b> id-serverist <idserver />. Kahjuks id-server <idserver /> ei ole hetkel võrgus või pole kättesaadav.",
|
||||
"We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Me soovitame, et eemaldad enne ühenduse katkestamist oma e-posti aadressi ja telefoninumbrid id-serverist.",
|
||||
"We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Me soovitame, et eemaldad enne ühenduse katkestamist oma e-posti aadressi ja telefoninumbrid isikutuvastusserverist.",
|
||||
"Remove messages": "Kustuta sõnumeid",
|
||||
"Unable to remove contact information": "Kontaktiinfo eemaldamine ebaõnnestus",
|
||||
"Remove %(email)s?": "Eemalda %(email)s?",
|
||||
|
|
@ -515,7 +515,7 @@
|
|||
"Displays information about a user": "Näitab teavet kasutaja kohta",
|
||||
"This homeserver has hit its Monthly Active User limit.": "See koduserver on saavutanud igakuise aktiivsete kasutajate piiri.",
|
||||
"about a minute ago": "umbes minut tagasi",
|
||||
"about an hour ago": "umbes tund tagasi",
|
||||
"about an hour ago": "umbes tund aega tagasi",
|
||||
"%(num)s hours ago": "%(num)s tundi tagasi",
|
||||
"about a day ago": "umbes päev tagasi",
|
||||
"%(num)s days ago": "%(num)s päeva tagasi",
|
||||
|
|
@ -1432,5 +1432,165 @@
|
|||
"Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Vigadega seotud logid sisaldavad rakenduse teavet, sealhulgas sinu kasutajanime, külastatud jututubade kasutajatunnuseid või aliasi ning teiste kasutajate kasutajanimesid. Logides ei ole saadetud sõnumite sisu.",
|
||||
"Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Enne logide saatmist sa peaksid <a>GitHub'is looma veateate</a> ja kirjeldama seal tekkinud probleemi.",
|
||||
"GitHub issue": "Veateade GitHub'is",
|
||||
"Notes": "Märkused"
|
||||
"Notes": "Märkused",
|
||||
"%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s muutis uueks teemaks \"%(topic)s\".",
|
||||
"%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s uuendas seda jututuba.",
|
||||
"%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s muutis selle jututoa avalikuks kõigile, kes teavad tema aadressi.",
|
||||
"sent an image.": "saatis ühe pildi.",
|
||||
"Light": "Hele",
|
||||
"Dark": "Tume",
|
||||
"You signed in to a new session without verifying it:": "Sa logisid sisse uude sessiooni ilma seda verifitseerimata:",
|
||||
"Verify your other session using one of the options below.": "Verifitseeri oma teine sessioon kasutades üht alljärgnevatest võimalustest.",
|
||||
"%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) logis sisse uude sessiooni ilma seda verifitseerimata:",
|
||||
"Not Trusted": "Ei ole usaldusväärne",
|
||||
"Done": "Valmis",
|
||||
"%(displayName)s is typing …": "%(displayName)s kirjutab midagi…",
|
||||
"%(names)s and %(count)s others are typing …|other": "%(names)s ja %(count)s muud kasutajat kirjutavad midagi…",
|
||||
"%(names)s and %(count)s others are typing …|one": "%(names)s ja üks teine kasutaja kirjutavad midagi…",
|
||||
"%(names)s and %(lastPerson)s are typing …": "%(names)s ja %(lastPerson)s kirjutavad midagi…",
|
||||
"Cannot reach homeserver": "Koduserver ei ole hetkel leitav",
|
||||
"Ensure you have a stable internet connection, or get in touch with the server admin": "Palun kontrolli, kas sul on toimiv internetiühendus ning kui on, siis küsi abi koduserveri haldajalt",
|
||||
"Your Riot is misconfigured": "Sinu Riot'i seadistused on paigast ära",
|
||||
"Your homeserver does not support session management.": "Sinu koduserver ei toeta sessioonide haldust.",
|
||||
"Unable to load session list": "Sessioonide laadimine ei õnnestunud",
|
||||
"Identity server URL does not appear to be a valid identity server": "Isikutuvastusserveri aadress ei tundu viitama kehtivale isikutuvastusserverile",
|
||||
"This isn't the recovery key for your account": "See ei ole sinu konto taastevõti",
|
||||
"This isn't a valid recovery key": "See ei ole nõuetekohane taastevõti",
|
||||
"Looks good!": "Tundub õige!",
|
||||
"Use Recovery Key or Passphrase": "Kasuta taastevõtit või paroolifraasi",
|
||||
"Use Recovery Key": "Kasuta taastevõtit",
|
||||
"or another cross-signing capable Matrix client": "või mõnda teist Matrix'i klienti, mis oskab risttunnustamist",
|
||||
"Enter your Recovery Key or enter a <a>Recovery Passphrase</a> to continue.": "Jätkamiseks sisesta oma taastevõti või <a>taastamise paroolifraas</a>.",
|
||||
"Enter your Recovery Key to continue.": "Jätkamiseks sisesta oma taastevõti.",
|
||||
"Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Sinu uus sessioon on nüüd verifitseeritud. Selles sessioonis saad lugeda oma krüptitud sõnumeid ja teiste kasutajate jaoks on ta usaldusväärne.",
|
||||
"Your new session is now verified. Other users will see it as trusted.": "Sinu uus sessioon on nüüd verifitseeritud. Teiste kasutajate jaoks on ta usaldusväärne.",
|
||||
"Without completing security on this session, it won’t have access to encrypted messages.": "Kui sa pole selle sessiooni turvaprotseduure lõpetanud, siis sul puudub ligipääs oma krüptitud sõnumitele.",
|
||||
"Go Back": "Mine tagasi",
|
||||
"Failed to re-authenticate due to a homeserver problem": "Uuesti autentimine ei õnnestunud koduserveri vea tõttu",
|
||||
"Incorrect password": "Vale salasõna",
|
||||
"Failed to re-authenticate": "Uuesti autentimine ei õnnestunud",
|
||||
"Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Taasta ligipääs oma kontole ning selles sessioonis salvestatud krüptivõtmetele. Ilma nende võtmeteta sa ei saa lugeda krüptitud sõnumeid mitte üheski oma sessioonis.",
|
||||
"Command Autocomplete": "Käskude automaatne lõpetamine",
|
||||
"Community Autocomplete": "Kogukondade nimede automaatne lõpetamine",
|
||||
"Emoji Autocomplete": "Emoji'de automaatne lõpetamine",
|
||||
"Notification Autocomplete": "Teavituste automaatne lõpetamine",
|
||||
"Room Autocomplete": "Jututubade nimede automaatne lõpetamine",
|
||||
"User Autocomplete": "Kasutajanimede automaatne lõpetamine",
|
||||
"Enter recovery key": "Sisesta taastevõti",
|
||||
"Unable to access secret storage. Please verify that you entered the correct recovery key.": "Ei õnnestu lugeda krüptitud salvestusruumi. Palun kontrolli, kas sa sisestasid õige taastevõtme.",
|
||||
"This looks like a valid recovery key!": "See tundub olema õige taastevõti!",
|
||||
"Not a valid recovery key": "Ei ole sobilik taastevõti",
|
||||
"Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Palu, et sinu Riot'u haldur kontrolliks <a>sinu seadistusi</a> võimalike vigaste või topeltkirjete osas.",
|
||||
"Cannot reach identity server": "Isikutuvastusserverit ei õnnestu leida",
|
||||
"You can register, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Sa võid registreeruda, kuid mõned funktsionaalsused pole kasutatavad seni, kuni isikutuvastusserver pole uuesti võrgus. Kui see teade tekib järjepanu, siis palun kontrolli oma seadistusi või võta ühendust serveri haldajaga.",
|
||||
"You can reset your password, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Sa võid salasõna lähtestada, kuid mõned funktsionaalsused pole kasutatavad seni, kuni isikutuvastusserver pole uuesti võrgus. Kui see teade tekib järjepanu, siis palun kontrolli oma seadistusi või võta ühendust serveri haldajaga.",
|
||||
"You can log in, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Sa võid sisse logida, kuid mõned funktsionaalsused pole kasutatavad seni, kuni isikutuvastusserver pole uuesti võrgus. Kui see teade tekib järjepanu, siis palun kontrolli oma seadistusi või võta ühendust serveri haldajaga.",
|
||||
"No homeserver URL provided": "Koduserveri aadress on puudu",
|
||||
"Unexpected error resolving homeserver configuration": "Koduserveri seadistustest selguse saamisel tekkis ootamatu viga",
|
||||
"Unexpected error resolving identity server configuration": "Isikutuvastusserveri seadistustest selguse saamisel tekkis ootamatu viga",
|
||||
"The message you are trying to send is too large.": "Sõnum, mida sa proovid saata, on liiga suur.",
|
||||
"This homeserver has exceeded one of its resource limits.": "See koduserver ületanud ühe oma ressursipiirangutest.",
|
||||
"Please <a>contact your service administrator</a> to continue using the service.": "Jätkamaks selle teenuse kasutamist, palun <a>võta ühendust oma serveri haldajaga</a>.",
|
||||
"Unable to connect to Homeserver. Retrying...": "Ei saa ühendust koduserveriga. Proovin uuesti...",
|
||||
"%(items)s and %(count)s others|other": "%(items)s ja %(count)s muud",
|
||||
"%(items)s and %(count)s others|one": "%(items)s ja üks muu",
|
||||
"%(items)s and %(lastItem)s": "%(items)s ja %(lastItem)s",
|
||||
"a few seconds ago": "mõni sekund tagasi",
|
||||
"%(num)s minutes ago": "%(num)s minutit tagasi",
|
||||
"a few seconds from now": "mõne sekundi pärast",
|
||||
"%(num)s minutes from now": "%(num)s minuti pärast",
|
||||
"Use a few words, avoid common phrases": "Kasuta paari sõna, kuid väldi levinud fraase",
|
||||
"No need for symbols, digits, or uppercase letters": "Sa ei pea sisestama erilisi tähemärke, numbreid ega suurtähti",
|
||||
"Use a longer keyboard pattern with more turns": "Kasuta pikemaid klahvikombinatsioone, kus vajutatud klahvid pole kõrvuti ega kohakuti",
|
||||
"Avoid repeated words and characters": "Väldi korduvaid sõnu ja tähemärke",
|
||||
"Avoid sequences": "Väldi korduvaid klahviseeriaid",
|
||||
"Avoid recent years": "Väldi hiljutisi aastaid",
|
||||
"Avoid years that are associated with you": "Väldi aastaid, mida saaks sinuga seostada",
|
||||
"Avoid dates and years that are associated with you": "Väldi kuupäevi ja aastaid, mida saaks sinuga seostada",
|
||||
"Capitalization doesn't help very much": "Suurtähtede kasutamisest pole suurt kasu",
|
||||
"All-uppercase is almost as easy to guess as all-lowercase": "Läbiva suurtähega kirjutatud teksti on sisuliselt sama lihte ära arvata, kui läbiva väiketähega kirjutatud teksti",
|
||||
"Reversed words aren't much harder to guess": "Tagurpidi kirjutatud sõnu pole eriti keeruline ära arvata",
|
||||
"Predictable substitutions like '@' instead of 'a' don't help very much": "Ennustatavatest asendustest nagu '@' 'a' asemel pole eriti kasu",
|
||||
"Add another word or two. Uncommon words are better.": "Lisa veel mõni sõna. Ebatavaliste sõnade kasutamine on hea mõte.",
|
||||
"Repeats like \"aaa\" are easy to guess": "Kordusi, nagu \"aaa\" on lihtne ära arvata",
|
||||
"Repeats like \"abcabcabc\" are only slightly harder to guess than \"abc\"": "Kordusi, nagu \"abcabcabc\" on vaid natuke raskem ära arvata kui \"abc\"",
|
||||
"Sequences like abc or 6543 are easy to guess": "Jadasid nagu \"abc\" või \"6543\" on lihtne ära arvata",
|
||||
"Recent years are easy to guess": "Hiljutisi aastaid on lihtne ära arvata",
|
||||
"Dates are often easy to guess": "Kuupäevi on sageli lihtne ära arvata",
|
||||
"A word by itself is easy to guess": "Üksikut sõna on lihtne ära arvata",
|
||||
"Names and surnames by themselves are easy to guess": "Nimesid ja perenimesid on lihtne ära arvata",
|
||||
"Common names and surnames are easy to guess": "Üldisi nimesid ja perenimesid on lihtne ära arvata",
|
||||
"Straight rows of keys are easy to guess": "Klaviatuuril järjest paiknevaid klahvikombinatsioone on lihtne ära arvata",
|
||||
"Help us improve Riot": "Aidake meil täiustada Riot'it",
|
||||
"Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve Riot. This will use a <PolicyLink>cookie</PolicyLink>.": "Saada meile <UsageDataLink>anonüümset kasutusteavet</UsageDataLink>, mis võimaldab meil Riot'it täiustada. Selline teave põhineb <PolicyLink>küpsiste kasutamisel</PolicyLink>.",
|
||||
"I want to help": "Ma soovin aidata",
|
||||
"No": "Ei",
|
||||
"Restart": "Käivita uuesti",
|
||||
"Upgrade your Riot": "Uuenda oma Riot'it",
|
||||
"A new version of Riot is available!": "Uus Riot'i versioon on saadaval!",
|
||||
"You: %(message)s": "Sina: %(message)s",
|
||||
"There was an error joining the room": "Jututoaga liitumisel tekkis viga",
|
||||
"Sorry, your homeserver is too old to participate in this room.": "Vabandust, sinu koduserver on siin jututoas osalemiseks liiga vana.",
|
||||
"Please contact your homeserver administrator.": "Palun võta ühendust koduserveri haldajaga.",
|
||||
"Failed to join room": "Jututoaga liitumine ei õnnestunud",
|
||||
"Font scaling": "Fontide skaleerimine",
|
||||
"Custom user status messages": "Kasutajate kohandatud olekuteated",
|
||||
"Use IRC layout": "Kasuta IRC-tüüpi paigutust",
|
||||
"Font size": "Fontide suurus",
|
||||
"Custom font size": "Fontide kohandatud suurus",
|
||||
"Enable automatic language detection for syntax highlighting": "Kasuta süntaksi esiletõstmisel automaatset keeletuvastust",
|
||||
"Cross-signing private keys:": "Privaatvõtmed risttunnustamise jaoks:",
|
||||
"Identity Server URL must be HTTPS": "Isikutuvastusserveri URL peab kasutama HTTPS-protokolli",
|
||||
"Not a valid Identity Server (status code %(code)s)": "See ei ole sobilik isikutuvastusserver (staatuskood %(code)s)",
|
||||
"Could not connect to Identity Server": "Ei saanud ühendust isikutuvastusserveriga",
|
||||
"Checking server": "Kontrollin serverit",
|
||||
"Change identity server": "Muuda isikutuvastusserverit",
|
||||
"Disconnect from the identity server <current /> and connect to <new /> instead?": "Kas katkestame ühenduse <current /> isikutuvastusserveriga ning selle asemel loome uue ühenduse serveriga <new />?",
|
||||
"Terms of service not accepted or the identity server is invalid.": "Kas puudub nõustumine kasutustingimustega või on isikutuvastusserver vale.",
|
||||
"The identity server you have chosen does not have any terms of service.": "Sinu valitud isikutuvastusserveril pole kasutustingimusi.",
|
||||
"Disconnect identity server": "Katkesta ühendus isikutuvastusserveriga",
|
||||
"Disconnect from the identity server <idserver />?": "Kas katkestame ühenduse isikutuvastusserveriga <idserver />?",
|
||||
"Disconnect": "Katkesta ühendus",
|
||||
"You should:": "Sa peaksid:",
|
||||
"check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "kontrollima kas mõni brauseriplugin takistab ühendust isikutuvastusserveriga (nagu näiteks Privacy Badger)",
|
||||
"contact the administrators of identity server <idserver />": "võtma ühendust isikutuvastusserveri <idserver /> haldajaga",
|
||||
"wait and try again later": "ootama ja proovima hiljem uuesti",
|
||||
"Disconnect anyway": "Ikkagi katkesta ühendus",
|
||||
"You are still <b>sharing your personal data</b> on the identity server <idserver />.": "Sa jätkuvalt <b>jagad oma isikuandmeid</b> isikutuvastusserveriga <idserver />.",
|
||||
"Go back": "Mine tagasi",
|
||||
"Identity Server (%(server)s)": "Isikutuvastusserver %(server)s",
|
||||
"Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Sinu serveri haldur on lülitanud läbiva krüptimise omavahelistes jututubades ja otsesõnumites välja.",
|
||||
"This room has been replaced and is no longer active.": "See jututuba on asendatud teise jututoaga ning ei ole enam kasutusel.",
|
||||
"You do not have permission to post to this room": "Sul ei ole õigusi siia jututuppa kirjutamiseks",
|
||||
"Bold": "Paks kiri",
|
||||
"Italics": "Kaldkiri",
|
||||
"Strikethrough": "Läbikriipsutus",
|
||||
"Code block": "Koodiplokk",
|
||||
"Show": "Näita",
|
||||
"Message preview": "Sõnumi eelvaade",
|
||||
"List options": "Loendi valikud",
|
||||
"Show %(count)s more|other": "Näita veel %(count)s sõnumit",
|
||||
"Show %(count)s more|one": "Näita veel %(count)s sõnumit",
|
||||
"This room is private, and can only be joined by invitation.": "See jututuba on vaid omavaheliseks kasutuseks ning liitumine toimub kutse alusel.",
|
||||
"Upgrade this room to version %(version)s": "Uuenda jututuba versioonini %(version)s",
|
||||
"Upgrade Room Version": "Uuenda jututoa versioon",
|
||||
"Upgrading this room requires closing down the current instance of the room and creating a new room in its place. To give room members the best possible experience, we will:": "Selle jututoa uuendamine eeldab tema praeguse ilmingu tegevuse lõpetamist ja uue jututoa loomist selle asemele. Selleks, et kõik kulgeks jututoas osalejate jaoks ladusalt, toimime nüüd nii:",
|
||||
"Create a new room with the same name, description and avatar": "loome uue samanimelise jututoa, millel on sama kirjeldus ja tunnuspilt",
|
||||
"Update any local room aliases to point to the new room": "uuendame kõik jututoa aliased nii, et nad viitaks uuele jututoale",
|
||||
"Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "ei võimalda kasutajatel enam vanas jututoas suhelda ning avaldame seal teate, mis soovitab kõigil kolida uude jututuppa",
|
||||
"Put a link back to the old room at the start of the new room so people can see old messages": "selleks et saaks vanu sõnumeid lugeda, paneme uue jututoa algusesse viite vanale jututoale",
|
||||
"Automatically invite users": "Kutsu kasutajad automaatselt",
|
||||
"Upgrade private room": "Uuenda omavaheline jututuba",
|
||||
"Upgrade public room": "Uuenda avalik jututuba",
|
||||
"Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Jututoa uuendamine on keerukas toiming ning tavaliselt soovitatakse seda teha vaid siis, kui jututuba on vigade tõttu halvasti kasutatav, sealt on puudu vajalikke funktsionaalsusi või seal ilmneb turvavigu.",
|
||||
"This usually only affects how the room is processed on the server. If you're having problems with your Riot, please <a>report a bug</a>.": "Selline tegevus mõjutab tavaliselt vaid viisi, kuidas jututoa andmeid töödeldakse serveris. Kui sinu kasutatavas Riot'is tekib vigu, siis palun saada meile <a>veateade</a>.",
|
||||
"You'll upgrade this room from <oldVersion /> to <newVersion />.": "Sa uuendad jututoa versioonist <oldVersion /> versioonini <newVersion />.",
|
||||
"Clear Storage and Sign Out": "Tühjenda andmeruum ja logi välja",
|
||||
"Send Logs": "Saada logikirjed",
|
||||
"Refresh": "Värskenda",
|
||||
"Unable to restore session": "Sessiooni taastamine ei õnnestunud",
|
||||
"We encountered an error trying to restore your previous session.": "Meil tekkis eelmise sessiooni taastamisel viga.",
|
||||
"If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Kui sa varem oled kasutanud uuemat Riot'i versiooni, siis sinu pragune sessioon ei pruugi olla sellega ühilduv. Sulge see aken ja jätka selle uuema versiooni kasutamist.",
|
||||
"Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Brauseri andmeruumi tühjendamine võib selle vea lahendada, kui samas logid sa ka välja ning kogu krüptitud vestlusajalugu muutub loetamatuks.",
|
||||
"Verification Pending": "Verifikatsioon on ootel"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2340,5 +2340,32 @@
|
|||
"This address is available to use": "Tämä osoite on käytettävissä",
|
||||
"This address is already in use": "Tämä osoite on jo käytössä",
|
||||
"Set a room address to easily share your room with other people.": "Aseta huoneelle osoite, jotta voit jakaa huoneen helposti muille.",
|
||||
"Address (optional)": "Osoite (valinnainen)"
|
||||
"Address (optional)": "Osoite (valinnainen)",
|
||||
"sent an image.": "lähetti kuvan.",
|
||||
"Light": "Vaalea",
|
||||
"Dark": "Tumma",
|
||||
"You: %(message)s": "Sinä: %(message)s",
|
||||
"Emoji picker": "Emojivalitsin",
|
||||
"No recently visited rooms": "Ei hiljattain vierailtuja huoneita",
|
||||
"People": "Ihmiset",
|
||||
"Sort by": "Lajittelutapa",
|
||||
"Unread rooms": "Lukemattomat huoneet",
|
||||
"Always show first": "Näytä aina ensin",
|
||||
"Show": "Näytä",
|
||||
"Leave Room": "Poistu huoneesta",
|
||||
"Switch to light mode": "Vaihda vaaleaan teemaan",
|
||||
"Switch to dark mode": "Vaihda tummaan teemaan",
|
||||
"Switch theme": "Vaihda teemaa",
|
||||
"All settings": "Kaikki asetukset",
|
||||
"Archived rooms": "Arkistoidut huoneet",
|
||||
"Feedback": "Palaute",
|
||||
"Account settings": "Tilin asetukset",
|
||||
"Recovery Key": "Palautusavain",
|
||||
"This isn't the recovery key for your account": "Tämä ei ole tilisi palautusavain",
|
||||
"This isn't a valid recovery key": "Tämä ei ole kelvollinen palautusavain",
|
||||
"Looks good!": "Hyvältä näyttää!",
|
||||
"Use Recovery Key or Passphrase": "Käytä palautusavainta tai salalausetta",
|
||||
"Use Recovery Key": "Käytä palautusavainta",
|
||||
"Create a Recovery Key": "Luo palautusavain",
|
||||
"Upgrade your Recovery Key": "Päivitä palautusavaimesi"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2508,5 +2508,25 @@
|
|||
"Leave Room": "Quitter le salon",
|
||||
"Room options": "Options du salon",
|
||||
"Activity": "Activité",
|
||||
"A-Z": "A-Z"
|
||||
"A-Z": "A-Z",
|
||||
"Light": "Clair",
|
||||
"Dark": "Sombre",
|
||||
"Customise your appearance": "Personnalisez l’apparence",
|
||||
"Appearance Settings only affect this Riot session.": "Les paramètres d’apparence affecteront uniquement cette session de Riot.",
|
||||
"Recovery Key": "Clé de récupération",
|
||||
"This isn't the recovery key for your account": "Ce n’est pas la clé de récupération pour votre compte",
|
||||
"This isn't a valid recovery key": "Ce n’est pas une clé de récupération valide",
|
||||
"Looks good!": "Ça a l’air correct !",
|
||||
"Use Recovery Key or Passphrase": "Utiliser la clé ou la phrase secrète de récupération",
|
||||
"Use Recovery Key": "Utiliser la clé de récupération",
|
||||
"Enter your Recovery Key or enter a <a>Recovery Passphrase</a> to continue.": "Saisissez votre clé de récupération ou une <a>phrase secrète de récupération</a> pour continuer.",
|
||||
"Enter your Recovery Key to continue.": "Saisissez votre clé de récupération pour continuer.",
|
||||
"Upgrade your Recovery Key to store encryption keys & secrets with your account data. If you lose access to this login you'll need it to unlock your data.": "Mettez à niveau votre clé de récupération pour stocker vos clés et secrets de chiffrement avec les données de votre compte. Si vous n’avez plus accès à cette connexion, vous en aurez besoin pour déverrouiller vos données.",
|
||||
"Store your Recovery Key somewhere safe, it can be used to unlock your encrypted messages & data.": "Stockez votre clé de récupération dans un endroit sûr, elle peut être utilisée pour déverrouiller vos messages et vos données chiffrés.",
|
||||
"Create a Recovery Key to store encryption keys & secrets with your account data. If you lose access to this login you’ll need it to unlock your data.": "Créez une clé de récupération pour stocker vos clé et secrets de chiffrement avec les données de votre compte. Si vous n’avez plus accès à cette connexion, vous en aurez besoin pour déverrouiller vos données.",
|
||||
"Create a Recovery Key": "Créer une clé de récupération",
|
||||
"Upgrade your Recovery Key": "Mettre à jour votre clé de récupération",
|
||||
"Store your Recovery Key": "Stocker votre clé de récupération",
|
||||
"Use the improved room list (in development - will refresh to apply changes)": "Utiliser la liste de salons améliorée (en développement − actualisera pour appliquer les changements)",
|
||||
"Use the improved room list (will refresh to apply changes)": "Utiliser la liste de salons améliorée (actualisera pour appliquer les changements)"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -789,7 +789,7 @@
|
|||
"Failed to set Direct Message status of room": "Fallo ao establecer o estado Mensaxe Directa da sala",
|
||||
"Monday": "Luns",
|
||||
"Remove from Directory": "Eliminar do directorio",
|
||||
"Enable them now": "Activalos agora",
|
||||
"Enable them now": "Activalas agora",
|
||||
"Toolbox": "Ferramentas",
|
||||
"Collecting logs": "Obtendo rexistros",
|
||||
"You must specify an event type!": "Debe indicar un tipo de evento!",
|
||||
|
|
@ -1660,5 +1660,307 @@
|
|||
"Everyone in this room is verified": "Todas nesta sala están verificadas",
|
||||
"Edit message": "Editar mensaxe",
|
||||
"Mod": "Mod",
|
||||
"Your key share request has been sent - please check your other sessions for key share requests.": "Enviouse a solicitude de compartir chave - comproba as túas outras sesións para solicitudes de compartir chave."
|
||||
"Your key share request has been sent - please check your other sessions for key share requests.": "Enviouse a solicitude de compartir chave - comproba as túas outras sesións para solicitudes de compartir chave.",
|
||||
"Light": "Claro",
|
||||
"Dark": "Escuro",
|
||||
"Customise your appearance": "Personaliza o aspecto",
|
||||
"Appearance Settings only affect this Riot session.": "Os axustes da aparencia só lle afectan a esta sesión Riot.",
|
||||
"Key share requests are sent to your other sessions automatically. If you rejected or dismissed the key share request on your other sessions, click here to request the keys for this session again.": "As solicitudes de compartir Chave envíanse ás outras túas sesións abertas. Se rexeitaches ou obviaches a solicitude nas outras sesións, preme aquí para voltar a facer a solicitude.",
|
||||
"If your other sessions do not have the key for this message you will not be able to decrypt them.": "Se as túas outras sesións non teñen a chave para esta mensaxe non poderás descifrala.",
|
||||
"<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "<requestLink>Volta a solicitar chaves de cifrado</requestLink> desde as outras sesións.",
|
||||
"This message cannot be decrypted": "Esta mensaxe non pode descifrarse",
|
||||
"Encrypted by an unverified session": "Cifrada por unha sesión non verificada",
|
||||
"Unencrypted": "Non cifrada",
|
||||
"Encrypted by a deleted session": "Cifrada por unha sesión eliminada",
|
||||
"Invite only": "Só por convite",
|
||||
"Scroll to most recent messages": "Ir ás mensaxes máis recentes",
|
||||
"Close preview": "Pechar vista previa",
|
||||
"Emoji picker": "Selector Emoticona",
|
||||
"Send a reply…": "Responder…",
|
||||
"Send a message…": "Enviar mensaxe…",
|
||||
"The conversation continues here.": "A conversa continúa aquí.",
|
||||
"This room has been replaced and is no longer active.": "Esta sala foi substituída e xa non está activa.",
|
||||
"Bold": "Resaltado",
|
||||
"Italics": "Cursiva",
|
||||
"Code block": "Bloque de código",
|
||||
"No recently visited rooms": "Sen salas recentes visitadas",
|
||||
"People": "Persoas",
|
||||
"Joining room …": "Uníndote a sala…",
|
||||
"Loading …": "Cargando…",
|
||||
"Rejecting invite …": "Rexeitando convite…",
|
||||
"Loading room preview": "Cargando vista previa",
|
||||
"You were kicked from %(roomName)s by %(memberName)s": "Foches expulsada de %(roomName)s por %(memberName)s",
|
||||
"Reason: %(reason)s": "Razón: %(reason)s",
|
||||
"Forget this room": "Esquecer sala",
|
||||
"You were banned from %(roomName)s by %(memberName)s": "Foches bloqueada en %(roomName)s por %(memberName)s",
|
||||
"Something went wrong with your invite to %(roomName)s": "Algo fallou co teu convite para %(roomName)s",
|
||||
"An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "Un erro (%(errcode)s) foi devolto ao intentar validar o convite. Podes intentar enviarlle esta información a administración da sala.",
|
||||
"This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "Este convite para %(roomName)s foi enviado a %(email)s que non está asociado coa túa conta",
|
||||
"Link this email with your account in Settings to receive invites directly in Riot.": "Liga este email coa túa conta nos Axustes para recibir convites directamente en Riot.",
|
||||
"This invite to %(roomName)s was sent to %(email)s": "Este convite para %(roomName)s foi enviado a %(email)s",
|
||||
"Use an identity server in Settings to receive invites directly in Riot.": "Usa un servidor de identidade nos Axustes para recibir convites directamente en Riot.",
|
||||
"Share this email in Settings to receive invites directly in Riot.": "Comparte este email en Axustes para recibir convites directamente en Riot.",
|
||||
"Do you want to chat with %(user)s?": "Desexas conversar con %(user)s?",
|
||||
"<userName/> wants to chat": "<userName/> quere conversar",
|
||||
"Start chatting": "Comeza a conversa",
|
||||
"<userName/> invited you": "<userName/> convidoute",
|
||||
"Reject & Ignore user": "Rexeitar e Ignorar usuaria",
|
||||
"This room doesn't exist. Are you sure you're at the right place?": "Esta sala non existe. ¿Tes a certeza de estar no lugar correcto?",
|
||||
"Try again later, or ask a room admin to check if you have access.": "Inténtao máis tarde, ou pídelle á administración da instancia que comprobe se tes acceso.",
|
||||
"%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "%(errcode)s foi devolto ao intentar acceder a sala. Se cres que esta mensaxe non é correcta, por favor <issueLink>envía un informe de fallo</issueLink>.",
|
||||
"Never lose encrypted messages": "Non perdas nunca acceso ás mensaxes cifradas",
|
||||
"Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "As mensaxes nesta sala están aseguradas con cifrado extremo-a-extremo. Só ti e o correspondente(s) tedes as chaves para ler as mensaxes.",
|
||||
"Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Fai unha copia das chaves para evitar perdelas. <a>Saber máis.</a>",
|
||||
"Not now": "Agora non",
|
||||
"Don't ask me again": "Non preguntarme outra vez",
|
||||
"Sort by": "Orde por",
|
||||
"Activity": "Actividade",
|
||||
"A-Z": "A-Z",
|
||||
"Unread rooms": "Salas non lidas",
|
||||
"Always show first": "Mostrar sempre primeiro",
|
||||
"Show": "Mostrar",
|
||||
"Message preview": "Vista previa da mensaxe",
|
||||
"List options": "Opcións da listaxe",
|
||||
"Add room": "Engadir sala",
|
||||
"Show %(count)s more|other": "Mostrar %(count)s máis",
|
||||
"Show %(count)s more|one": "Mostrar %(count)s máis",
|
||||
"%(count)s unread messages including mentions.|other": "%(count)s mensaxes non lidas incluíndo mencións.",
|
||||
"%(count)s unread messages including mentions.|one": "1 mención non lida.",
|
||||
"%(count)s unread messages.|other": "%(count)s mensaxe non lidas.",
|
||||
"%(count)s unread messages.|one": "1 mensaxe non lida.",
|
||||
"Unread mentions.": "Mencións non lidas.",
|
||||
"Unread messages.": "Mensaxes non lidas.",
|
||||
"Leave Room": "Deixar a Sala",
|
||||
"Room options": "Opcións da Sala",
|
||||
"Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Ao actualizar a sala pecharás a instancia actual da sala e crearás unha versión mellorada co mesmo nome.",
|
||||
"This room has already been upgraded.": "Esta sala xa foi actualizada.",
|
||||
"This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "A sala está usando a versión <roomVersion />, que este servidor considera como <i>non estable</i>.",
|
||||
"Only room administrators will see this warning": "Só a administración da sala pode ver este aviso",
|
||||
"Unknown Command": "Comando descoñecido",
|
||||
"Unrecognised command: %(commandText)s": "Comando non recoñecido: %(commandText)s",
|
||||
"Hint: Begin your message with <code>//</code> to start it with a slash.": "Truco: Comeza a mensaxe con <code>//</code> para comezar cun trazo.",
|
||||
"Send as message": "Enviar como mensaxe",
|
||||
"Failed to connect to integration manager": "Fallou a conexión co xestor de integracións",
|
||||
"Add some now": "Engade algún agora",
|
||||
"Failed to revoke invite": "Fallo ao revogar o convite",
|
||||
"Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Non se revogou o convite. O servidor podería estar experimentando un problema temporal ou non tes permisos suficientes para revogar o convite.",
|
||||
"Revoke invite": "Revogar convite",
|
||||
"Invited by %(sender)s": "Convidada por %(sender)s",
|
||||
"Mark all as read": "Marcar todo como lido",
|
||||
"Error updating main address": "Fallo ao actualizar o enderezo principal",
|
||||
"There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "Algo fallou ao actualizar o enderezo principal da sala. Podería non estar autorizado polo servidor ou ser un fallo temporal.",
|
||||
"Error creating address": "Fallo ao crear o enderezo",
|
||||
"There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.": "Algo fallou ao crear ese enderezo. Podería non estar autorizado polo servidor ou ser un fallo temporal.",
|
||||
"You don't have permission to delete the address.": "Non tes permiso para eliminar o enderezo.",
|
||||
"There was an error removing that address. It may no longer exist or a temporary error occurred.": "Houbo un erro ao eliminar o enderezo. Podería non existir ou ser un fallo temporal.",
|
||||
"Error removing address": "Erro ao eliminar o enderezo",
|
||||
"Main address": "Enderezo principal",
|
||||
"Local address": "Enderezo local",
|
||||
"Published Addresses": "Enderezos publicados",
|
||||
"Other published addresses:": "Outros enderezos publicados:",
|
||||
"No other published addresses yet, add one below": "Aínda non hai outros enderezos publicados, engade un embaixo",
|
||||
"New published address (e.g. #alias:server)": "Novo enderezo publicado (ex. #alias:servidor)",
|
||||
"Local Addresses": "Enderezos locais",
|
||||
"Room Name": "Nome da sala",
|
||||
"Room Topic": "Asunto da sala",
|
||||
"Room avatar": "Avatar da sala",
|
||||
"Waiting for you to accept on your other session…": "Agardando a que aceptes na túa outra sesión…",
|
||||
"Waiting for %(displayName)s to accept…": "Agardando a que %(displayName)s acepte…",
|
||||
"Accepting…": "Aceptando…",
|
||||
"Start Verification": "Comezar a Verificación",
|
||||
"Your messages are secured and only you and the recipient have the unique keys to unlock them.": "As túas mensaxes están seguras e só ti e o correspondente tedes as únicas chaves que as desbloquean.",
|
||||
"In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "Nas salas cifradas, as túas mensaxes están seguras e só ti e o correspondente tedes as únicas chaves que as desbloquean.",
|
||||
"Verify User": "Verificar Usuaria",
|
||||
"For extra security, verify this user by checking a one-time code on both of your devices.": "Para maior seguridade, verifica esta usuaria comprobando o código temporal en dous dos teus dispositivos.",
|
||||
"Your messages are not secure": "As túas mensaxes non están aseguradas",
|
||||
"One of the following may be compromised:": "Un dos seguintes podería estar comprometido:",
|
||||
"Your homeserver": "O teu servidor",
|
||||
"The homeserver the user you’re verifying is connected to": "O servidor ao que a usuaria que estás a verificar está conectada",
|
||||
"Yours, or the other users’ internet connection": "A túa, ou a conexión a internet da outra usuaria",
|
||||
"Yours, or the other users’ session": "A túa, ou a sesión da outra usuaria",
|
||||
"Trusted": "Confiable",
|
||||
"Not trusted": "Non confiable",
|
||||
"%(count)s verified sessions|other": "%(count)s sesións verificadas",
|
||||
"Use the improved room list (in development - will refresh to apply changes)": "Usar a lista de salas mellorada (desenvolvemento - actualizar para aplicar)",
|
||||
"%(count)s verified sessions|one": "1 sesión verificada",
|
||||
"Hide verified sessions": "Agochar sesións verificadas",
|
||||
"%(count)s sessions|other": "%(count)s sesións",
|
||||
"%(count)s sessions|one": "%(count)s sesión",
|
||||
"Hide sessions": "Agochar sesións",
|
||||
"Direct message": "Mensaxe directa",
|
||||
"No recent messages by %(user)s found": "Non se atoparon mensaxes recentes de %(user)s",
|
||||
"Try scrolling up in the timeline to see if there are any earlier ones.": "Desprázate na cronoloxía para ver se hai algúns máis recentes.",
|
||||
"Remove recent messages by %(user)s": "Eliminar mensaxes recentes de %(user)s",
|
||||
"You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|other": "Vas eliminar %(count)s mensaxes de %(user)s. Esto non ten volta, ¿desexas continuar?",
|
||||
"You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "Vas eliminar unha mensaxe de %(user)s. Esto non ten volta, ¿desexas continuar?",
|
||||
"For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Podería demorar un tempo se é un número grande de mensaxes. Non actualices o cliente mentras tanto.",
|
||||
"Remove %(count)s messages|other": "Eliminar %(count)s mensaxes",
|
||||
"Remove %(count)s messages|one": "Eliminar 1 mensaxe",
|
||||
"Remove recent messages": "Eliminar mensaxes recentes",
|
||||
"<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> en %(roomName)s",
|
||||
"Deactivate user?": "¿Desactivar usuaria?",
|
||||
"Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "Ao desactivar esta usuaria ficará desconectada e non poderá voltar a conectar. Ademáis deixará todas as salas nas que estivese. Esta acción non ten volta, ¿desexas desactivar esta usuaria?",
|
||||
"Deactivate user": "Desactivar usuaria",
|
||||
"Failed to deactivate user": "Fallo ao desactivar a usuaria",
|
||||
"This client does not support end-to-end encryption.": "Este cliente non soporta o cifrado extremo-a-extremo.",
|
||||
"Security": "Seguridade",
|
||||
"The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.": "A sesión que intentas verificar non soporta a verificación por código QR ou por emoticonas, que é o que soporta Riot. Inténtao cun cliente diferente.",
|
||||
"Verify by scanning": "Verificar escaneando",
|
||||
"Ask %(displayName)s to scan your code:": "Pídelle a %(displayName)s que escanee o teu código:",
|
||||
"If you can't scan the code above, verify by comparing unique emoji.": "Se non podes escanear o código superior, verifica comparando as emoticonas.",
|
||||
"Verify by comparing unique emoji.": "Verficación por comparación de emoticonas.",
|
||||
"Verify by emoji": "Verificar por emoticonas",
|
||||
"Almost there! Is your other session showing the same shield?": "Case feito! ¿Podes ver as mesmas na túa outra sesión?",
|
||||
"Almost there! Is %(displayName)s showing the same shield?": "Case feito! ¿está %(displayName)s mostrando as mesmas emoticonas?",
|
||||
"Yes": "Si",
|
||||
"Verify all users in a room to ensure it's secure.": "Verificar todas as usuarias da sala para asegurar que é segura.",
|
||||
"Use the improved room list (will refresh to apply changes)": "Usa a lista de salas mellorada (actualizará para aplicar)",
|
||||
"Strikethrough": "Sobrescrito",
|
||||
"In encrypted rooms, verify all users to ensure it’s secure.": "En salas cifradas, verifica todas as usuarias para asegurar que é segura.",
|
||||
"You've successfully verified your device!": "Verificaches correctamente o teu dispositivo!",
|
||||
"You've successfully verified %(deviceName)s (%(deviceId)s)!": "Verificaches correctamente %(deviceName)s (%(deviceId)s)!",
|
||||
"You've successfully verified %(displayName)s!": "Verificaches correctamente a %(displayName)s!",
|
||||
"Verified": "Verficiado",
|
||||
"Got it": "Vale",
|
||||
"Start verification again from the notification.": "Inicia o proceso de novo desde a notificación.",
|
||||
"Start verification again from their profile.": "Inicia a verificación outra vez desde o seu perfil.",
|
||||
"Verification timed out.": "Verificación caducada.",
|
||||
"You cancelled verification on your other session.": "Cancelaches a verificación na túa outra sesión.",
|
||||
"%(displayName)s cancelled verification.": "%(displayName)s cancelou a verificación.",
|
||||
"You cancelled verification.": "Cancelaches a verificación.",
|
||||
"Verification cancelled": "Verificación cancelada",
|
||||
"Compare emoji": "Comparar emoticonas",
|
||||
"Encryption enabled": "Cifrado activado",
|
||||
"Encryption not enabled": "Cifrado desactivado",
|
||||
"The encryption used by this room isn't supported.": "O cifrado desta sala non está soportado.",
|
||||
"React": "Reacciona",
|
||||
"Message Actions": "Accións da mensaxe",
|
||||
"Show image": "Mostrar imaxe",
|
||||
"You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Estás a ignorar a esta usuaria, polo que a imaxe está agochada. <a>Mostrar igualmente.</a>",
|
||||
"You verified %(name)s": "Verificaches a %(name)s",
|
||||
"You cancelled verifying %(name)s": "Cancelaches a verificación de %(name)s",
|
||||
"%(name)s cancelled verifying": "%(name)s cancelou a verificación",
|
||||
"You accepted": "Aceptaches",
|
||||
"%(name)s accepted": "%(name)s aceptou",
|
||||
"You declined": "Declinaches",
|
||||
"You cancelled": "Cancelaches",
|
||||
"%(name)s declined": "%(name)s declinou",
|
||||
"%(name)s cancelled": "%(name)s cancelou",
|
||||
"Accepting …": "Aceptando…",
|
||||
"Declining …": "Declinando…",
|
||||
"%(name)s wants to verify": "%(name)s desexa verificar",
|
||||
"You sent a verification request": "Enviaches unha solicitude de verificación",
|
||||
"Show all": "Mostrar todo",
|
||||
"Reactions": "Reaccións",
|
||||
"<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> reaccionaron con %(content)s</reactedWith>",
|
||||
"<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>reaccionaron con %(shortName)s</reactedWith>",
|
||||
"Message deleted": "Mensaxe eliminada",
|
||||
"Message deleted by %(name)s": "Mensaxe eliminada por %(name)s",
|
||||
"This room is a continuation of another conversation.": "Esta sala é continuación doutra conversa.",
|
||||
"Click here to see older messages.": "Preme aquí para ver mensaxes antigas.",
|
||||
"Edited at %(date)s. Click to view edits.": "Editada o %(date)s. Preme para ver edicións.",
|
||||
"edited": "editada",
|
||||
"Can't load this message": "Non se cargou a mensaxe",
|
||||
"Submit logs": "Enviar rexistro",
|
||||
"Failed to load group members": "Fallou a carga dos membros do grupo",
|
||||
"Frequently Used": "Utilizado con frecuencia",
|
||||
"Smileys & People": "Sorrisos e Persoas",
|
||||
"Animals & Nature": "Animais e Natureza",
|
||||
"Food & Drink": "Comida e Bebida",
|
||||
"Activities": "Actividades",
|
||||
"Travel & Places": "Viaxes e Lugares",
|
||||
"Objects": "Obxectos",
|
||||
"Symbols": "Símbolos",
|
||||
"Flags": "Bandeiras",
|
||||
"Categories": "Categorías",
|
||||
"Quick Reactions": "Reaccións rápidas",
|
||||
"Cancel search": "Cancelar busca",
|
||||
"Any of the following data may be shared:": "Calquera do seguinte podería ser compartido:",
|
||||
"Your display name": "Nome mostrado",
|
||||
"Your avatar URL": "URL do avatar",
|
||||
"Your user ID": "ID de usuaria",
|
||||
"Riot URL": "URL Riot",
|
||||
"Room ID": "ID da sala",
|
||||
"Widget ID": "ID do widget",
|
||||
"Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Ao utilizar este widget poderías compartir datos <helpIcon /> con %(widgetDomain)s e o teu Xestor de integracións.",
|
||||
"Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Ao utilizar este widget poderías compartir datos <helpIcon /> con %(widgetDomain)s.",
|
||||
"Widgets do not use message encryption.": "Os Widgets non usan cifrado de mensaxes.",
|
||||
"Widget added by": "Widget engadido por",
|
||||
"This widget may use cookies.": "Este widget podería usar cookies.",
|
||||
"Maximize apps": "Maximizar apps",
|
||||
"More options": "Máis opcións",
|
||||
"Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Por favor <newIssueLink>abre un novo informe</newIssueLink> en GitHub para poder investigar o problema.",
|
||||
"Rotate Left": "Rotar á esquerda",
|
||||
"Rotate counter-clockwise": "Rotar sentido contra-horario",
|
||||
"Rotate Right": "Rotar á dereita",
|
||||
"Rotate clockwise": "Rotar sentido horario",
|
||||
"Language Dropdown": "Selector de idioma",
|
||||
"%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s non fixeron cambios %(count)s veces",
|
||||
"%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s non fixeron cambios",
|
||||
"%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s non fixo cambios %(count)s veces",
|
||||
"%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s non fixo cambios",
|
||||
"QR Code": "Código QR",
|
||||
"Room address": "Enderezo da sala",
|
||||
"e.g. my-room": "ex. a-miña-sala",
|
||||
"Some characters not allowed": "Algúns caracteres non permitidos",
|
||||
"Please provide a room address": "Proporciona un enderezo para a sala",
|
||||
"This address is available to use": "Este enderezo está dispoñible",
|
||||
"This address is already in use": "Este enderezo xa se está a utilizar",
|
||||
"Enter a server name": "Escribe un nome de servidor",
|
||||
"Looks good": "Pinta ben",
|
||||
"Can't find this server or its room list": "Non se atopa o servidor ou a súa lista de salas",
|
||||
"All rooms": "Todas as salas",
|
||||
"Your server": "O teu servidor",
|
||||
"Are you sure you want to remove <b>%(serverName)s</b>": "¿Tes a certeza de querer eliminar <b>%(serverName)s</b>",
|
||||
"Remove server": "Eliminar servidor",
|
||||
"Matrix": "Matrix",
|
||||
"Add a new server": "Engadir novo servidor",
|
||||
"Server name": "Nome do servidor",
|
||||
"Add a new server...": "Engadir un novo servidor...",
|
||||
"%(networkName)s rooms": "Salas de %(networkName)s",
|
||||
"That doesn't look like a valid email address": "Non semella un enderezo de email válido",
|
||||
"Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Usa un servidor de identidade para convidar por email. <default>Usa valor por omisión (%(defaultIdentityServerName)s)</default> ou xestionao en <settings>Axustes</settings>.",
|
||||
"Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Usa un servidor de identidade para convidar por email. Xestionao en <settings>Axustes</settings>.",
|
||||
"The following users may not exist": "As seguintes usuarias poderían non existir",
|
||||
"Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Non se atopou o perfil dos IDs Matrix da lista inferior - ¿Desexas convidalas igualmente?",
|
||||
"Invite anyway and never warn me again": "Convidar igualmente e non avisarme outra vez",
|
||||
"Invite anyway": "Convidar igualmente",
|
||||
"Close dialog": "Pechar diálogo",
|
||||
"Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Cóntanos o que fallou ou, mellor aínda, abre un informe en GitHub que describa o problema.",
|
||||
"Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Lembra: o teu navegador non está soportado, polo que poderían acontecer situacións non agardadas.",
|
||||
"Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Antes de enviar os rexistros, deberías <a>abrir un informe en GitHub</a> para describir o problema.",
|
||||
"GitHub issue": "Informe en GitHub",
|
||||
"Notes": "Notas",
|
||||
"Unable to load commit detail: %(msg)s": "Non se cargou o detalle do commit: %(msg)s",
|
||||
"Removing…": "Eliminando…",
|
||||
"Destroy cross-signing keys?": "Destruír chaves de sinatura-cruzada?",
|
||||
"Clear cross-signing keys": "Baleirar chaves de sinatura-cruzada",
|
||||
"Clear all data in this session?": "¿Baleirar todos os datos desta sesión?",
|
||||
"Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "O baleirado dos datos da sesión é permanente. As mensaxes cifradas perderánse a menos que as súas chaves estiveren nunha copia de apoio.",
|
||||
"Clear all data": "Eliminar todos os datos",
|
||||
"Please enter a name for the room": "Escribe un nome para a sala",
|
||||
"Set a room address to easily share your room with other people.": "Establece un enderezo para a sala fácil de compartir con outras persoas.",
|
||||
"This room is private, and can only be joined by invitation.": "Esta sala é privada, e só te podes unir a través dun convite.",
|
||||
"You can’t disable this later. Bridges & most bots won’t work yet.": "Podes desactivar esto posteriormente. As pontes e maioría de bots aínda non funcionarán.",
|
||||
"Enable end-to-end encryption": "Activar cifrado extremo-a-extremo",
|
||||
"Create a public room": "Crear sala pública",
|
||||
"Create a private room": "Crear sala privada",
|
||||
"Topic (optional)": "Asunto (optativo)",
|
||||
"Make this room public": "Facer pública esta sala",
|
||||
"Hide advanced": "Ocultar Avanzado",
|
||||
"Show advanced": "Mostrar Avanzado",
|
||||
"Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Evitar que usuarias de outros servidores matrix se unan a esta sala (Este axuste non se pode cambiar máis tarde!)",
|
||||
"To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of Riot to do this": "Para evitar perder o historial da conversa, debes exportar as chaves da sala antes de desconectarte. Necesitarás voltar á nova versión de Riot para facer esto",
|
||||
"You've previously used a newer version of Riot with this session. To use this version again with end to end encryption, you will need to sign out and back in again.": "Xa utilizaches unha versión máis nova de Riot nesta sesión. Para usar esta versión novamente con cifrado extremo-a-extremo tes que desconectarte e voltar a conectar.",
|
||||
"Incompatible Database": "Base de datos non compatible",
|
||||
"Continue With Encryption Disabled": "Continuar con Cifrado Desactivado",
|
||||
"Are you sure you want to deactivate your account? This is irreversible.": "¿Tes a certeza de querer desactivar a túa conta? Esto é irreversible.",
|
||||
"Confirm account deactivation": "Confirma a desactivación da conta",
|
||||
"There was a problem communicating with the server. Please try again.": "Houbo un problema ao comunicar co servidor. Inténtao outra vez.",
|
||||
"Server did not require any authentication": "O servidor non require auténticación",
|
||||
"Server did not return valid authentication information.": "O servidor non devolveu información válida de autenticación.",
|
||||
"View Servers in Room": "Ver Servidores na Sala",
|
||||
"Verification Requests": "Solicitudes de Verificación",
|
||||
"Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verifica esta usuaria para marcala como confiable. Ao confiar nas usuarias proporcionache tranquilidade extra cando usas cifrado de extremo-a-extremo.",
|
||||
"Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Ao verificar esta usuaria marcarás a súa sesión como confiable, e tamén marcará a túa sesión como confiable para elas."
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2494,5 +2494,27 @@
|
|||
"All settings": "Minden beállítás",
|
||||
"Archived rooms": "Archivált szobák",
|
||||
"Feedback": "Visszajelzés",
|
||||
"Account settings": "Fiók beállítása"
|
||||
"Account settings": "Fiók beállítása",
|
||||
"Light": "Világos",
|
||||
"Dark": "Sötét",
|
||||
"Customise your appearance": "Szabd személyre a megjelenítést",
|
||||
"Appearance Settings only affect this Riot session.": "A megjelenítési beállítások csak erre a munkamenetre vonatkoznak.",
|
||||
"Activity": "Aktivitás",
|
||||
"A-Z": "A-Z",
|
||||
"Recovery Key": "Visszaállítási Kulcs",
|
||||
"This isn't the recovery key for your account": "Ez nem a fiókod visszaállítási kulcsa",
|
||||
"This isn't a valid recovery key": "Ez nem egy érvényes visszaállítási kulcs",
|
||||
"Looks good!": "Jól néz ki!",
|
||||
"Use Recovery Key or Passphrase": "Használd a visszaállítási kulcsot vagy jelmondatot",
|
||||
"Use Recovery Key": "Használd a Visszaállítási Kulcsot",
|
||||
"Enter your Recovery Key or enter a <a>Recovery Passphrase</a> to continue.": "A továbblépéshez add meg a Visszaállítási kulcsot vagy a <a>Visszaállítási jelmondatot</a>.",
|
||||
"Enter your Recovery Key to continue.": "A továbblépéshez add meg a Visszaállítási Kulcsot.",
|
||||
"Upgrade your Recovery Key to store encryption keys & secrets with your account data. If you lose access to this login you'll need it to unlock your data.": "Fejleszd a Visszaállítási kulcsot, hogy a fiók adatokkal tárolhasd a titkosítási kulcsokat és jelszavakat. Szükséged lesz rá hogy hozzáférj az adataidhoz ha elveszted a hozzáférésed ehhez a bejelentkezéshez.",
|
||||
"Store your Recovery Key somewhere safe, it can be used to unlock your encrypted messages & data.": "A Visszaállítási kulcsot tárold biztonságos helyen mivel felhasználható a titkosított üzenetekhez és adatokhoz való hozzáféréshez.",
|
||||
"Create a Recovery Key to store encryption keys & secrets with your account data. If you lose access to this login you’ll need it to unlock your data.": "Készíts Visszaállítási kulcsot, hogy a fiók adatokkal tárolhasd a titkosítási kulcsokat és jelszavakat. Szükséged lesz rá hogy hozzáférj az adataidhoz ha elveszted a hozzáférésed ehhez a bejelentkezéshez.",
|
||||
"Create a Recovery Key": "Visszaállítási kulcs készítése",
|
||||
"Upgrade your Recovery Key": "A Visszaállítási kulcs fejlesztése",
|
||||
"Store your Recovery Key": "Visszaállítási kulcs tárolása",
|
||||
"Use the improved room list (in development - will refresh to apply changes)": "Használd a fejlesztett szoba listát (fejlesztés alatt - a változások a frissítés után aktiválódnak)",
|
||||
"Use the improved room list (will refresh to apply changes)": "Használd a fejlesztett szoba listát (a változások életbe lépéséhez újra fog tölteni)"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2502,5 +2502,25 @@
|
|||
"Leave Room": "Lascia stanza",
|
||||
"Room options": "Opzioni stanza",
|
||||
"Activity": "Attività",
|
||||
"A-Z": "A-Z"
|
||||
"A-Z": "A-Z",
|
||||
"Light": "Chiaro",
|
||||
"Dark": "Scuro",
|
||||
"Customise your appearance": "Personalizza l'aspetto",
|
||||
"Appearance Settings only affect this Riot session.": "Le impostazioni dell'aspetto hanno effetto solo in questa sessione di Riot.",
|
||||
"Recovery Key": "Chiave di recupero",
|
||||
"This isn't the recovery key for your account": "Questa non è la chiave di recupero del tuo account",
|
||||
"This isn't a valid recovery key": "Questa non è una chiave di ripristino valida",
|
||||
"Looks good!": "Sembra giusta!",
|
||||
"Use Recovery Key or Passphrase": "Usa la chiave o password di recupero",
|
||||
"Use Recovery Key": "Usa chiave di recupero",
|
||||
"Use the improved room list (in development - will refresh to apply changes)": "Usa l'elenco di stanze migliorato (in sviluppo - verrà ricaricato per applicare le modifiche)",
|
||||
"Enter your Recovery Key or enter a <a>Recovery Passphrase</a> to continue.": "Inserisci la tua chiave di recupero o una <a>password di recupero</a> per continuare.",
|
||||
"Enter your Recovery Key to continue.": "Inserisci la tua chiave di recupero per continuare.",
|
||||
"Upgrade your Recovery Key to store encryption keys & secrets with your account data. If you lose access to this login you'll need it to unlock your data.": "Aggiorna la tua chiave di recupero per memorizzare le chiavi di cifratura e i segreti con i dati del tuo account. Se perdi l'accesso a questo login, ti servirà per sbloccare i tuoi dati.",
|
||||
"Store your Recovery Key somewhere safe, it can be used to unlock your encrypted messages & data.": "Conserva la tua chiave di recupero in un posto sicuro, può essere usata per sbloccare i tuoi messaggi e dati cifrati.",
|
||||
"Create a Recovery Key to store encryption keys & secrets with your account data. If you lose access to this login you’ll need it to unlock your data.": "Crea un chiave di recupero per memorizzare le chiavi di cifratura e i segreti con i dati del tuo account. Se perdi l'accesso a questo login, ti servirà per sbloccare i tuoi dati.",
|
||||
"Create a Recovery Key": "Crea una chiave di recupero",
|
||||
"Upgrade your Recovery Key": "Aggiorna la chiave di recupero",
|
||||
"Store your Recovery Key": "Salva la chiave di recupero",
|
||||
"Use the improved room list (will refresh to apply changes)": "Usa l'elenco stanze migliorato (verrà ricaricato per applicare le modifiche)"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1400,5 +1400,36 @@
|
|||
"Service": "サービス",
|
||||
"Summary": "概要",
|
||||
"Document": "ドキュメント",
|
||||
"Appearance": "外観"
|
||||
"Appearance": "外観",
|
||||
"Other users may not trust it": "他のユーザーはこのセッションを信頼しない可能性があります",
|
||||
"Show a placeholder for removed messages": "削除されたメッセージの場所にプレースホルダーを表示",
|
||||
"Show join/leave messages (invites/kicks/bans unaffected)": "参加/退出のメッセージを表示 (招待/追放/ブロック には影響しません)",
|
||||
"Prompt before sending invites to potentially invalid matrix IDs": "不正な可能性のある Matrix ID に招待を送るまえに確認を表示",
|
||||
"Order rooms by name": "名前順で部屋を整列",
|
||||
"Show rooms with unread notifications first": "未読通知のある部屋をトップに表示",
|
||||
"Show shortcuts to recently viewed rooms above the room list": "最近表示した部屋のショートカットを部屋リストの上に表示",
|
||||
"Show previews/thumbnails for images": "画像のプレビュー/サムネイルを表示",
|
||||
"Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "あなたのアカウントではクロス署名の認証情報がシークレットストレージに保存されていますが、このセッションでは信頼されていません。",
|
||||
"Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.": "Riot はウェブブラウザでは暗号化されたメッセージを安全にキャッシュできません。暗号化されたメッセージを検索結果に表示するには <riotLink>Riot Desktop</riotLink> を利用してください。",
|
||||
"This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "このセッションでは<b>キーをバックアップしていません</b>。ですが、あなたは復元に使用したり今後キーを追加したりできるバックアップを持っています。",
|
||||
"Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "このセッションのみにあるキーを失なわないために、セッションをキーバックアップに接続しましょう。",
|
||||
"Connect this session to Key Backup": "このセッションをキーバックアップに接続",
|
||||
"Autocomplete delay (ms)": "自動補完の遅延 (ms)",
|
||||
"Missing media permissions, click the button below to request.": "メディア権限が不足しています、リクエストするには下のボタンを押してください。",
|
||||
"Request media permissions": "メディア権限をリクエスト",
|
||||
"Joining room …": "部屋に参加中...",
|
||||
"Join the discussion": "話し合いに参加",
|
||||
"%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s はプレビューできません。部屋に参加しますか？",
|
||||
"Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "他のユーザーがあなたのホームサーバー (%(localDomain)s) を通じてこの部屋を見つけられるよう、アドレスを設定しましょう",
|
||||
"<b>Warning</b>: You should only do this on a trusted computer.": "<b>警告</b>: 信頼できるコンピュータでのみこれを実行するべきです。",
|
||||
"Enter recovery key": "リカバリキーを入力",
|
||||
"Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "暗号化されたメッセージへアクセスしたりクロス署名認証情報で他のセッションを承認するにはリカバリキーを入力してください。",
|
||||
"If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "リカバリキーを忘れた場合は<button>新しいリカバリオプションをセットアップ</button>できます。",
|
||||
"Verify this login": "このログインを承認",
|
||||
"Signing In...": "サインインしています...",
|
||||
"If you've joined lots of rooms, this might take a while": "たくさんの部屋に参加している場合は、時間がかかる可能性があります",
|
||||
"Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "このログインを他のセッションで承認し、あなたの認証情報を確認すれば、暗号化されたメッセージへアクセスできるようになります。",
|
||||
"This requires the latest Riot on your other devices:": "最新版の Riot が他のあなたのデバイスで実行されている必要があります:",
|
||||
"or another cross-signing capable Matrix client": "もしくはクロス署名に対応した他の Matrix クライアント",
|
||||
"Without completing security on this session, it won’t have access to encrypted messages.": "このセッションでのセキュリティを完了させない限り、暗号化されたメッセージにはアクセスできません。"
|
||||
}
|
||||
|
|
|
|||
350
src/i18n/strings/kab.json
Normal file
350
src/i18n/strings/kab.json
Normal file
|
|
@ -0,0 +1,350 @@
|
|||
{
|
||||
"Confirm": "Sentem",
|
||||
"Analytics": "Tiselḍin",
|
||||
"Error": "Tuccḍa",
|
||||
"Dismiss": "Agwi",
|
||||
"OK": "IH",
|
||||
"Permission Required": "Tasiregt tlaq",
|
||||
"Continue": "Kemmel",
|
||||
"Cancel": "Semmet",
|
||||
"Sun": "Ace",
|
||||
"Mon": "Ari",
|
||||
"Tue": "Ara",
|
||||
"Wed": "Aha",
|
||||
"Thu": "Amh",
|
||||
"Fri": "Sem",
|
||||
"Sat": "Sed",
|
||||
"Jan": "Yen",
|
||||
"Feb": "Fuṛ",
|
||||
"Mar": "Meɣ",
|
||||
"Apr": "Yeb",
|
||||
"May": "May",
|
||||
"Jun": "Yun",
|
||||
"Jul": "Yul",
|
||||
"Aug": "Ɣuc",
|
||||
"Sep": "Cte",
|
||||
"Oct": "Tub",
|
||||
"Nov": "Wam",
|
||||
"Dec": "Duj",
|
||||
"PM": "MD",
|
||||
"AM": "FT",
|
||||
"Trust": "Ittkel",
|
||||
"Create Account": "Rnu amiḍan",
|
||||
"Sign In": "Kcem",
|
||||
"Default": "Amezwer",
|
||||
"Moderator": "Aseɣyad",
|
||||
"Admin": "Anedbal",
|
||||
"You need to be logged in.": "Tesriḍ ad teqqneḍ.",
|
||||
"Messages": "Iznan",
|
||||
"Actions": "Tigawin",
|
||||
"Advanced": "Talqayt",
|
||||
"Other": "Nniḍen",
|
||||
"Usage": "Aseqdec",
|
||||
"Thank you!": "Tanemmirt!",
|
||||
"Reason": "Taɣẓint",
|
||||
"Someone": "Albaɛḍ",
|
||||
"Light": "Aceɛlal",
|
||||
"Dark": "Aberkan",
|
||||
"Done": "Immed",
|
||||
"Add another word or two. Uncommon words are better.": "Rnu awal-nniḍen neɣ sin. Awalen imexḍa ad lhun.",
|
||||
"No": "Uhu",
|
||||
"Review": "Senqed",
|
||||
"Later": "Ticki",
|
||||
"Notifications": "Ilɣa",
|
||||
"Close": "Mdel",
|
||||
"Warning": "Asmigel",
|
||||
"Ok": "Ih",
|
||||
"Set password": "Sbadu awal uffir",
|
||||
"Upgrade": "Leqqem",
|
||||
"Verify": "Senqed",
|
||||
"What's New": "D acu-t umaynut",
|
||||
"Update": "Leqqem",
|
||||
"Restart": "Ales tanekra",
|
||||
"Font size": "Tuɣzi n tsefsit",
|
||||
"Custom font size": "Tiddi n tsefsit yugnen",
|
||||
"Decline": "Agwi",
|
||||
"Accept": "Qbel",
|
||||
"or": "neɣ",
|
||||
"Start": "Bdu",
|
||||
"Cat": "Amcic",
|
||||
"Lion": "Izem",
|
||||
"Rabbit": "Awtul",
|
||||
"Turtle": "Afekrun",
|
||||
"Tree": "Aseklu",
|
||||
"Clock": "Tamrint",
|
||||
"Book": "Adlis",
|
||||
"Lock": "Sekkeṛ",
|
||||
"Key": "Tasarut",
|
||||
"Telephone": "Tiliγri",
|
||||
"Flag": "Anay",
|
||||
"Bicycle": "Azlalam",
|
||||
"Ball": "Balles",
|
||||
"Anchor": "Tamdeyt",
|
||||
"Headphones": "Casque",
|
||||
"Folder": "Akaram",
|
||||
"Upload": "Sali",
|
||||
"Remove": "Sfeḍ",
|
||||
"Show less": "Sken-d drus",
|
||||
"Show more": "Sken-d ugar",
|
||||
"Warning!": "Ɣur-k!",
|
||||
"Current password": "Awal uffir amiran",
|
||||
"Password": "Awal uffir",
|
||||
"New Password": "Awal uffir amaynut",
|
||||
"Confirm password": "Sentem awal uffir",
|
||||
"Change Password": "Snifel Awal Uffir",
|
||||
"not found": "ulac-it",
|
||||
"Authentication": "Asesteb",
|
||||
"ID": "ID",
|
||||
"Manage": "Sefrek",
|
||||
"Enable": "Rmed",
|
||||
"Keywords": "Awalen tisura",
|
||||
"Clear notifications": "Sfeḍ ilɣuyen",
|
||||
"Off": "Insa",
|
||||
"Display Name": "Mefffer isem",
|
||||
"Save": "Sekles",
|
||||
"Disconnect": "Yeffeɣ",
|
||||
"Go back": "Uɣal ɣer deffir",
|
||||
"Change": "Changer",
|
||||
"Theme": "Asentel",
|
||||
"Success": "Yedda",
|
||||
"Profile": "Amaɣnu",
|
||||
"Account": "Amiḍan",
|
||||
"General": "Amatu",
|
||||
"Legal": "Usḍif",
|
||||
"Credits": "Asenmer",
|
||||
"Chat with Riot Bot": "Asqerdec akked Riot Bot",
|
||||
"FAQ": "Isteqsiyen FAQ",
|
||||
"Keyboard Shortcuts": "Inegzumen n unasiw",
|
||||
"Versions": "Ileqman",
|
||||
"None": "Ula yiwen",
|
||||
"Unsubscribe": "Se désabonner",
|
||||
"Ignore": "Ttu",
|
||||
"Subscribe": "Jerred",
|
||||
"Preferences": "Tiwelhiwin",
|
||||
"Composer": "Editeur",
|
||||
"Timeline": "Amazray",
|
||||
"Microphone": "Asawaḍ",
|
||||
"Camera": "Takamiṛatt",
|
||||
"Sounds": "Imeslan",
|
||||
"Reset": "Ales awennez",
|
||||
"Browse": "Snirem",
|
||||
"Default role": "Tamlilt tamzwert",
|
||||
"Permissions": "Tisirag",
|
||||
"Anyone": "Yal yiwen",
|
||||
"Encryption": "Awgelhen",
|
||||
"Complete": "Yemmed",
|
||||
"Share": "Bḍu",
|
||||
"Verification code": "Tangalt n usenqed",
|
||||
"Add": "Rnu",
|
||||
"Email Address": "Tansa imayl",
|
||||
"Phone Number": "Uṭṭun n tiliɣri",
|
||||
"Upload file": "Azen afaylu",
|
||||
"Bold": "Azuran",
|
||||
"Strikethrough": "Jerreḍ",
|
||||
"Quote": "Citation",
|
||||
"Loading...": "Yessalay-ed…",
|
||||
"Idle": "Idle",
|
||||
"Unknown": "D arussin",
|
||||
"Settings": "Iɣewwaren",
|
||||
"Search": "Nadi",
|
||||
"Favourites": "Ismenyifen",
|
||||
"People": "Imdanen",
|
||||
"Sign Up": "Jerred",
|
||||
"Reject": "Aggi",
|
||||
"Not now": "Mačči tura",
|
||||
"Sort by": "Smizzwer s",
|
||||
"Activity": "Armud",
|
||||
"A-Z": "A-Z",
|
||||
"Show": "Sken",
|
||||
"Options": "Tinefrunin",
|
||||
"Server error": "Tuccḍa n uqeddac",
|
||||
"Members": "Imedrawen",
|
||||
"Files": "Ifuyla",
|
||||
"Trusted": "De confiance",
|
||||
"Invite": "Nced…",
|
||||
"Unmute": "Susem",
|
||||
"Mute": "Kkes imesli",
|
||||
"Are you sure?": "Tebɣiḍ ?",
|
||||
"Security": "Taɣellist",
|
||||
"Yes": "Ih",
|
||||
"Verified": "Verified",
|
||||
"Got it": "Awi-t",
|
||||
"Sunday": "Acer",
|
||||
"Monday": "Arim",
|
||||
"Tuesday": "Aram",
|
||||
"Wednesday": "Ahad",
|
||||
"Thursday": "Amhad",
|
||||
"Friday": "Sem",
|
||||
"Saturday": "Sed",
|
||||
"Today": "Ass-a",
|
||||
"Yesterday": "Iḍelli",
|
||||
"View Source": "Sken aɣbalu",
|
||||
"Reply": "Err",
|
||||
"Edit": "Ẓreg",
|
||||
"Attachment": "Attachement",
|
||||
"Error decrypting attachment": "Tuccḍa deg uzmak n ufaylu yeddan",
|
||||
"Show all": "Sken akk",
|
||||
"Message deleted": "Izen yettwakkes",
|
||||
"Copied!": "Yettusukken!",
|
||||
"edited": "yeẓreg",
|
||||
"Food & Drink": "Učči aked tissit",
|
||||
"Objects": "Tiɣawsiwin",
|
||||
"Symbols": "Izamulen",
|
||||
"Flags": "Anayen",
|
||||
"Categories": "Taggayin",
|
||||
"More options": "Ugar n textirin",
|
||||
"Join": "Semlil",
|
||||
"No results": "Ulac igmad",
|
||||
"collapse": "sneḍfes",
|
||||
"Rotate counter-clockwise": "Zzi di tnila tanemgalt n tsegnatin n temrilt",
|
||||
"Rotate clockwise": "Zzi di tnila n tsegnatin n temrilt",
|
||||
"Add User": "Rnu aseqdac",
|
||||
"Server name": "Isem n uqeddac",
|
||||
"email address": "tansa imayl",
|
||||
"Close dialog": "Mdel tanaka n usdiwen",
|
||||
"Notes": "Tamawt",
|
||||
"Unavailable": "Ulac-it",
|
||||
"Changelog": "Aɣmis n ibeddilen",
|
||||
"Removing…": "Tukksa…",
|
||||
"Confirm Removal": "Serggeg tukksa",
|
||||
"Example": "Amedya",
|
||||
"example": "amedya",
|
||||
"Create": "Snulfu-d",
|
||||
"Name": "Isem",
|
||||
"Sign out": "Ffeɣ",
|
||||
"Back": "Retour",
|
||||
"Send": "Azen",
|
||||
"Suggestions": "Isumar",
|
||||
"Go": "Ddu",
|
||||
"Session name": "Nom de session",
|
||||
"Send report": "Azen aneqqis",
|
||||
"Refresh": "Sismeḍ",
|
||||
"Email address": "Tansa email",
|
||||
"Skip": "Zgel",
|
||||
"Username not available": "Ulac isem n useqdac",
|
||||
"Checking...": "Asenqed...",
|
||||
"Username available": "Yella yisem n useqdac",
|
||||
"Terms of Service": "Tiwtilin n useqdec",
|
||||
"Service": "Ameẓlu",
|
||||
"Summary": "Agzul",
|
||||
"Document": "isemli",
|
||||
"Next": "Ar zdat",
|
||||
"Upload files": "Azen ifuyla",
|
||||
"Appearance": "Udem",
|
||||
"Allow": "Sireg",
|
||||
"Deny": "Agwi",
|
||||
"Custom": "Personnalisé",
|
||||
"Source URL": "URL aγbalu",
|
||||
"Notification settings": "Iɣewwaṛen n yilɣa",
|
||||
"Leave": "Ffeɣ",
|
||||
"Set status": "Sbadu addad",
|
||||
"Hide": "Ffer",
|
||||
"Home": "Agejdan",
|
||||
"Sign in": "Qqen",
|
||||
"Help": "Tallelt",
|
||||
"Reload": "Smiren",
|
||||
"powered by Matrix": "s lmendad n Matrix",
|
||||
"Custom Server Options": "Iɣewwaren n uqeddac udmawan",
|
||||
"Code": "Tangalt",
|
||||
"Submit": "Azen",
|
||||
"Email": "Imayl",
|
||||
"Username": "Isem n useqdac",
|
||||
"Phone": "Tiliɣri",
|
||||
"Passwords don't match": "Awal uffiren ur menṭaḍen ara",
|
||||
"Email (optional)": "Imayl (Afrayan)",
|
||||
"Register": "Jerred",
|
||||
"Free": "Ilelli",
|
||||
"Failed to upload image": "Ur yezmir ad yessali tugna",
|
||||
"Description": "Aseglem",
|
||||
"Explore": "Snirem",
|
||||
"Filter": "Imsizdeg",
|
||||
"Explore rooms": "Snirem tixxamin",
|
||||
"Unknown error": "Erreur inconnue",
|
||||
"Logout": "Tufɣa",
|
||||
"Preview": "Timeẓriwt",
|
||||
"View": "Ɣeṛ",
|
||||
"Guest": "Inebgi",
|
||||
"Your profile": "Amaɣnu-ik",
|
||||
"Feedback": "Tikti",
|
||||
"Your password has been reset.": "Awal n uɛeddi inek yules awennez.",
|
||||
"Syncing...": "Amtawi",
|
||||
"Create account": "Rnu amiḍan",
|
||||
"Create your account": "Rnu amiḍan-ik",
|
||||
"Go Back": "Précédent",
|
||||
"Commands": "Tiludna",
|
||||
"Users": "Iseqdacen",
|
||||
"Export": "Sifeḍ",
|
||||
"Import": "Kter",
|
||||
"Restore": "Err-d",
|
||||
"Copy": "Nγel",
|
||||
"Download": "Sider",
|
||||
"Retry": "Ɛreḍ tikkelt nniḍen",
|
||||
"Starting backup...": "Asenker n uḥraz...",
|
||||
"Success!": "Akka d rrbeḥ !",
|
||||
"Disable": "Désactiver",
|
||||
"Navigation": "Tunigin",
|
||||
"Calls": "Appels",
|
||||
"Alt": "Alt",
|
||||
"Shift": "Shift",
|
||||
"New line": "Izirig amaynut",
|
||||
"Upload a file": "Sali-d afaylu",
|
||||
"Page Up": "Asebter afellay",
|
||||
"Page Down": "Asebter adday",
|
||||
"Esc": "Senser",
|
||||
"Enter": "Anekcum",
|
||||
"Space": "Tallunt",
|
||||
"End": "Taggara",
|
||||
"This email address is already in use": "Tansa-agi n yimayl tettuseqdac yakan",
|
||||
"This phone number is already in use": "Uṭṭun-agi n tilifun yettuseqddac yakan",
|
||||
"Your Riot is misconfigured": "Riot inek(inem) ur ittusbadu ara",
|
||||
"Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Ma ulac aɣilif, sebded <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, neɣ<safariLink>Safari</safariLink> i tirmit igerrzen.",
|
||||
"I understand the risks and wish to continue": "Gziɣ ayen ara d-yeḍrun maca bɣiɣ ad kemmleɣ",
|
||||
"Use Single Sign On to continue": "Seqdec anekcum asuf akken ad tkemmleḍ",
|
||||
"Confirm adding this email address by using Single Sign On to prove your identity.": "Sentem timerna n tansa-a n yimayl s useqdec n unekcum asuf i ubeggen n timagit-in(im).",
|
||||
"Single Sign On": "Anekcum asuf",
|
||||
"Confirm adding email": "Sentem timerna n yimayl",
|
||||
"Click the button below to confirm adding this email address.": "Sit ɣef tqeffalt yellan ddaw i usentem n tmerna n tansa-a n yimayl.",
|
||||
"Add Email Address": "Rnu tansa n yimayl",
|
||||
"Failed to verify email address: make sure you clicked the link in the email": "Asenqed n tansa n yimayl ur yeddi ara: wali ma yella tsateḍ ɣef useɣwen yellan deg yimayl",
|
||||
"Confirm adding this phone number by using Single Sign On to prove your identity.": "Sentem timerna n wuṭṭun n tilifun s useqdec n unekcum asuf i ubeggen n timagit-ik(im).",
|
||||
"Confirm adding phone number": "Sentem timerna n wuṭṭun n tilifun",
|
||||
"Click the button below to confirm adding this phone number.": "Sit ɣef tqeffalt yellan ddaw i usentem n tmerna n wuṭṭun-a n tilifun.",
|
||||
"Add Phone Number": "Rnu uṭṭun n tilifun",
|
||||
"The platform you're on": "Tiɣerɣert ideg telliḍ akka tura",
|
||||
"The version of Riot": "Lqem n Riot",
|
||||
"Whether or not you're logged in (we don't record your username)": "Ma teqqneḍ neɣ uhu (isem-ik(im) n useqdac ur yettwasekles ara)",
|
||||
"Your language of choice": "Tutlayt i tferneḍ",
|
||||
"Which officially provided instance you are using, if any": "Tummant i d-yettunefken tunṣibt ara tesseqdace, ma yella tella",
|
||||
"Your homeserver's URL": "URL n uqeddac-ik(im) agejdan",
|
||||
"e.g. %(exampleValue)s": "e.g. %(exampleValue)s",
|
||||
"Every page you use in the app": "Isebtar akk i tesseqdaceḍ deg usnas",
|
||||
"e.g. <CurrentPageURL>": "e.g. <CurrentPageURL>",
|
||||
"Your user agent": "Ameggi-ik(im) aseqdac",
|
||||
"Your device resolution": "Afray n yiben-ik(im)",
|
||||
"Jump to oldest unread message": "Uɣal alamma d izen aqdim ur nettwaɣra ara",
|
||||
"Jump to room search": "Ɛeddi ɣer unadi n texxamt",
|
||||
"Navigate up/down in the room list": "Inig s afellay/adday deg tebdert n texxamin",
|
||||
"Select room from the room list": "Fren taxxamt seg tebdert n texxamin",
|
||||
"Collapse room list section": "Fneẓ tigemi n tebdert n texxamin",
|
||||
"Expand room list section": "Snerni tigezmi n tebdert n texxamin",
|
||||
"Clear room list filter field": "Kkes urti n usizdeg n tebdert n texxamin",
|
||||
"Previous/next unread room or DM": "Taxxamt neɣ izen uzrid ur yettwaɣra send/seld",
|
||||
"Previous/next room or DM": "Taxxamt neɣ izen usrid send/seld",
|
||||
"Toggle the top left menu": "Sken/ffer umuɣ aεlayan azelmaḍ",
|
||||
"Close dialog or context menu": "Mdel umuɣ n udiwenni neɣ n ugbur",
|
||||
"Activate selected button": "Rmed taqeffalt i d-yettwafernen",
|
||||
"Toggle right panel": "Sken/ffer agalis ayeffus",
|
||||
"Toggle this dialog": "Sken/ffer adiwanni-a",
|
||||
"Move autocomplete selection up/down": "Err tafrant n tacart tawurmant afellay/adday",
|
||||
"Cancel autocomplete": "Sefsex tacaṛt tawurmant",
|
||||
"Toggle Bold": "Err-it d azuran",
|
||||
"Toggle Italics": "Err-it ɣer uknan",
|
||||
"Toggle Quote": "Err-it ɣer yizen aneẓli",
|
||||
"Navigate recent messages to edit": "Nadi iznan imaynuten i usiẓreg",
|
||||
"Jump to start/end of the composer": "Ṛuḥ ɣer tazwara/taggara n yimsuddes",
|
||||
"Navigate composer history": "Nadi deg uzray n yimsuddes",
|
||||
"Cancel replying to a message": "Sefsex tiririt ɣef yizen",
|
||||
"Toggle microphone mute": "Rmed/sens tanusi n usawaḍ",
|
||||
"Toggle video on/off": "Rmed/sens tavidyut",
|
||||
"Scroll up/down in the timeline": "Drurem gar afellay/addday n tesnakudt"
|
||||
}
|
||||
|
|
@ -1354,5 +1354,135 @@
|
|||
"Jump to read receipt": "Hopp til lesekvitteringen",
|
||||
"Mention": "Nevn",
|
||||
"Community Name": "Samfunnets navn",
|
||||
"Dismiss read marker and jump to bottom": "Avføy lesekvitteringen og hopp ned til bunnen"
|
||||
"Dismiss read marker and jump to bottom": "Avføy lesekvitteringen og hopp ned til bunnen",
|
||||
"If you cancel now, you won't complete verifying your other session.": "Hvis du avbryter nå, vil du ikke ha fullført verifiseringen av den andre økten din.",
|
||||
"Room name or address": "Rommets navn eller adresse",
|
||||
"sent an image.": "sendte et bilde.",
|
||||
"Light": "Lys",
|
||||
"Dark": "Mørk",
|
||||
"Verify your other session using one of the options below.": "Verifiser den andre økten din med en av metodene nedenfor.",
|
||||
"User %(user_id)s does not exist": "Brukeren %(user_id)s eksisterer ikke",
|
||||
"Use a few words, avoid common phrases": "Bruk noen få ord, unngå vanlig fraser",
|
||||
"I want to help": "Jeg vil hjelpe til",
|
||||
"Ok": "OK",
|
||||
"Set password": "Bestem passord",
|
||||
"Encryption upgrade available": "Krypteringsoppdatering tilgjengelig",
|
||||
"Verify the new login accessing your account: %(name)s": "Verifiser den nye påloggingen som vil ha tilgang til kontoen din: %(name)s",
|
||||
"Restart": "Start på nytt",
|
||||
"You: %(message)s": "Du: %(message)s",
|
||||
"Font scaling": "Skrifttypeskalering",
|
||||
"Use IRC layout": "Bruk IRC-oppsett",
|
||||
"Font size": "Skriftstørrelse",
|
||||
"Custom font size": "Tilpasset skriftstørrelse",
|
||||
"You've successfully verified this user.": "Du har vellykket verifisert denne brukeren.",
|
||||
"Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Venter på at den andre økten din, %(deviceName)s (%(deviceId)s), skal verifisere …",
|
||||
"Waiting for your other session to verify…": "Venter på at den andre økten din skal verifisere …",
|
||||
"Santa": "Julenisse",
|
||||
"Delete %(count)s sessions|other": "Slett %(count)s økter",
|
||||
"Delete %(count)s sessions|one": "Slett %(count)s økt",
|
||||
"Backup version: ": "Sikkerhetskopiversjon: ",
|
||||
"wait and try again later": "vent og prøv igjen senere",
|
||||
"Size must be a number": "Størrelsen må være et nummer",
|
||||
"Customise your appearance": "Tilpass utseendet du bruker",
|
||||
"Labs": "Laboratoriet",
|
||||
"eg: @bot:* or example.org": "f.eks.: @bot:* eller example.org",
|
||||
"To link to this room, please add an address.": "For å lenke til dette rommet, vennligst legg til en adresse.",
|
||||
"Remove %(phone)s?": "Vil du fjerne %(phone)s?",
|
||||
"Online for %(duration)s": "På nett i %(duration)s",
|
||||
"Favourites": "Favoritter",
|
||||
"Create room": "Opprett et rom",
|
||||
"People": "Folk",
|
||||
"Sort by": "Sorter etter",
|
||||
"Activity": "Aktivitet",
|
||||
"A-Z": "A-Å",
|
||||
"Unread rooms": "Uleste rom",
|
||||
"Always show first": "Alltid vis først",
|
||||
"Show": "Vis",
|
||||
"Message preview": "Meldingsforhåndsvisning",
|
||||
"Leave Room": "Forlat rommet",
|
||||
"This room has no local addresses": "Dette rommet har ikke noen lokale adresser",
|
||||
"Waiting for you to accept on your other session…": "Venter på at du aksepterer på den andre økten din …",
|
||||
"Remove recent messages by %(user)s": "Fjern nylige meldinger fra %(user)s",
|
||||
"Remove %(count)s messages|other": "Slett %(count)s meldinger",
|
||||
"Remove %(count)s messages|one": "Slett 1 melding",
|
||||
"Almost there! Is your other session showing the same shield?": "Nesten fremme! Viser den andre økten din det samme skjoldet?",
|
||||
"You've successfully verified your device!": "Du har vellykket verifisert enheten din!",
|
||||
"You've successfully verified %(deviceName)s (%(deviceId)s)!": "Du har vellykket verifisert %(deviceName)s (%(deviceId)s)!",
|
||||
"You've successfully verified %(displayName)s!": "Du har vellykket verifisert %(displayName)s!",
|
||||
"You cancelled verification on your other session.": "Du avbrøt verifiseringen på den andre økten din.",
|
||||
"You sent a verification request": "Du sendte en verifiseringsforespørsel",
|
||||
"Error decrypting video": "Feil under dekryptering av video",
|
||||
"Message deleted": "Meldingen ble slettet",
|
||||
"Message deleted by %(name)s": "Meldingen ble slettet av %(name)s",
|
||||
"Click here to see older messages.": "Klikk for å se eldre meldinger.",
|
||||
"Add an Integration": "Legg til en integrering",
|
||||
"Can't load this message": "Klarte ikke å laste inn denne meldingen",
|
||||
"Categories": "Kategorier",
|
||||
"Popout widget": "Utsprettsmodul",
|
||||
"QR Code": "QR-kode",
|
||||
"Room address": "Rommets adresse",
|
||||
"This address is available to use": "Denne adressen er allerede i bruk",
|
||||
"ex. @bob:example.com": "f.eks. @bob:example.com",
|
||||
"Failed to send logs: ": "Mislyktes i å sende loggbøker: ",
|
||||
"Incompatible Database": "Inkompatibel database",
|
||||
"Event Content": "Hendelsesinnhold",
|
||||
"Verification Requests": "Verifiseringsforespørsler",
|
||||
"Integrations are disabled": "Integreringer er skrudd av",
|
||||
"Integrations not allowed": "Integreringer er ikke tillatt",
|
||||
"Confirm to continue": "Bekreft for å fortsette",
|
||||
"Clear cache and resync": "Tøm mellomlageret og synkroniser på nytt",
|
||||
"Manually export keys": "Eksporter nøkler manuelt",
|
||||
"Use this session to verify your new one, granting it access to encrypted messages:": "Bruk denne økten til å verifisere din nye økt, som vil gi den tilgang til krypterte meldinger:",
|
||||
"If you didn’t sign in to this session, your account may be compromised.": "Dersom det ikke var du som logget deg på økten, kan kontoen din ha blitt kompromittert.",
|
||||
"Automatically invite users": "Inviter brukere automatisk",
|
||||
"Verification Pending": "Avventer verifisering",
|
||||
"Username invalid: %(errMessage)s": "Brukernavnet er ugyldig: %(errMessage)s",
|
||||
"An error occurred: %(error_string)s": "En feil oppstod: %(error_string)s",
|
||||
"Share Room": "Del rommet",
|
||||
"Share User": "Del brukeren",
|
||||
"Upload %(count)s other files|other": "Last opp %(count)s andre filer",
|
||||
"Upload %(count)s other files|one": "Last opp %(count)s annen fil",
|
||||
"Appearance": "Utseende",
|
||||
"Verify other session": "Verifiser en annen økt",
|
||||
"Keys restored": "Nøklene ble gjenopprettet",
|
||||
"Address (optional)": "Adresse (valgfritt)",
|
||||
"Reject invitation": "Avslå invitasjonen",
|
||||
"Resend edit": "Send redigeringen på nytt",
|
||||
"Resend removal": "Send slettingen på nytt",
|
||||
"Start authentication": "Begynn autentisering",
|
||||
"The email field must not be blank.": "E-postfeltet kan ikke stå tomt.",
|
||||
"The username field must not be blank.": "Brukernavnfeltet kan ikke stå tomt.",
|
||||
"The phone number field must not be blank.": "Telefonnummerfeltet kan ikke stå tomt.",
|
||||
"The password field must not be blank.": "Passordfeltet kan ikke stå tomt.",
|
||||
"Couldn't load page": "Klarte ikke å laste inn siden",
|
||||
"Add to summary": "Legg til i oppsummeringen",
|
||||
"Unable to accept invite": "Klarte ikke å akseptere invitasjonen",
|
||||
"Unable to join community": "Klarte ikke å bli med i samfunnet",
|
||||
"Unable to leave community": "Klarte ikke å forlate samfunnet",
|
||||
"You are an administrator of this community": "Du er en administrator i dette samfunnet",
|
||||
"You are a member of this community": "Du er et medlem av dette samfunnet",
|
||||
"Failed to load %(groupId)s": "Klarte ikke å laste inn %(groupId)s",
|
||||
"Liberate your communication": "Frigjør kommunikasjonen din",
|
||||
"Explore Public Rooms": "Utforsk offentlige rom",
|
||||
"Create a Group Chat": "Opprett en gruppechat",
|
||||
"Review terms and conditions": "Gå gjennom betingelser og vilkår",
|
||||
"delete the address.": "slette adressen.",
|
||||
"%(count)s of your messages have not been sent.|one": "Meldingen din ble ikke sendt.",
|
||||
"Jump to first invite.": "Hopp til den første invitasjonen.",
|
||||
"You seem to be uploading files, are you sure you want to quit?": "Du ser til å laste opp filer, er du sikker på at du vil avslutte?",
|
||||
"Switch to light mode": "Bytt til lys modus",
|
||||
"Switch to dark mode": "Bytt til mørk modus",
|
||||
"Switch theme": "Bytt tema",
|
||||
"All settings": "Alle innstillinger",
|
||||
"Archived rooms": "Arkiverte rom",
|
||||
"Feedback": "Tilbakemelding",
|
||||
"Account settings": "Kontoinnstillinger",
|
||||
"Emoji Autocomplete": "Auto-fullfør emojier",
|
||||
"Confirm encryption setup": "Bekreft krypteringsoppsett",
|
||||
"Create key backup": "Opprett nøkkelsikkerhetskopi",
|
||||
"Set up Secure Messages": "Sett opp sikre meldinger",
|
||||
"Toggle Bold": "Veksle fet",
|
||||
"Toggle Italics": "Veksle kursiv",
|
||||
"Toggle Quote": "Veksle siteringsformat",
|
||||
"Upload a file": "Last opp en fil"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2211,12 +2211,18 @@
|
|||
"Are you sure you want to deactivate your account? This is irreversible.": "Weet u zeker dat u uw account wil sluiten? Dit is onomkeerbaar.",
|
||||
"Confirm account deactivation": "Bevestig accountsluiting",
|
||||
"Room name or address": "Gespreksnaam of -adres",
|
||||
"Joins room with given address": "Treedt tot het gesprek met het opgegeven adres toe",
|
||||
"Joins room with given address": "Neem aan het gesprek met dat adres deel",
|
||||
"Unrecognised room address:": "Gespreksadres niet herkend:",
|
||||
"Help us improve Riot": "Help ons Riot nog beter te maken",
|
||||
"Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve Riot. This will use a <PolicyLink>cookie</PolicyLink>.": "Stuur <UsageDataLink>anonieme gebruiksinformatie</UsageDataLink> waarmee we Riot kunnen verbeteren. Dit plaatst een <PolicyLink>cookie</PolicyLink>.",
|
||||
"I want to help": "Ik wil helpen",
|
||||
"Your homeserver has exceeded its user limit.": "Uw thuisserver heeft het maximaal aantal gebruikers overschreden.",
|
||||
"Your homeserver has exceeded one of its resource limits.": "Uw thuisserver heeft een van zijn limieten overschreden.",
|
||||
"Ok": "Oké"
|
||||
"Ok": "Oké",
|
||||
"sent an image.": "heeft een plaatje gestuurd.",
|
||||
"Light": "Helder",
|
||||
"Dark": "Donker",
|
||||
"Set password": "Stel wachtwoord in",
|
||||
"To return to your account in future you need to set a password": "Zonder wachtwoord kunt u later niet tot uw account terugkeren",
|
||||
"Restart": "Herstarten"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -157,7 +157,7 @@
|
|||
"Emoji": "Emoji",
|
||||
"Enable automatic language detection for syntax highlighting": "Włącz automatyczne rozpoznawanie języka dla podświetlania składni",
|
||||
"Enable Notifications": "Włącz powiadomienia",
|
||||
"%(senderName)s ended the call.": "%(senderName)s zakończył połączenie.",
|
||||
"%(senderName)s ended the call.": "%(senderName)s zakończył(a) połączenie.",
|
||||
"End-to-end encryption information": "Informacje o szyfrowaniu end-to-end",
|
||||
"Enter passphrase": "Wpisz frazę",
|
||||
"Error decrypting attachment": "Błąd odszyfrowywania załącznika",
|
||||
|
|
@ -230,8 +230,8 @@
|
|||
"%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s uczynił(a) przyszłą historię pokoju widoczną dla wszyscy członkowie pokoju, od momentu ich zaproszenia.",
|
||||
"%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s uczynił(a) przyszłą historię pokoju widoczną dla wszyscy członkowie pokoju, od momentu ich dołączenia.",
|
||||
"%(senderName)s made future room history visible to all room members.": "%(senderName)s uczynił(a) przyszłą historię pokoju widoczną dla wszyscy członkowie pokoju.",
|
||||
"%(senderName)s made future room history visible to anyone.": "%(senderName)s uczynił przyszłą historię pokoju widoczną dla kazdego.",
|
||||
"%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s uczynił przyszłą historię pokoju widoczną dla nieznany (%(visibility)s).",
|
||||
"%(senderName)s made future room history visible to anyone.": "%(senderName)s uczynił(a) przyszłą historię pokoju widoczną dla każdego.",
|
||||
"%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s uczynił(a) przyszłą historię pokoju widoczną dla nieznany (%(visibility)s).",
|
||||
"Manage Integrations": "Zarządzaj integracjami",
|
||||
"Missing room_id in request": "Brakujące room_id w żądaniu",
|
||||
"Missing user_id in request": "Brakujące user_id w żądaniu",
|
||||
|
|
@ -291,7 +291,7 @@
|
|||
"Send anyway": "Wyślij mimo to",
|
||||
"Send Reset Email": "Wyślij e-mail resetujący hasło",
|
||||
"%(senderDisplayName)s sent an image.": "%(senderDisplayName)s wysłał obraz.",
|
||||
"%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s wysłał zaproszenie do %(targetDisplayName)s do dołączenia do pokoju.",
|
||||
"%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s wysłał(a) zaproszenie do %(targetDisplayName)s do dołączenia do pokoju.",
|
||||
"Server error": "Błąd serwera",
|
||||
"Server may be unavailable, overloaded, or search timed out :(": "Serwer może być niedostępny, przeciążony, lub upłynął czas wyszukiwania :(",
|
||||
"Server may be unavailable, overloaded, or you hit a bug.": "Serwer może być niedostępny, przeciążony, lub trafiłeś na błąd.",
|
||||
|
|
@ -363,7 +363,7 @@
|
|||
"You do not have permission to do that in this room.": "Nie masz pozwolenia na wykonanie tej akcji w tym pokoju.",
|
||||
"You cannot place a call with yourself.": "Nie możesz wykonać połączenia do siebie.",
|
||||
"You cannot place VoIP calls in this browser.": "Nie możesz przeprowadzić rozmowy głosowej VoIP w tej przeglądarce.",
|
||||
"You do not have permission to post to this room": "Nie jesteś uprawniony do pisania w tym pokoju",
|
||||
"You do not have permission to post to this room": "Nie masz uprawnień do pisania w tym pokoju",
|
||||
"You have <a>disabled</a> URL previews by default.": "Masz domyślnie <a>wyłączone</a> podglądy linków.",
|
||||
"You have no visible notifications": "Nie masz widocznych powiadomień",
|
||||
"You must <a>register</a> to use this functionality": "Musisz się <a>zarejestrować</a> aby móc używać tej funkcji",
|
||||
|
|
@ -915,7 +915,7 @@
|
|||
"Common names and surnames are easy to guess": "Popularne imiona i nazwiska są łatwe do odgadnięcia",
|
||||
"You do not have permission to invite people to this room.": "Nie masz uprawnień do zapraszania ludzi do tego pokoju.",
|
||||
"User %(user_id)s does not exist": "Użytkownik %(user_id)s nie istnieje",
|
||||
"Unknown server error": "Nieznany bład serwera",
|
||||
"Unknown server error": "Nieznany błąd serwera",
|
||||
"%(oneUser)sleft %(count)s times|one": "%(oneUser)swyszedł(-ła)",
|
||||
"%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)sdołączył(a) i wyszedł(-ła) %(count)s razy",
|
||||
"%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)sdołączył(a) i wyszedł(-ła)",
|
||||
|
|
@ -930,7 +930,7 @@
|
|||
"%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)szmienił(a) swój awatar %(count)s razy",
|
||||
"%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)szmienił(a) swój awatar",
|
||||
"%(items)s and %(count)s others|other": "%(items)s i %(count)s innych",
|
||||
"%(items)s and %(count)s others|one": "%(items)s i jeden inny",
|
||||
"%(items)s and %(count)s others|one": "%(items)s i jedna inna osoba",
|
||||
"%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)szmieniło swój awatar",
|
||||
"%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)szmieniło swój awatar %(count)s razy",
|
||||
"%(oneUser)schanged their name %(count)s times|one": "%(oneUser)szmienił(a) swoją nazwę",
|
||||
|
|
@ -1102,7 +1102,7 @@
|
|||
"Gift": "Prezent",
|
||||
"Hammer": "Młotek",
|
||||
"Group & filter rooms by custom tags (refresh to apply changes)": "Grupuj i filtruj pokoje według niestandardowych znaczników (odśwież, aby zastosować zmiany)",
|
||||
"Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Poprzedza ¯\\_(ツ)_/¯ do wiadomości tekstowej",
|
||||
"Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Dodaje ¯\\_(ツ)_/¯ na początku wiadomości tekstowej",
|
||||
"Upgrades a room to a new version": "Aktualizuje pokój do nowej wersji",
|
||||
"Changes your display nickname in the current room only": "Zmienia Twój wyświetlany pseudonim tylko dla bieżącego pokoju",
|
||||
"Sets the room name": "Ustawia nazwę pokoju",
|
||||
|
|
@ -1175,7 +1175,7 @@
|
|||
"%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s aktywował Flair dla %(groups)s w tym pokoju.",
|
||||
"%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s dezaktywował Flair dla %(groups)s w tym pokoju.",
|
||||
"%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s aktywował Flair dla %(newGroups)s i dezaktywował Flair dla %(oldGroups)s w tym pokoju.",
|
||||
"%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s odwołał zaproszednie dla %(targetDisplayName)s aby dołączył do pokoju.",
|
||||
"%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s odwołał(a) zaproszenie dla %(targetDisplayName)s aby dołączył do pokoju.",
|
||||
"%(names)s and %(count)s others are typing …|one": "%(names)s i jedna osoba pisze…",
|
||||
"Cannot reach homeserver": "Błąd połączenia z serwerem domowym",
|
||||
"Ensure you have a stable internet connection, or get in touch with the server admin": "Upewnij się, że posiadasz stabilne połączenie internetowe lub skontaktuj się z administratorem serwera",
|
||||
|
|
@ -1605,5 +1605,9 @@
|
|||
"WARNING: Session already verified, but keys do NOT MATCH!": "OSTRZEŻENIE: Sesja już zweryfikowana, ale klucze do siebie NIE PASUJĄ!",
|
||||
"WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "OSTRZEŻENIE: WERYFIKACJA KLUCZY NIE POWIODŁA SIĘ! Klucz podpisujący dla %(userId)s oraz sesji %(deviceId)s to \"%(fprint)s\", nie pasuje on do podanego klucza \"%(fingerprint)s\". To może oznaczać że Twoja komunikacja jest przechwytywana!",
|
||||
"Displays information about a user": "Pokazuje informacje na temat użytkownika",
|
||||
"Send a bug report with logs": "Wyślij raport błędu z logami"
|
||||
"Send a bug report with logs": "Wyślij raport błędu z logami",
|
||||
"Use Single Sign On to continue": "Użyj pojedynczego logowania, aby kontynuować",
|
||||
"Confirm adding this email address by using Single Sign On to prove your identity.": "Potwierdź dodanie tego adresu e-mail przez użycie pojedynczego logowania, aby potwierdzić swoją tożsamość.",
|
||||
"Single Sign On": "Pojedyncze logowanie",
|
||||
"Confirm adding this phone number by using Single Sign On to prove your identity.": "Potwierdź dodanie tego numeru telefonu przez użycie pojedynczego logowania, aby potwierdzić swoją tożsamość."
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@
|
|||
"Invites user with given id to current room": "Приглашает пользователя с заданным ID в текущую комнату",
|
||||
"Sign in with": "Войти с помощью",
|
||||
"Joins room with given alias": "Входит в комнату с заданным псевдонимом",
|
||||
"Kicks user with given id": "Выкидывает пользователя с заданным ID",
|
||||
"Kicks user with given id": "Выгоняет пользователя с заданным ID",
|
||||
"Labs": "Лаборатория",
|
||||
"Leave room": "Покинуть комнату",
|
||||
"Logout": "Выйти",
|
||||
|
|
@ -97,13 +97,13 @@
|
|||
"Who can read history?": "Кто может читать историю?",
|
||||
"You do not have permission to post to this room": "Вы не можете писать в эту комнату",
|
||||
"You have no visible notifications": "Нет видимых уведомлений",
|
||||
"%(targetName)s accepted an invitation.": "%(targetName)s принимает приглашение.",
|
||||
"%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s принимает приглашение от %(displayName)s.",
|
||||
"%(targetName)s accepted an invitation.": "%(targetName)s принял приглашение.",
|
||||
"%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s принял приглашение от %(displayName)s.",
|
||||
"Active call": "Активный вызов",
|
||||
"%(senderName)s answered the call.": "%(senderName)s ответил(а) на звонок.",
|
||||
"%(senderName)s banned %(targetName)s.": "%(senderName)s забанил(а) %(targetName)s.",
|
||||
"Call Timeout": "Нет ответа",
|
||||
"%(senderName)s changed their profile picture.": "%(senderName)s изменяет свой аватар.",
|
||||
"%(senderName)s changed their profile picture.": "%(senderName)s изменил свой аватар.",
|
||||
"%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s изменил(а) уровни прав %(powerLevelDiffText)s.",
|
||||
"%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s изменил(а) название комнаты на %(roomName)s.",
|
||||
"%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s изменил(а) тему комнаты на \"%(topic)s\".",
|
||||
|
|
@ -115,8 +115,8 @@
|
|||
"Failure to create room": "Не удалось создать комнату",
|
||||
"%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "для %(userId)s с %(fromPowerLevel)s на %(toPowerLevel)s",
|
||||
"click to reveal": "нажмите для открытия",
|
||||
"%(senderName)s invited %(targetName)s.": "%(senderName)s приглашает %(targetName)s.",
|
||||
"%(targetName)s joined the room.": "%(targetName)s входит в комнату.",
|
||||
"%(senderName)s invited %(targetName)s.": "%(senderName)s пригласил %(targetName)s.",
|
||||
"%(targetName)s joined the room.": "%(targetName)s вошёл в комнату.",
|
||||
"%(senderName)s kicked %(targetName)s.": "%(senderName)s выгнал(а) %(targetName)s.",
|
||||
"%(targetName)s left the room.": "%(targetName)s покидает комнату.",
|
||||
"%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s сделал(а) историю разговора видимой для всех собеседников с момента их приглашения.",
|
||||
|
|
@ -223,9 +223,9 @@
|
|||
"Reason": "Причина",
|
||||
"%(targetName)s rejected the invitation.": "%(targetName)s отклонил(а) приглашение.",
|
||||
"Reject invitation": "Отклонить приглашение",
|
||||
"%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s удаляет своё отображаемое имя (%(oldDisplayName)s).",
|
||||
"%(senderName)s removed their profile picture.": "%(senderName)s удаляет свой аватар.",
|
||||
"%(senderName)s requested a VoIP conference.": "%(senderName)s хочет начать конференц-звонок.",
|
||||
"%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s удалил своё отображаемое имя (%(oldDisplayName)s).",
|
||||
"%(senderName)s removed their profile picture.": "%(senderName)s удалил свой аватар.",
|
||||
"%(senderName)s requested a VoIP conference.": "%(senderName)s запросил конференц-звонок.",
|
||||
"Riot does not have permission to send you notifications - please check your browser settings": "У Riot нет разрешения на отправку уведомлений — проверьте настройки браузера",
|
||||
"Riot was not given permission to send notifications - please try again": "Riot не получил разрешение на отправку уведомлений, пожалуйста, попробуйте снова",
|
||||
"riot-web version:": "версия riot-web:",
|
||||
|
|
@ -302,8 +302,8 @@
|
|||
"Server may be unavailable, overloaded, or you hit a bug.": "Возможно, сервер недоступен, перегружен или случилась ошибка.",
|
||||
"Server unavailable, overloaded, or something else went wrong.": "Возможно, сервер недоступен, перегружен или что-то еще пошло не так.",
|
||||
"Session ID": "ID сессии",
|
||||
"%(senderName)s set a profile picture.": "%(senderName)s устанавливает себе аватар.",
|
||||
"%(senderName)s set their display name to %(displayName)s.": "%(senderName)s меняет отображаемое имя на %(displayName)s.",
|
||||
"%(senderName)s set a profile picture.": "%(senderName)s установил себе аватар.",
|
||||
"%(senderName)s set their display name to %(displayName)s.": "%(senderName)s изменил отображаемое имя на %(displayName)s.",
|
||||
"Signed Out": "Выполнен выход",
|
||||
"This room is not accessible by remote Matrix servers": "Это комната недоступна из других серверов Matrix",
|
||||
"Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Попытка загрузить выбранный интервал истории чата этой комнаты не удалась, так как у вас нет разрешений на просмотр.",
|
||||
|
|
@ -696,7 +696,7 @@
|
|||
"This room is not public. You will not be able to rejoin without an invite.": "Эта комната не является публичной. Вы не сможете войти без приглашения.",
|
||||
"Community IDs cannot be empty.": "ID сообществ не могут быть пустыми.",
|
||||
"<a>In reply to</a> <pill>": "<a>В ответ на</a> <pill>",
|
||||
"%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s меняет отображаемое имя на %(displayName)s.",
|
||||
"%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s изменил отображаемое имя на %(displayName)s.",
|
||||
"Failed to set direct chat tag": "Не удалось установить тег прямого чата",
|
||||
"Failed to remove tag %(tagName)s from room": "Не удалось удалить тег %(tagName)s из комнаты",
|
||||
"Failed to add tag %(tagName)s to room": "Не удалось добавить тег %(tagName)s в комнату",
|
||||
|
|
@ -977,7 +977,7 @@
|
|||
"Render simple counters in room header": "Отображать простые счетчики в заголовке комнаты",
|
||||
"Enable Emoji suggestions while typing": "Включить предложения смайликов при наборе",
|
||||
"Show a placeholder for removed messages": "Показывать плашки вместо удалённых сообщений",
|
||||
"Show join/leave messages (invites/kicks/bans unaffected)": "Показывать сообщения о входе/выходе (не влияет на приглашения, кики и баны)",
|
||||
"Show join/leave messages (invites/kicks/bans unaffected)": "Показывать сообщения о входе/выходе (не влияет на приглашения, выгоны и баны)",
|
||||
"Show avatar changes": "Показывать изменения аватара",
|
||||
"Show display name changes": "Показывать изменения отображаемого имени",
|
||||
"Show a reminder to enable Secure Message Recovery in encrypted rooms": "Напоминать включить Безопасное Восстановление Сообщений в зашифрованных комнатах",
|
||||
|
|
@ -1276,7 +1276,7 @@
|
|||
"Join the conversation with an account": "Присоединиться к разговору с учётной записью",
|
||||
"Sign Up": "Зарегистрироваться",
|
||||
"Sign In": "Войти",
|
||||
"You were kicked from %(roomName)s by %(memberName)s": "Вы были выгнаны %(memberName)s из %(roomName)s",
|
||||
"You were kicked from %(roomName)s by %(memberName)s": "Вы были выгнаны из %(roomName)s пользователем %(memberName)s",
|
||||
"Reason: %(reason)s": "Причина: %(reason)s",
|
||||
"Forget this room": "Забыть эту комнату",
|
||||
"Re-join": "Пере-присоединение",
|
||||
|
|
@ -2122,7 +2122,7 @@
|
|||
"Enable cross-signing to verify per-user instead of per-session": "Разрешить кросс-подпись для подтверждения пользователей вместо отдельных сессий",
|
||||
"Keep recovery passphrase in memory for this session": "Сохранить пароль восстановления в памяти для этой сессии",
|
||||
"Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Отдельно подтверждать каждую сессию пользователя как доверенную, не доверяя кросс-подписанным устройствам.",
|
||||
"Securely cache encrypted messages locally for them to appear in search results, using ": "Безопасно кэшировать шифрованные сообщения локально, чтобы они появлялись в результатах поиска с помощью ",
|
||||
"Securely cache encrypted messages locally for them to appear in search results, using ": "Кэшировать шифрованные сообщения локально, чтобы они выводились в результатах поиска, используя: ",
|
||||
" to store messages from ": " чтобы сохранить сообщения от ",
|
||||
"Securely cache encrypted messages locally for them to appear in search results.": "Безопасно кэшировать шифрованные сообщения локально, чтобы они появлялись в результатах поиска.",
|
||||
"Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.": "Отсутствуют некоторые необходимые компоненты для Riot, чтобы безопасно кэшировать шифрованные сообщения локально. Если вы хотите попробовать эту возможность, соберите самостоятельно Riot Desktop с <nativeLink>добавлением поисковых компонентов</nativeLink>.",
|
||||
|
|
@ -2144,5 +2144,7 @@
|
|||
"<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong>в %(roomName)s",
|
||||
"Start verification again from their profile.": "Начните подтверждение заново в профиле пользователя.",
|
||||
"Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Сообщения в этой комнате зашифрованы сквозным шифрованием. Посмотрите подробности и подтвердите пользователя в его профиле.",
|
||||
"Send a Direct Message": "Отправить сообщение"
|
||||
"Send a Direct Message": "Отправить сообщение",
|
||||
"Light": "Светлая",
|
||||
"Dark": "Темная"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2496,5 +2496,26 @@
|
|||
"Show %(count)s more|other": "Shfaq %(count)s të tjera",
|
||||
"Show %(count)s more|one": "Shfaq %(count)s tjetër",
|
||||
"Leave Room": "Dil Nga Dhoma",
|
||||
"Room options": "Mundësi dhome"
|
||||
"Room options": "Mundësi dhome",
|
||||
"Light": "E çelët",
|
||||
"Dark": "E errët",
|
||||
"Use the improved room list (in development - will refresh to apply changes)": "Përdorni listën e përmirësuar të dhomave (në zhvillim - që të aplikohen ndryshimet, duhet rifreskuar)",
|
||||
"Customise your appearance": "Përshtatni dukjen tuaj",
|
||||
"Appearance Settings only affect this Riot session.": "Rregullimet e Dukjes prekin vetëm këtë sesion Riot.",
|
||||
"Activity": "Veprimtari",
|
||||
"A-Z": "A-Z",
|
||||
"Recovery Key": "Kyç Rimarrjesh",
|
||||
"This isn't the recovery key for your account": "Ky s’është kyçi i rimarrjeve për llogarinë tuaj",
|
||||
"This isn't a valid recovery key": "Ky s’është kyç rimarrjesh i vlefshëm",
|
||||
"Looks good!": "Mirë duket!",
|
||||
"Use Recovery Key or Passphrase": "Përdorni Kyç ose Frazëkalim Rimarrjesh",
|
||||
"Use Recovery Key": "Përdorni Kyç Rimarrjesh",
|
||||
"Enter your Recovery Key or enter a <a>Recovery Passphrase</a> to continue.": "Që të vazhdohet, jepni Kyçin tuaj të Rimarrjeve ose jepni një <a>Frazëkalim Rimarrjesh</a>.",
|
||||
"Enter your Recovery Key to continue.": "Që të vazhdohet, jepni Kyçin tuaj të Rimarrjeve.",
|
||||
"Upgrade your Recovery Key to store encryption keys & secrets with your account data. If you lose access to this login you'll need it to unlock your data.": "Që të depozitoni kyçe & të fshehta fshehtëzimi me të dhënat e llogarisë tuaj, përmirësoni Kyçin tuaj të Rimarrjeve. Nëse humbni këto kredenciale hyrjesh, do t’ju duhet të shkyçni të dhënat tuaja.",
|
||||
"Store your Recovery Key somewhere safe, it can be used to unlock your encrypted messages & data.": "Ruajeni diku të parrezik Kyçin tuaj të Rimarrjeve, mund të përdoret për të shkyçur mesazhet & të dhënat tuaja të fshehtëzuara.",
|
||||
"Create a Recovery Key to store encryption keys & secrets with your account data. If you lose access to this login you’ll need it to unlock your data.": "Krijoni një Kyç Rimarrjesh që të depozitoni kyçe & të fshehta fshehtëzimi me të dhënat e llogarisë tuaj. Nëse humbni këto kredenciale, do t’ju duhet të shkyçni të dhënat tuaja.",
|
||||
"Create a Recovery Key": "Krijoni një Kyç Rimarrjesh",
|
||||
"Upgrade your Recovery Key": "Përmirësoni Kyçin tuaj të Rimarrjeve",
|
||||
"Store your Recovery Key": "Depozitoni Kyçin tuaj të Rimarrjeve"
|
||||
}
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue