Merged with master (Updated translations

package.json

@@ -19,7 +19,6 @@
   "license": "ISC",
   "devDependencies": {
     "@types/emscripten": "0.0.31",
-    "@types/gulp": "^4.0.5",
     "@types/jquery": "3.3.5",
     "@types/moment": "^2.13.0",
     "@types/node": "^9.4.6",
@@ -30,7 +29,7 @@
     "gulp": "^3.9.1",
     "sass": "^1.14.1",
     "sha256": "^0.2.0",
-    "ttypescript": "^1.5.5",
+    "ttypescript": "1.5.5",
     "typescript": "^3.1.1",
     "wat2wasm": "^1.0.2"
   },

scripts/web_build.sh

@@ -4,7 +4,7 @@ source `dirname $0`/resolve_commands.sh
 BASEDIR=$(dirname "$0")
 cd "$BASEDIR/../"
 
-if [[ "$1" == "development" ]] || [[ "$1" == "dev" ]]; then
+if [[ "$1" == "development" ]] || [[ "$1" == "dev" ]] || [[ "$1" == "debug" ]]; then
     source_path="web/environment/development"
     type="development"
 elif [[ "$1" == "release" ]] || [[ "$1" == "rel" ]]; then

scripts/web_package.sh

@@ -3,7 +3,7 @@
 BASEDIR=$(dirname "$0")
 cd "$BASEDIR/../"
 
-if [[ "$1" == "development" ]] || [[ "$1" == "dev" ]]; then
+if [[ "$1" == "development" ]] || [[ "$1" == "dev" ]] || [[ "$1" == "dev" ]]; then
     source_path="web/environment/development"
     type="development"
 elif [[ "$1" == "release" ]] || [[ "$1" == "rel" ]]; then

shared/i18n/info.json

@@ -19,6 +19,9 @@
     {
       "key": "ru",
       "path": "ru_translate_vafin.translation"
+    }, {
+      "key": "ru_gt",
+      "path": "ru_google_translate.translation"
     }
   ],
   "name": "Default TeaSpeak repository",

tools/build_dtsgen.sh

@@ -5,7 +5,7 @@ source "${BASEDIR}/../scripts/resolve_commands.sh"
 cd "$BASEDIR/dtsgen"
 
 execute_tsc -p tsconfig.json
-if [ $? -ne 0 ]; then
+if [[ $? -ne 0 ]]; then
     echo "Failed to build typescript declaration generator"
     exit 1
 fi

tools/dtsgen/declarator.ts

@@ -1,8 +1,6 @@
 import * as ts from "typescript";
 import {SyntaxKind} from "typescript";
 
-type TSExpression = ts.Type | ts.Node;
-
 interface Array<T> {
     last?(): T;
 }
@@ -102,9 +100,9 @@ class StackParameters implements StackParameter {
 }
 
 
-const generators: {[key: number]:((settings: _Settings, stack: StackParameters, node: ts.Node | ts.Type) => ts.Node | ts.Type | undefined) | undefined} = {};
+const generators: {[key: number]:((settings: _Settings, stack: StackParameters, node: ts.Node) => ts.Node | undefined) | undefined} = {};
 
-function _generate(settings: _Settings, stack: StackParameters, layer: TSExpression[], node: ts.Node) {
+function _generate(settings: _Settings, stack: StackParameters, layer: ts.Node[], node: ts.Node) {
     //console.log(SyntaxKind[node.kind]);
     if(generators[node.kind]) {
         const result = generators[node.kind](settings, stack, node);
@@ -324,6 +322,7 @@ generators[SyntaxKind.ClassDeclaration] = (settings, stack, node: ts.ClassDeclar
 };
 
 generators[SyntaxKind.PropertySignature] = (settings, stack, node: ts.PropertySignature) => {
+    console.log(SyntaxKind[node.type.kind]);
     let type: ts.TypeNode = node.type;
     switch (node.type.kind) {
         case SyntaxKind.LiteralType:
@@ -384,11 +383,4 @@ generators[SyntaxKind.EnumDeclaration] = (settings, stack, node: ts.EnumDeclarat
     for(const member of node.members)
         members.push(generators[SyntaxKind.EnumMember](settings, stack, member));
     return ts.createEnumDeclaration(undefined, append_export(append_declare(node.modifiers, !stack.flag_declare), stack.flag_namespace), node.name, members);
-};
+};
-
-
-generators[SyntaxKind.TypeParameter] = (settings, stack, node: ts.TypeParameter) => undefined;
-generators[SyntaxKind.HeritageClause] = (settings, stack, node: ts.HeritageClause) => undefined;
-generators[SyntaxKind.IfStatement] = (settings, stack, node: ts.IfStatement) => undefined;
-generators[SyntaxKind.ExpressionStatement] = (settings, stack, node: ts.ExpressionStatement) => undefined;
-generators[SyntaxKind.SemicolonClassElement] = (settings, stack, node: ts.ExpressionStatement) => undefined;

tools/dtsgen/out.d.ts

@@ -1,6 +1,13 @@
 
-/* File: /home/wolverindev/TeaSpeak/TeaSpeak/Web-Client/tools/dtsgen/test/test_04.ts */
+/* File: /home/wolverindev/TeaSpeak/TeaSpeak/Web-Client/tools/dtsgen/test/test_03.ts */
-declare class TestClass<T> extends Promise<T> {
+declare enum YY {
+    H,
+    B
+}
+declare interface X {
+    type: any;
+    c: YY.B;
+}
+declare class X {
+    static x();
 }
-declare const lambda_function;
-declare const lambda_function2;

tools/dtsgen/test/test_04.ts

@@ -1,4 +0,0 @@
-class TestClass<T> extends Promise<T> { }
-
-const lambda_function = (str) => {};
-const lambda_function2 = (str: string) => {};

tools/dtsgen/tsconfig.json

@@ -3,10 +3,12 @@
     "baseUrl": ".",
     "moduleResolution": "node",
     "module": "commonjs",
-    "lib": ["es6"],
+    "lib": ["es6", "dom"],
 
+    /*
     "typeRoots": [],
-    "types": []
+    "types": [],
+    */
   },
   "files": [
     "declarator.ts",