Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Reword the status for the currently indexing rooms. #4084

Merged
merged 4 commits into from
Mar 6, 2020
Merged

Reword the status for the currently indexing rooms. #4084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8fe54e5
ManageEventIndexDialog: Reword the status for the currently indexing …
poljar Feb 18, 2020
bff3f3e
Revert "ManageEventIndexDialog: Reword the status for the currently i…
poljar Mar 6, 2020
364899b
ManageEventIndexDialog: Show how many rooms are done instead being pr…
poljar Mar 6, 2020
6938982
ManageEventIndexDialog: Reword and move the crawler state around a bit.
poljar Mar 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,15 +141,17 @@ export default class ManageEventIndexDialog extends React.Component {
let crawlerState;

if (this.state.currentRoom === null) {
crawlerState = _t("Not currently downloading messages for any room.");
crawlerState = _t("Not currently indexing messages for any room.");
} else {
crawlerState = (
_t("Downloading mesages for %(currentRoom)s.", { currentRoom: this.state.currentRoom })
_t("Currently indexing: %(currentRoom)s.", { currentRoom: this.state.currentRoom })
);
}

const Field = sdk.getComponent('views.elements.Field');

const doneRooms = Math.max(0, (this.state.roomCount - this.state.crawlingRoomsCount));

const eventIndexingSettings = (
<div>
{
Expand All @@ -158,13 +160,13 @@ export default class ManageEventIndexDialog extends React.Component {
)
}
<div className='mx_SettingsTab_subsectionText'>
{crawlerState}<br />
{_t("Space used:")} {formatBytes(this.state.eventIndexSize, 0)}<br />
{_t("Indexed messages:")} {formatCountLong(this.state.eventCount)}<br />
{_t("Indexed rooms:")} {_t("%(crawlingRooms)s out of %(totalRooms)s", {
crawlingRooms: formatCountLong(this.state.crawlingRoomsCount),
{_t("Indexed rooms:")} {_t("%(doneRooms)s out of %(totalRooms)s", {
doneRooms: formatCountLong(doneRooms),
totalRooms: formatCountLong(this.state.roomCount),
})} <br />
{crawlerState}<br />
<Field
id={"crawlerSleepTimeMs"}
label={_t('Message downloading sleep time(ms)')}
Expand Down
6 changes: 3 additions & 3 deletions src/i18n/strings/en_EN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2130,13 +2130,13 @@
"If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.",
"If disabled, messages from encrypted rooms won't appear in search results.": "If disabled, messages from encrypted rooms won't appear in search results.",
"Disable": "Disable",
"Not currently downloading messages for any room.": "Not currently downloading messages for any room.",
"Downloading mesages for %(currentRoom)s.": "Downloading mesages for %(currentRoom)s.",
"Not currently indexing messages for any room.": "Not currently indexing messages for any room.",
"Currently indexing: %(currentRoom)s.": "Currently indexing: %(currentRoom)s.",
"Riot is securely caching encrypted messages locally for them to appear in search results:": "Riot is securely caching encrypted messages locally for them to appear in search results:",
"Space used:": "Space used:",
"Indexed messages:": "Indexed messages:",
"Indexed rooms:": "Indexed rooms:",
"%(crawlingRooms)s out of %(totalRooms)s": "%(crawlingRooms)s out of %(totalRooms)s",
"%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s out of %(totalRooms)s",
"Message downloading sleep time(ms)": "Message downloading sleep time(ms)",
"Failed to set direct chat tag": "Failed to set direct chat tag",
"Failed to remove tag %(tagName)s from room": "Failed to remove tag %(tagName)s from room",
Expand Down