TeaSpeak
/
TeaWeb
1
0
Fork 0
Code Issues 1 Pull Requests Activity

Added the ability to insert new lines within a translate able message

canary
WolverinDEV 2020-08-19 22:27:03 +02:00
parent 14fb1fda54
commit 8e5525b201
2 changed files with 42 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
shared/js/ui/react-elements/i18n/index.tsx
View File

@ -1,19 +1,38 @@
import * as React from "react";
import {parseMessageWithArguments} from "tc-shared/ui/frames/chat";
import {cloneElement} from "react";
import {cloneElement, ReactNode} from "react";
let instances = [];
export class Translatable extends React.Component<{ children: string, __cacheKey?: string, trIgnore?: boolean, enforceTextOnly?: boolean }, { translated: string }> {
export class Translatable extends React.Component<{
children: string | (string | React.ReactElement<HTMLBRElement>)[],
__cacheKey?: string,
trIgnore?: boolean,
enforceTextOnly?: boolean
}, { translated: string }> {
protected renderElementIndex = 0;
constructor(props) {
super(props);
let text;
if(Array.isArray(this.props.children)) {
text = (this.props.children as any[]).map(e => typeof e === "string" ? e : "\n").join("");
} else {
text = this.props.children;
}
this.state = {
translated: /* @tr-ignore */ tr(typeof this.props.children === "string" ? this.props.children : (this.props as any).message)
translated: /* @tr-ignore */ tr(text)
}
}
render() {
return this.state.translated;
return this.state.translated.split("\n").reduce((previousValue, currentValue, currentIndex, array) => {
previousValue.push(<React.Fragment key={++this.renderElementIndex}>{currentValue}</React.Fragment>);
if(currentIndex + 1 !== array.length)
previousValue.push(<br key={++this.renderElementIndex} />);
return previousValue;
}, []);
}
componentDidMount(): void {

25
tools/trgen/ts_generator.ts
View File

@ -370,16 +370,29 @@ export function replace_processor(config: Configuration, cache: VolatileTransfor
throw new Error(source_location(ignoreAttribute) + ": Invalid attribute value of type " + SyntaxKind[ignoreAttribute.expression.kind]);
}
if(element.children.length !== 1)
throw new Error(source_location(element) + ": Element has been called with an invalid arguments (" + (element.children.length === 0 ? "too few" : "too many") + ")");
if(element.children.length < 1) {
throw new Error(source_location(element) + ": Element has been called with an invalid arguments (too few)");
}
const text = element.children[0] as ts.JsxText;
if(text.kind != SyntaxKind.JsxText)
throw new Error(source_location(element) + ": Element has invalid children. Expected JsxText but got " + SyntaxKind[text.kind]);
let text = element.children.map(element => {
if(element.kind === SyntaxKind.JsxText) {
return element.text;
} else if(element.kind === SyntaxKind.JsxSelfClosingElement) {
if(element.tagName.kind !== SyntaxKind.Identifier) {
throw new Error(source_location(element.tagName) + ": Expected a JsxSelfClosingElement, but received " + SyntaxKind[element.tagName.kind]);
}
if(element.tagName.escapedText !== "br") {
throw new Error(source_location(element.tagName) + ": Expected a br element, but received " + element.tagName.escapedText);
}
return "\n";
}
}).join("");
let { line, character } = source_file.getLineAndCharacterOfPosition(node.getStart());
cache.translations.push({
message: text.text,
message: text,
line: line,
character: character,
filename: (source_file || {fileName: "unknown"}).fileName,