Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…

… t3chguy/room-list/2
matrix-org · Jul 1, 2020 · 10e5475 · 10e5475
2 parents 0cbc506 + fed0c32
commit 10e5475
Show file tree

Hide file tree

Showing 25 changed files with 1,857 additions and 233 deletions.
diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
@@ -388,8 +388,11 @@ export default class MessagePanel extends React.Component {
             }
 
             return (
-                <li key={"readMarker_"+eventId} ref={this._readMarkerNode}
-                      className="mx_RoomView_myReadMarker_container">
+                <li key={"readMarker_"+eventId}
+                    ref={this._readMarkerNode}
+                    className="mx_RoomView_myReadMarker_container"
+                    data-scroll-tokens={eventId}
+                >
                     { hr }
                 </li>
             );

diff --git a/src/components/views/rooms/RoomSublist2.tsx b/src/components/views/rooms/RoomSublist2.tsx
@@ -32,7 +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";
+import { DefaultTagID, TagID } from "../../../stores/room-list/models";
 
 // TODO: Remove banner on launch: https://github.com/vector-im/riot-web/issues/14231
 // TODO: Rename on launch: https://github.com/vector-im/riot-web/issues/14231
@@ -196,6 +196,11 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
     }
 
     private renderMenu(): React.ReactElement {
+        // TODO: Get a proper invite context menu, or take invites out of the room list.
+        if (this.props.tagId === DefaultTagID.Invite) {
+            return null;
+        }
+
         let contextMenu = null;
         if (this.state.menuDisplayed) {
             const elementRect = this.menuButtonRef.current.getBoundingClientRect();

diff --git a/src/components/views/rooms/RoomTile2.tsx b/src/components/views/rooms/RoomTile2.tsx
@@ -298,6 +298,11 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
     private renderGeneralMenu(): React.ReactElement {
         if (this.props.isMinimized) return null; // no menu when minimized
 
+        // TODO: Get a proper invite context menu, or take invites out of the room list.
+        if (this.props.tag === DefaultTagID.Invite) {
+            return null;
+        }
+
         let contextMenu = null;
         if (this.state.generalMenuDisplayed) {
             const elementRect = this.generalMenuButtonRef.current.getBoundingClientRect();

diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
@@ -23,6 +23,7 @@ import SettingsStore from "../../../../../settings/SettingsStore";
 import Field from "../../../elements/Field";
 import * as sdk from "../../../../..";
 import PlatformPeg from "../../../../../PlatformPeg";
+import {RoomListStoreTempProxy} from "../../../../../stores/room-list/RoomListStoreTempProxy";
 
 export default class PreferencesUserSettingsTab extends React.Component {
     static ROOM_LIST_SETTINGS = [
@@ -31,6 +32,19 @@ export default class PreferencesUserSettingsTab extends React.Component {
         'breadcrumbs',
     ];
 
+    // TODO: Remove temp structures: https://github.com/vector-im/riot-web/issues/14231
+    static ROOM_LIST_2_SETTINGS = [
+        'breadcrumbs',
+    ];
+
+    // TODO: Remove temp structures: https://github.com/vector-im/riot-web/issues/14231
+    static eligibleRoomListSettings = () => {
+        if (RoomListStoreTempProxy.isUsingNewStore()) {
+            return PreferencesUserSettingsTab.ROOM_LIST_2_SETTINGS;
+        }
+        return PreferencesUserSettingsTab.ROOM_LIST_SETTINGS;
+    };
+
     static COMPOSER_SETTINGS = [
         'MessageComposerInput.autoReplaceEmoji',
         'MessageComposerInput.suggestEmoji',
@@ -175,7 +189,7 @@ export default class PreferencesUserSettingsTab extends React.Component {
 
                 <div className="mx_SettingsTab_section">
                     <span className="mx_SettingsTab_subheading">{_t("Room list")}</span>
-                    {this._renderGroup(PreferencesUserSettingsTab.ROOM_LIST_SETTINGS)}
+                    {this._renderGroup(PreferencesUserSettingsTab.eligibleRoomListSettings())}
                 </div>
 
                 <div className="mx_SettingsTab_section">

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
@@ -2325,7 +2325,7 @@
     "Verify this login": "Потвърди тази сесия",
     "Session verified": "Сесията беше потвърдена",
     "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Промяната на паролата ще нулира всички ключове за шифроване от-край-до-край по всички ваши сесии, правейки шифрованата история на чата нечетима. Настройте резервно копие на ключовете или експортирайте ключовете на стаите от друга сесия преди да промените паролата си.",
-    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Администраторът на сървъра е изключиш шифроване от край-до-край по подразбиране за лични стаи и за директни съобщения.",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Администраторът на сървъра е изключил шифроване от край-до-край по подразбиране за лични стаи и за директни съобщения.",
     "Emoji picker": "Избор на емоджи",
     "People": "Хора",
     "Show %(n)s more": "Покажи още %(n)s",
@@ -2446,5 +2446,27 @@
     "A-Z": "Азбучен ред",
     "Unread rooms": "Непрочетени стаи",
     "Show %(count)s more|other": "Покажи още %(count)s",
-    "Show %(count)s more|one": "Покажи още %(count)s"
+    "Show %(count)s more|one": "Покажи още %(count)s",
+    "Light": "Светла",
+    "Dark": "Тъмна",
+    "Use the improved room list (will refresh to apply changes)": "Използвай подобрения списък със стаи (ще презареди за да се приложи промяната)",
+    "Enable IRC layout option in the appearance tab": "Включи опцията за IRC изглед в раздел Изглед",
+    "Use custom size": "Използвай собствен размер",
+    "Use a system font": "Използвай системния шрифт",
+    "System font name": "Име на системния шрифт",
+    "Hey you. You're the best!": "Хей, ти. Върхът си!",
+    "Message layout": "Изглед на съобщенията",
+    "Compact": "Компактен",
+    "Modern": "Модерен",
+    "Customise your appearance": "Настройте изгледа",
+    "Appearance Settings only affect this Riot session.": "Настройките на изгледа влияят само на тази Riot сесия.",
+    "The authenticity of this encrypted message can't be guaranteed on this device.": "Автентичността на това шифровано съобщение не може да бъде гарантирана на това устройство.",
+    "Always show first": "Винаги показвай първо",
+    "Show": "Покажи",
+    "Message preview": "Преглед на съобщението",
+    "List options": "Опции на списъка",
+    "Leave Room": "Напусни стаята",
+    "Room options": "Настройки на стаята",
+    "Use Recovery Key or Passphrase": "Използвай ключ за възстановяване или парола",
+    "Use Recovery Key": "Използвай ключ за възстановяване"
 }
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
@@ -2428,8 +2428,8 @@
     "Set a room address to easily share your room with other people.": "Vergebe eine Raum-Adresse, um diesen Raum auf einfache Weise mit anderen Personen teilen zu können.",
     "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.": "Du hast für diese Sitzung zuvor eine neuere Version von Riot verwendet. Um diese Version mit Ende-zu-Ende-Verschlüsselung wieder zu benutzen, musst du dich erst ab- und dann wieder anmelden.",
     "Delete the room address %(alias)s and remove %(name)s from the directory?": "Soll die Raum-Adresse %(alias)s gelöscht und %(name)s aus dem Raum-Verzeichnis entfernt werden?",
-    "Switch to light mode": "Zum Light Mode wechseln",
-    "Switch to dark mode": "Zum Dark Mode wechseln",
+    "Switch to light mode": "Zum hellen Thema wechseln",
+    "Switch to dark mode": "Zum dunklen Thema wechseln",
     "Switch theme": "Design ändern",
     "Security & privacy": "Sicherheit & Datenschutz",
     "All settings": "Alle Einstellungen",
@@ -2462,5 +2462,79 @@
     "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"
+    "Store your Recovery Key": "Speichere deinen Wiederherstellungsschlüssel",
+    "Light": "Hell",
+    "Dark": "Dunkel",
+    "Use the improved room list (will refresh to apply changes)": "Verwende die verbesserte Raumliste (lädt die Anwendung neu)",
+    "Use custom size": "Verwende individuelle Größe",
+    "Hey you. You're the best!": "Hey du. Du bist der Beste!",
+    "Message layout": "Nachrichtenlayout",
+    "Compact": "Kompakt",
+    "Modern": "Modern",
+    "Enable IRC layout option in the appearance tab": "Option für IRC Layout in den Erscheinungsbild-Einstellungen aktivieren",
+    "Use a system font": "Verwende die System-Schriftart",
+    "System font name": "System-Schriftart",
+    "Customise your appearance": "Verändere das Erscheinungsbild",
+    "Appearance Settings only affect this Riot session.": "Einstellungen zum Erscheinungsbild wirken sich nur auf diese Riot Sitzung aus.",
+    "The authenticity of this encrypted message can't be guaranteed on this device.": "Die Echtheit dieser verschlüsselten Nachricht kann auf diesem Gerät nicht garantiert werden.",
+    "You joined the call": "Du bist dem Anruf beigetreten",
+    "%(senderName)s joined the call": "%(senderName)s ist dem Anruf beigetreten",
+    "Call in progress": "Laufendes Gespräch",
+    "You left the call": "Du hast den Anruf verlassen",
+    "%(senderName)s left the call": "%(senderName)s hat den Anruf verlassen",
+    "Call ended": "Anruf beendet",
+    "You started a call": "Du hast einen Anruf gestartet",
+    "%(senderName)s started a call": "%(senderName)s hat einen Anruf gestartet",
+    "Waiting for answer": "Warte auf Antwort",
+    "%(senderName)s is calling": "%(senderName)s ruft an",
+    "You created the room": "Du hast den Raum erstellt",
+    "%(senderName)s created the room": "%(senderName)s hat den Raum erstellt",
+    "You made the chat encrypted": "Du hast den Raum verschlüsselt",
+    "%(senderName)s made the chat encrypted": "%(senderName)s hat den Raum verschlüsselt",
+    "You made history visible to new members": "Du hast die bisherige Kommunikation für neue Teilnehmern sichtbar gemacht",
+    "%(senderName)s made history visible to new members": "%(senderName)s hat die bisherige Kommunikation für neue Teilnehmern sichtbar gemacht",
+    "You made history visible to anyone": "Du hast die bisherige Kommunikation für alle sichtbar gemacht",
+    "%(senderName)s made history visible to anyone": "%(senderName)s hat die bisherige Kommunikation für alle sichtbar gemacht",
+    "You made history visible to future members": "Du hast die bisherige Kommunikation für zukünftige Teilnehmer sichtbar gemacht",
+    "%(senderName)s made history visible to future members": "%(senderName)s hat die bisherige Kommunikation für zukünftige Teilnehmer sichtbar gemacht",
+    "You were invited": "Du wurdest eingeladen",
+    "%(targetName)s was invited": "%(targetName)s wurde eingeladen",
+    "You left": "Du hast den Raum verlassen",
+    "%(targetName)s left": "%(targetName)s hat den Raum verlassen",
+    "You were kicked (%(reason)s)": "Du wurdest herausgeworfen (%(reason)s)",
+    "%(targetName)s was kicked (%(reason)s)": "%(targetName)s wurde herausgeworfen (%(reason)s)",
+    "You were kicked": "Du wurdest herausgeworfen",
+    "%(targetName)s was kicked": "%(targetName)s wurde herausgeworfen",
+    "You rejected the invite": "Du hast die Einladung abgelehnt",
+    "%(targetName)s rejected the invite": "%(targetName)s hat die Einladung abgelehnt",
+    "You were uninvited": "Deine Einladung wurde zurückgezogen",
+    "%(targetName)s was uninvited": "Die Einladung für %(targetName)s wurde zurückgezogen",
+    "You were banned (%(reason)s)": "Du wurdest verbannt (%(reason)s)",
+    "%(targetName)s was banned (%(reason)s)": "%(targetName)s wurde verbannt (%(reason)s)",
+    "You were banned": "Du wurdest verbannt",
+    "%(targetName)s was banned": "%(targetName)s wurde verbannt",
+    "You joined": "Du bist beigetreten",
+    "%(targetName)s joined": "%(targetName)s ist beigetreten",
+    "You changed your name": "Du hast deinen Namen geändert",
+    "%(targetName)s changed their name": "%(targetName)s hat den Namen geändert",
+    "You changed your avatar": "Du hast deinen Avatar geändert",
+    "%(targetName)s changed their avatar": "%(targetName)s hat den Avatar geändert",
+    "%(senderName)s %(emote)s": "%(senderName)s %(emote)s",
+    "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
+    "You changed the room name": "Du hast den Raumnamen geändert",
+    "%(senderName)s changed the room name": "%(senderName)s hat den Raumnamen geändert",
+    "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
+    "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
+    "You uninvited %(targetName)s": "Du hast die Einladung für %(targetName)s zurückgezogen",
+    "%(senderName)s uninvited %(targetName)s": "%(senderName)s hat die Einladung für %(targetName)s zurückgezogen",
+    "You invited %(targetName)s": "Du hast %(targetName)s eingeladen",
+    "%(senderName)s invited %(targetName)s": "%(senderName)s hat %(targetName)s eingeladen",
+    "You changed the room topic": "Du hast das Raumthema geändert",
+    "%(senderName)s changed the room topic": "%(senderName)s hat das Raumthema geändert",
+    "New spinner design": "Neue Warteanimation",
+    "Use a more compact ‘Modern’ layout": "Verwende ein kompakteres 'modernes' Layout",
+    "Message deleted on %(date)s": "Nachricht am %(date)s gelöscht",
+    "Wrong file type": "Falscher Dateityp",
+    "Wrong Recovery Key": "Falscher Wiederherstellungsschlüssel",
+    "Invalid Recovery Key": "Ungültiger Wiederherstellungsschlüssel"
 }
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
@@ -1179,7 +1179,7 @@
     "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": "Tu Riot está mal configurado",
+    "Your Riot is misconfigured": "Tu Riot tiene un error de configuración",
     "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",
@@ -1556,7 +1556,7 @@
     "Sign In or Create Account": "Iniciar sesión o Crear una cuenta",
     "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",
+    "Sign In": "Iniciar sesión",
     "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ó",
@@ -2191,5 +2191,44 @@
     "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.",
     "Room name or address": "Nombre o dirección de la sala",
-    "Address (optional)": "Dirección (opcional)"
+    "Address (optional)": "Dirección (opcional)",
+    "Help us improve Riot": "Ayúdanos a mejorar Riot",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve Riot. This will use a <PolicyLink>cookie</PolicyLink>.": "Enviar <UsageDataLink>información anónima de uso</UsageDataLink> nos ayudaría bastante a mejorar Riot. Esto cuenta como utilizar <PolicyLink>una cookie</PolicyLink>.",
+    "I want to help": "Quiero ayudar",
+    "Ok": "Ok",
+    "Set password": "Establecer contraseña",
+    "To return to your account in future you need to set a password": "Para poder regresar a tu cuenta en un futuro necesitas establecer una contraseña",
+    "Restart": "Reiniciar",
+    "Upgrade your Riot": "Actualiza tu Riot",
+    "A new version of Riot is available!": "¡Una nueva versión de Riot se encuentra disponible!",
+    "You joined the call": "Te has unido a la llamada",
+    "%(senderName)s joined the call": "%(senderName)s se ha unido a la llamada",
+    "Call in progress": "Llamada en progreso",
+    "You left the call": "Has abandonado la llamada",
+    "%(senderName)s left the call": "%(senderName)s dejo la llamada",
+    "Call ended": "La llamada ha finalizado",
+    "You started a call": "Has iniciado una llamada",
+    "%(senderName)s started a call": "%(senderName)s inicio una llamada",
+    "Waiting for answer": "Esperado por una respuesta",
+    "%(senderName)s is calling": "%(senderName)s está llamando",
+    "%(senderName)s created the room": "%(senderName)s creo la sala",
+    "You were invited": "Has sido invitado",
+    "%(targetName)s was invited": "%(targetName)s ha sido invitado",
+    "%(targetName)s left": "%(targetName)s se ha ido",
+    "You were kicked (%(reason)s)": "Has sido expulsado por %(reason)s",
+    "You rejected the invite": "Has rechazado la invitación",
+    "%(targetName)s rejected the invite": "%(targetName)s rechazo la invitación",
+    "You were banned (%(reason)s)": "Has sido baneado por %(reason)s",
+    "%(targetName)s was banned (%(reason)s)": "%(targetName)s fue baneado por %(reason)s",
+    "You were banned": "Has sido baneado",
+    "%(targetName)s was banned": "%(targetName)s fue baneado",
+    "You joined": "Te has unido",
+    "%(targetName)s joined": "%(targetName)s se ha unido",
+    "You changed your name": "Has cambiado tu nombre",
+    "%(targetName)s changed their name": "%(targetName)s cambio su nombre",
+    "You changed your avatar": "Ha cambiado su avatar",
+    "%(targetName)s changed their avatar": "%(targetName)s ha cambiado su avatar",
+    "You changed the room name": "Has cambiado el nombre de la sala",
+    "%(senderName)s changed the room name": "%(senderName)s cambio el nombre de la sala",
+    "You invited %(targetName)s": "Has invitado a %(targetName)s"
 }