Fix types and missing translations (#78)
This commit is contained in:

committed by
GitHub

parent
f2f540b429
commit
be867b6b0d
@@ -1,4 +1,4 @@
|
|||||||
import { render, screen, waitFor } from "@testing-library/react";
|
import { render, screen } from "@testing-library/react";
|
||||||
import fetchMock from "jest-fetch-mock";
|
import fetchMock from "jest-fetch-mock";
|
||||||
fetchMock.enableMocks();
|
fetchMock.enableMocks();
|
||||||
|
|
||||||
|
@@ -2,7 +2,7 @@ import { formalGermanMessages } from "@haleos/ra-language-german";
|
|||||||
|
|
||||||
import { SynapseTranslationMessages } from ".";
|
import { SynapseTranslationMessages } from ".";
|
||||||
|
|
||||||
const de: SynapseTranslationMessages = {
|
const fixedGermanMessages = {
|
||||||
...formalGermanMessages,
|
...formalGermanMessages,
|
||||||
ra: {
|
ra: {
|
||||||
...formalGermanMessages.ra,
|
...formalGermanMessages.ra,
|
||||||
@@ -10,8 +10,30 @@ const de: SynapseTranslationMessages = {
|
|||||||
...formalGermanMessages.ra.navigation,
|
...formalGermanMessages.ra.navigation,
|
||||||
no_filtered_results: "Keine Ergebnisse",
|
no_filtered_results: "Keine Ergebnisse",
|
||||||
clear_filters: "Alle Filter entfernen",
|
clear_filters: "Alle Filter entfernen",
|
||||||
|
add_filter: "Filter hinzufügen",
|
||||||
|
},
|
||||||
|
action: {
|
||||||
|
...formalGermanMessages.ra.action,
|
||||||
|
update_application: "Anwendung aktualisieren",
|
||||||
|
},
|
||||||
|
page: {
|
||||||
|
...formalGermanMessages.ra.page,
|
||||||
|
empty: "Leer",
|
||||||
|
access_denied: "Zugriff verweigert",
|
||||||
|
authentication_error: "Authentifizierungsfehler",
|
||||||
|
},
|
||||||
|
message: {
|
||||||
|
...formalGermanMessages.ra.message,
|
||||||
|
access_denied:
|
||||||
|
"Sie haben nicht die richtigen Berechtigungen um auf diese Seite zuzugreifen.",
|
||||||
|
authentication_error:
|
||||||
|
"Der Authentifizierungsserver hat einen Fehler zurückgegeben und Ihre Anmeldedaten konnten nicht überprüft werden.",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
const de: SynapseTranslationMessages = {
|
||||||
|
...fixedGermanMessages,
|
||||||
synapseadmin: {
|
synapseadmin: {
|
||||||
auth: {
|
auth: {
|
||||||
base_url: "Heimserver URL",
|
base_url: "Heimserver URL",
|
||||||
|
@@ -2,7 +2,7 @@ import russianMessages from "ra-language-russian";
|
|||||||
|
|
||||||
import { SynapseTranslationMessages } from ".";
|
import { SynapseTranslationMessages } from ".";
|
||||||
|
|
||||||
const ru: SynapseTranslationMessages = {
|
const fixedRussianMessages = {
|
||||||
...russianMessages,
|
...russianMessages,
|
||||||
ra: {
|
ra: {
|
||||||
...russianMessages.ra,
|
...russianMessages.ra,
|
||||||
@@ -11,7 +11,24 @@ const ru: SynapseTranslationMessages = {
|
|||||||
no_filtered_results: "Нет результатов",
|
no_filtered_results: "Нет результатов",
|
||||||
clear_filters: "Все фильтры сбросить",
|
clear_filters: "Все фильтры сбросить",
|
||||||
},
|
},
|
||||||
|
page: {
|
||||||
|
...russianMessages.ra.page,
|
||||||
|
empty: "Пусто",
|
||||||
|
access_denied: "Доступ запрещен",
|
||||||
|
authentication_error: "Ошибка аутентификации",
|
||||||
|
},
|
||||||
|
message: {
|
||||||
|
...russianMessages.ra.message,
|
||||||
|
access_denied:
|
||||||
|
"У вас нет прав доступа к этой странице.",
|
||||||
|
authentication_error:
|
||||||
|
"Сервер аутентификации вернул ошибку и не смог проверить ваши учетные данные.",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
const ru: SynapseTranslationMessages = {
|
||||||
|
...fixedRussianMessages,
|
||||||
synapseadmin: {
|
synapseadmin: {
|
||||||
auth: {
|
auth: {
|
||||||
base_url: "Адрес домашнего сервера",
|
base_url: "Адрес домашнего сервера",
|
||||||
|
@@ -2,7 +2,7 @@ import chineseMessages from "@haxqer/ra-language-chinese";
|
|||||||
|
|
||||||
import { SynapseTranslationMessages } from ".";
|
import { SynapseTranslationMessages } from ".";
|
||||||
|
|
||||||
const zh: SynapseTranslationMessages = {
|
const fixedChineseMessages = {
|
||||||
...chineseMessages,
|
...chineseMessages,
|
||||||
ra: {
|
ra: {
|
||||||
...chineseMessages.ra,
|
...chineseMessages.ra,
|
||||||
@@ -11,7 +11,27 @@ const zh: SynapseTranslationMessages = {
|
|||||||
no_filtered_results: "没有结果",
|
no_filtered_results: "没有结果",
|
||||||
clear_filters: "清除所有过滤器",
|
clear_filters: "清除所有过滤器",
|
||||||
},
|
},
|
||||||
|
action: {
|
||||||
|
...chineseMessages.ra.action,
|
||||||
|
update_application: "Anwendung aktualisieren",
|
||||||
|
},
|
||||||
|
page: {
|
||||||
|
...chineseMessages.ra.page,
|
||||||
|
access_denied: "拒绝访问",
|
||||||
|
authentication_error: "认证错误",
|
||||||
|
},
|
||||||
|
message: {
|
||||||
|
...chineseMessages.ra.message,
|
||||||
|
access_denied:
|
||||||
|
"您没有访问此页面的权限。",
|
||||||
|
authentication_error:
|
||||||
|
"身份验证服务器返回错误,无法验证您的凭据。",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
const zh: SynapseTranslationMessages = {
|
||||||
|
...fixedChineseMessages,
|
||||||
synapseadmin: {
|
synapseadmin: {
|
||||||
auth: {
|
auth: {
|
||||||
base_url: "服务器 URL",
|
base_url: "服务器 URL",
|
||||||
|
@@ -30,7 +30,7 @@ describe("authProvider", () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
expect(ret).toEqual({redirectTo: "/"});
|
expect(ret).toEqual({redirectTo: "/"});
|
||||||
expect(fetch).toBeCalledWith("http://example.com/_matrix/client/r0/login", {
|
expect(fetch).toHaveBeenCalledWith("http://example.com/_matrix/client/r0/login", {
|
||||||
body: '{"device_id":null,"initial_device_display_name":"Synapse Admin","type":"m.login.password","identifier":{"type":"m.id.user","user":"@user:example.com"},"password":"secret"}',
|
body: '{"device_id":null,"initial_device_display_name":"Synapse Admin","type":"m.login.password","identifier":{"type":"m.id.user","user":"@user:example.com"},"password":"secret"}',
|
||||||
headers: new Headers({
|
headers: new Headers({
|
||||||
Accept: "application/json",
|
Accept: "application/json",
|
||||||
@@ -83,7 +83,7 @@ describe("authProvider", () => {
|
|||||||
|
|
||||||
await authProvider.logout(null);
|
await authProvider.logout(null);
|
||||||
|
|
||||||
expect(fetch).toBeCalledWith("example.com/_matrix/client/r0/logout", {
|
expect(fetch).toHaveBeenCalledWith("example.com/_matrix/client/r0/logout", {
|
||||||
headers: new Headers({
|
headers: new Headers({
|
||||||
Accept: "application/json",
|
Accept: "application/json",
|
||||||
Authorization: "Bearer foo",
|
Authorization: "Bearer foo",
|
||||||
@@ -123,7 +123,9 @@ describe("authProvider", () => {
|
|||||||
|
|
||||||
describe("getPermissions", () => {
|
describe("getPermissions", () => {
|
||||||
it("should do nothing", async () => {
|
it("should do nothing", async () => {
|
||||||
await expect(authProvider.getPermissions(null)).resolves.toBeUndefined();
|
if (authProvider.getPermissions) {
|
||||||
|
await expect(authProvider.getPermissions(null)).resolves.toBeUndefined();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@@ -1,4 +1,4 @@
|
|||||||
import { AuthProvider, HttpError, Options, fetchUtils, useTranslate } from "react-admin";
|
import { AuthProvider, HttpError, Options, fetchUtils } from "react-admin";
|
||||||
|
|
||||||
import storage from "../storage";
|
import storage from "../storage";
|
||||||
import { MatrixError, displayError } from "../components/error";
|
import { MatrixError, displayError } from "../components/error";
|
||||||
|
Reference in New Issue
Block a user