Merge branch 'feature/i18n-type-constraint' of https://github.com/shilangyu/lemmy-ui into shilangyu-feature/i18n-type-constraint

This commit is contained in:
Dessalines 2021-03-01 16:24:17 -05:00
commit 345e992d0f
4 changed files with 64 additions and 13 deletions

View file

@ -228,17 +228,20 @@ hr {
height: 1.5em;
width: 1.5em;
background: rgba(0, 0, 0, 0.4);
background-color: rgba(0, 0, 0, 0.4);
border-bottom-left-radius: 0.25rem !important;
border-top-right-radius: 0.25rem !important;
}
.link-overlay:hover {
transition: 0.1s;
-webkit-transition: 0.1s;
opacity: 1;
}
.link-overlay {
transition: opacity 0.1s ease-in-out;
-webkit-transition: opacity 0.1s ease-in-out;
position: absolute;
opacity: 0;
left: 0;
@ -246,6 +249,7 @@ hr {
width: 100%;
padding: 10px;
background: rgba(0, 0, 0, 0.6);
background-color: rgba(0, 0, 0, 0.6);
}
.placeholder {
@ -285,6 +289,7 @@ pre {
}
.hide-input {
background: transparent !important;
background-color: transparent !important;
width: 0px !important;
padding: 0 !important;
}

View file

@ -1,8 +1,11 @@
import { I18nKeys } from "i18next";
import { Component } from "inferno";
import { i18n } from "../i18next";
export class NoMatch extends Component<any, any> {
private errCode = new URLSearchParams(this.props.location.search).get("err");
private errCode = new URLSearchParams(this.props.location.search).get(
"err"
) as I18nKeys;
constructor(props: any, context: any) {
super(props, context);

View file

@ -1,4 +1,4 @@
import i18next from "i18next";
import i18next, { i18nTyped } from "i18next";
import { getLanguage } from "./utils";
import { en } from "./translations/en";
import { el } from "./translations/el";
@ -84,4 +84,6 @@ i18next.init({
interpolation: { format },
});
export { i18next as i18n, resources };
export const i18n = i18next as i18nTyped;
export { resources };