From 884322f82c3799da2194749123d2c477485b6943 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 2 Jun 2017 21:57:42 +0100 Subject: [PATCH 1/4] remove unused imports Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/HomePage.js | 2 -- src/components/views/rooms/DNDRoomTile.js | 1 - 2 files changed, 3 deletions(-) diff --git a/src/components/structures/HomePage.js b/src/components/structures/HomePage.js index 8d44c90a2e..9864b2e9ca 100644 --- a/src/components/structures/HomePage.js +++ b/src/components/structures/HomePage.js @@ -18,8 +18,6 @@ limitations under the License. 'use strict'; import React from 'react'; -import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg'; -import sdk from 'matrix-react-sdk'; module.exports = React.createClass({ displayName: 'HomePage', diff --git a/src/components/views/rooms/DNDRoomTile.js b/src/components/views/rooms/DNDRoomTile.js index 6abb5bd06c..7857da9dbe 100644 --- a/src/components/views/rooms/DNDRoomTile.js +++ b/src/components/views/rooms/DNDRoomTile.js @@ -20,7 +20,6 @@ import React from 'react'; import {DragSource} from 'react-dnd'; import {DropTarget} from 'react-dnd'; -import dis from 'matrix-react-sdk/lib/dispatcher'; import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg'; import sdk from 'matrix-react-sdk'; import { _t } from 'matrix-react-sdk/lib/languageHandler'; From cb3fa16cd0958d7ae8a7f3c86157bdcc8c1516b1 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 2 Jun 2017 22:04:01 +0100 Subject: [PATCH 2/4] install text-encoding-utf-8 so we're not relying on it from react-sdk implicitly/transitively (not nice) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 73ebc00950..bcbd89fa9b 100644 --- a/package.json +++ b/package.json @@ -76,6 +76,7 @@ "react-dom": "^15.4.0", "react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef", "sanitize-html": "^1.11.1", + "text-encoding-utf-8": "^1.0.1", "ua-parser-js": "^0.7.10", "url": "^0.11.0" }, From caeb675672c6c446d36dab671e95b397f0802c39 Mon Sep 17 00:00:00 2001 From: RiotTranslate Date: Thu, 8 Jun 2017 17:00:12 +0200 Subject: [PATCH 3/4] Update from Weblate. (#4250) * Translated using Weblate (Hungarian) Currently translated at 100.0% (162 of 162 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/hu/ * Translated using Weblate (Russian) Currently translated at 100.0% (162 of 162 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/ru/ * Translated using Weblate (German) Currently translated at 100.0% (162 of 162 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/ * Translated using Weblate (Russian) Currently translated at 100.0% (162 of 162 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/ru/ * Translated using Weblate (German) Currently translated at 82.7% (163 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/ * Translated using Weblate (German) Currently translated at 83.2% (164 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/ * Translated using Weblate (German) Currently translated at 83.7% (165 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/ * Translated using Weblate (German) Currently translated at 83.7% (165 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/ * Translated using Weblate (German) Currently translated at 83.7% (165 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/ * Translated using Weblate (German) Currently translated at 100.0% (197 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/ * Translated using Weblate (German) Currently translated at 100.0% (197 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/ * Translated using Weblate (Russian) Currently translated at 84.7% (167 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/ru/ * Translated using Weblate (Thai) Currently translated at 97.9% (193 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/th/ * Translated using Weblate (Thai) Currently translated at 100.0% (197 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/th/ * Translated using Weblate (German) Currently translated at 100.0% (197 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/ * Translated using Weblate (Thai) Currently translated at 100.0% (197 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/th/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (197 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/pt_BR/ * Translated using Weblate (Russian) Currently translated at 84.7% (167 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/ru/ * Translated using Weblate (German) Currently translated at 100.0% (197 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/ --- src/i18n/strings/de_DE.json | 3 ++- src/i18n/strings/pt_BR.json | 41 ++++++++++++++++++++++++++++++++++--- src/i18n/strings/ru.json | 6 +++--- 3 files changed, 43 insertions(+), 7 deletions(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index b9578e8282..bb18ec7ebf 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -203,5 +203,6 @@ "Continue": "Fortfahren", "Please set a password!": "Bitte ein Passwort einrichten!", "This will allow you to return to your account after signing out, and sign in on other devices.": "Dies erlaubt dir, dich wieder an deinem Konto anzumelden, nachdem du dich abgemeldet hast.", - "Dev chat for the Dendrite dev team": "Entwickler-Chat for das Dendrite-Entwickler-Team" + "Dev chat for the Dendrite dev team": "Entwickler-Chat for das Dendrite-Entwickler-Team", + "General discussion about Matrix and Riot": "Generelle Diskussion über Matrix und Riot" } diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json index 0619e52ada..44cf6882b6 100644 --- a/src/i18n/strings/pt_BR.json +++ b/src/i18n/strings/pt_BR.json @@ -81,12 +81,12 @@ "Remove from Directory": "Remover da lista pública de salas", "Resend": "Reenviar", "Riot does not know how to join a room on this network": "O sistema não sabe como entrar na sala desta rede", - "Room directory": "Lista de salas públicas", + "Room directory": "Lista pública de salas", "Room not found": "Sala não encontrada", "Search for a room": "Procurar por uma sala", "Settings": "Configurações", "Source URL": "URL fonte", - "Start chat": "Começar conversa", + "Start chat": "Iniciar conversa pessoal", "The Home Server may be too old to support third party networks": "O servidor pode ser muito antigo para suportar redes de terceiros", "There are advanced notifications which are not shown here": "Existem opções avançadas que não são exibidas aqui", "The server may be unavailable or overloaded": "O servidor pode estar inacessível ou sobrecarregado", @@ -162,5 +162,40 @@ "Waiting for response from server": "Esperando por resposta do servidor", "You are Rioting as a guest. Register or sign in to access more rooms and features!": "Você está usando o Riot como visitante. Registre-se ou faça login para acessar mais salas e funcionalidades!", "OK": "Ok", - "You need to be using HTTPS to place a screen-sharing call.": "Você precisa estar usando HTTPS para poder iniciar uma chamada com compartilhamento de tela." + "You need to be using HTTPS to place a screen-sharing call.": "Você precisa estar usando HTTPS para poder iniciar uma chamada com compartilhamento de tela.", + "Login": "Fazer login", + "Welcome to Riot.im": "Seja bem-vinda(o) a Riot.im", + "Decentralised, encrypted chat & collaboration powered by": "Colaboração descentralizada e criptografada impulsada por", + "Search the room directory": "Buscar na lista pública de salas", + "Chat with Riot Bot": "Conversar com o Bot do Riot", + "Get started with some tips from Riot Bot!": "Comece com algumas dicas do Bot do Riot!", + "General discussion about Matrix and Riot": "Discussão geral sobre o Matrix e o Riot", + "Discussion of all things Matrix!": "Discussão sobre todas as coisas do Matrix!", + "Riot/Web & Desktop chat": "Riot/chat da web e do computador desktop", + "Riot/iOS & matrix-ios-sdk chat": "Riot/chat do iOS e do matrix-ios-sdk", + "Riot/Android & matrix-android-sdk chat": "Riot/Chat do Android e do matrix-android-sdk", + "Matrix technical discussions": "Discussões técnicas do Matrix", + "Running Matrix services": "Rodando serviços Matrix", + "Community-run support for Synapse": "Apoio ao Synapse gerido pela comunidade", + "Admin support for Dendrite": "Suporte de administração para Dendrite", + "Announcements about Synapse releases": "Anúncios sobre lançamentos do Synapse", + "Support for those using and running matrix-appservice-irc": "Apoio para as pessoas usando e rodando matrix-appservice-irc", + "Building services on Matrix": "Construindo serviços no Matrix", + "Support for those using the Matrix spec": "Apoio para as pessoas que estão usando as especificações Matrix", + "Design and implementation of E2E in Matrix": "Design e implementação de criptografia ponta-a-ponta (E2E) no Matrix", + "Implementing VR services with Matrix": "Implementando serviços de Realidade Virtual (VR) com Matrix", + "Implementing VoIP services with Matrix": "Implementando serviços VoIP com Matrix", + "Discussion of the Identity Service API": "Discussão do API do Serviço de Identidades", + "Support for those using, running and writing other bridges": "Apoio para as pessoas que estejam usando, rodando e escrevendo outras pontes (bridges)", + "Contributing code to Matrix and Riot": "Contribuindo com código para o Matrix e o Riot", + "Dev chat for the Riot/Web dev team": "Chat de desenvolvimento para o time devel do Riot/Web", + "Dev chat for the Dendrite dev team": "Chat de desenvolvimento para o time devel do Dendrite", + "Co-ordination for Riot/Web translators": "Coordenação para tradutoras(es) do Riot/Web", + "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Muitas salas já existem no Matrix, algumas independentes, e outras relacionadas a redes existentes (tais como Slack, IRC, Gitter, entre outras). Dê uma olhada na lista de salas públicas!", + "Failed to change password. Is your password correct?": "Não foi possível mudar a senha. A sua senha está correta?", + "You have successfully set a password!": "Você definiu sua senha com sucesso!", + "You can now return to your account after signing out, and sign in on other devices.": "Você pode retornar agora para a sua conta depois de fazer logout, e então fazer login em outros dispositivos.", + "Continue": "Continuar", + "Please set a password!": "Por favor, defina uma senha!", + "This will allow you to return to your account after signing out, and sign in on other devices.": "Isso permitirá que você possa retornar à sua conta após fazer logout, e também fazer login em outros dispositivos." } diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json index 8075a28ec6..c65a49d17c 100644 --- a/src/i18n/strings/ru.json +++ b/src/i18n/strings/ru.json @@ -67,7 +67,7 @@ "Search for a room": "Искать комнату", "Settings": "Настройки", "Start chat": "Начать чат", - "The Home Server may be too old to support third party networks": "Пользовательский сервер может быть слишком старым для поддержки сторонних сетей", + "The Home Server may be too old to support third party networks": "Home Server может быть слишком старым для поддержки сторонних сетей", "There are advanced notifications which are not shown here": "Существуют расширенные уведомления, которые здесь не показаны", "The server may be unavailable or overloaded": "Возможно сервер недоступен или перегружен", "This room is inaccessible to guests. You may be able to join if you register.": "Эта комната недоступна для гостей. Вы можете присоединиться, если зарегистрируетесь.", @@ -143,10 +143,10 @@ "I understand the risks and wish to continue": "Я понимаю риск и хочу продолжыть", "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "Что бы выявить проблему, будет отослан журнал этого клиента с сообщением о ошыбке. Если ты только верхний текст отослать хочешь, отключи следующее:", "Loading bug report module": "Загрузи Модуль ошыбок", - "Messages containing keywords": "Сообщения, которые содержат определенный ключевые слова", + "Messages containing keywords": "Сообщения, которые содержат определенные ключевые слова", "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Пожалуйста опишы (на Английском) ошыбку. Что ты делал? Что ты ожыдал получить? Что произошло?", "Please describe the bug and/or send logs.": "Пожалуйста опишы ошибку и/или перешли протоколы.", - "Please install Chrome or Firefox for the best experience.": "Пожалуйста проинсталируй Chrome или Firefox для лутшего результата.", + "Please install Chrome or Firefox for the best experience.": "Пожалуйста установите Chrome или Firefox для лучшего результата.", "Report a bug": "Отчет о ошыбке", "Riot Desktop on %(platformName)s": "Riot Desktop на %(platformName)s", "Riot is not supported on mobile web. Install the app?": "Riot не будет на мобильном Интернете работать. Программу инсталлировать?", From de334cccfda4e9ff194282e55e83f76b0680b923 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Thu, 8 Jun 2017 18:01:55 +0100 Subject: [PATCH 4/4] Expect to see HTTP /join/#some:alias when we the view knows it --- test/app-tests/joining.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/app-tests/joining.js b/test/app-tests/joining.js index 24a4ceed3c..e835ebb9cb 100644 --- a/test/app-tests/joining.js +++ b/test/app-tests/joining.js @@ -158,7 +158,7 @@ describe('joining a room', function () { ReactTestUtils.Simulate.click(joinLink); - httpBackend.when('POST', '/join/'+encodeURIComponent(ROOM_ID)) + httpBackend.when('POST', '/join/'+encodeURIComponent(ROOM_ALIAS)) .respond(200, {room_id: ROOM_ID}); }).then(() => { // wait for the join request to be made @@ -180,7 +180,7 @@ describe('joining a room', function () { roomView, "mx_Spinner"); // flush it through - return httpBackend.flush('/join/'+encodeURIComponent(ROOM_ID)); + return httpBackend.flush('/join/'+encodeURIComponent(ROOM_ALIAS)); }).then(() => { httpBackend.verifyNoOutstandingExpectation();