Merge pull request #255 from ever-co/develop

Release

README.md

@@ -3,7 +3,7 @@
 [![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/ever-co/ever-traduora)
 [![Latest Release](https://img.shields.io/github/release/ever-co/ever-traduora.svg?label=latest%20release)](https://github.com/ever-co/ever-traduora/releases)
 [![GitHub License](https://img.shields.io/badge/license-AGPL-v3.svg)](https://raw.githubusercontent.com/ever-co/ever-traduora/master/LICENSE)
-[![Docker Pulls](https://img.shields.io/docker/pulls/ever-co/ever-traduora)](https://hub.docker.com/r/everco/ever-traduora)
+[![Docker Pulls](https://img.shields.io/docker/pulls/traduora/traduora)](https://hub.docker.com/r/traduora/traduora)
 [![Get help on Codementor](https://cdn.codementor.io/badges/get_help_github.svg)](https://www.codementor.io/evereq?utm_source=github&utm_medium=button&utm_term=evereq&utm_campaign=github)
 
 Ever® Traduora - **Open-Source Translation Management Platform** for teams. 
@@ -23,6 +23,7 @@ We are going to also use Traduora from our other open-source platforms (currentl
 - Invite your team, everyone can work together on the same project
 - Automate your translation workflow via our REST API
 - Import and export to your favorite formats: JSON flat and nested, CSV, YAML flat and nested, Java Properties, XLIFF 1.2, Gettext (po), Strings, Android Resources (xml).
+- community contributed CLI available at https://github.com/iilei/traduora-cli (not official CLI)
 
 For more information check out [Traduora.com](https://traduora.com), or our docs at [docs.traduora.com](https://docs.traduora.com)
 

api/package.json

@@ -1,6 +1,6 @@
 {
  "name": "ever-traduora-api",
- "version": "0.19.0",
+ "version": "0.19.1",
  "license": "AGPL-3.0-only",
  "homepage": "https://traduora.com",
  "repository": {
@@ -29,69 +29,69 @@
  "typeorm": "ts-node node_modules/.bin/typeorm"
  },
  "dependencies": {
- "morgan": "^1.10.0",
- "@nestjs/common": "^7.6.15",
- "@nestjs/core": "^7.6.15",
- "@nestjs/jwt": "^7.2.0",
- "@nestjs/passport": "^7.1.5",
- "@nestjs/platform-express": "^7.6.15",
- "@nestjs/swagger": "^4.8.0",
- "@nestjs/typeorm": "^7.1.5",
+ "@nestjs/common": "^8.0.6",
+ "@nestjs/core": "^8.0.6",
+ "@nestjs/jwt": "^8.0.0",
+ "@nestjs/passport": "^8.0.1",
+ "@nestjs/platform-express": "^8.0.6",
+ "@nestjs/swagger": "^5.0.9",
+ "@nestjs/typeorm": "^8.0.2",
  "bcrypt": "^5.0.1",
  "class-transformer": "^0.4.0",
  "class-validator": "^0.13.1",
- "csv": "^5.5.0",
+ "csv": "^5.5.3",
  "ejs": "^3.1.6",
- "generate-password": "^1.6.0",
+ "generate-password": "^1.6.1",
  "gettext-parser": "^4.0.4",
  "handlebars": "^4.7.7",
- "iconv-lite": "^0.6.2",
+ "iconv-lite": "^0.6.3",
  "js-yaml": "^4.1.0",
  "moment": "^2.29.1",
+ "morgan": "^1.10.0",
  "mysql": "^2.18.1",
  "node-native2ascii": "^0.2.0",
- "nodemailer": "^6.6.0",
+ "nodemailer": "^6.6.3",
  "passport": "^0.4.1",
  "passport-jwt": "^4.0.0",
  "php-array-parser": "^1.0.1",
- "preview-email": "^3.0.4",
+ "preview-email": "^3.0.5",
  "properties": "^1.2.1",
  "query-string": "^7.0.0",
- "querystring": "^0.2.0",
+ "querystring": "^0.2.1",
  "reflect-metadata": "^0.1.13",
- "rxjs": "^7.0.0",
+ "rxjs": "^7.3.0",
  "strings-file": "^0.0.5",
  "swagger-ui-express": "^4.1.6",
- "typeorm": "^0.2.32",
- "typescript": "^4.2.4",
- "xliff": "^5.5.3",
+ "typeorm": "^0.2.37",
+ "typescript": "^4.4.2",
+ "xliff": "^5.6.2",
  "xml-js": "^1.6.11"
  },
  "devDependencies": {
- "@nestjs/testing": "^7.6.15",
+ "@nestjs/testing": "^8.0.6",
  "@types/bcrypt": "^5.0.0",
- "@types/morgan": "^1.9.2",
- "@types/express": "^4.17.11",
+ "@types/express": "^4.17.13",
  "@types/handlebars": "^4.1.0",
  "@types/iconv-lite": "^0.0.1",
  "@types/jest": "^26.0.23",
  "@types/js-yaml": "^4.0.1",
  "@types/moment": "^2.13.0",
+ "@types/morgan": "^1.9.2",
  "@types/node": "^15.0.2",
- "@types/nodemailer": "^6.4.1",
+ "@types/nodemailer": "^6.4.4",
  "@types/supertest": "^2.0.11",
  "copyfiles": "^2.4.1",
  "cross-env": "^7.0.3",
- "jest": "^26.6.3",
+ "jest": "^27.1.1",
  "nodemon": "^2.0.7",
- "prettier": "^2.3.0",
+ "prettier": "^2.4.0",
  "rimraf": "^3.0.2",
  "semver-regex": "^4.0.0",
  "supertest": "^6.1.3",
- "ts-jest": "^26.5.6",
- "ts-loader": "^9.1.2",
- "ts-node": "^9.1.1",
- "tsconfig-paths": "^3.9.0",
+ "ts-jest": "^27.0.5",
+ "ts-loader": "^9.2.5",
+ "ts-node": "^10.2.1",
+ "tsconfig-paths": "^3.11.0",
  "tslint": "^6.1.3",
  "webpack": "^5.37.0",
  "webpack-cli": "^4.7.0",

api/src/formatters/resx.ts

@@ -9,7 +9,7 @@ export const resXParser: Parser = async (data: string) => {
  for (const element of xml.elements) {
  if (element.type === 'element' && element.name === 'root') {
  for (const resource of element.elements) {
- if (resource.type === 'element' && resource.name == 'data' && resource.attributes && resource.attributes.name) {
+ if (resource.type === 'element' && resource.name === 'data' && resource.attributes && resource.attributes.name) {
  const term = resource.attributes.name;
  if (typeof term === 'string') {
  if (resource.elements && resource.elements.length > 0) {
@@ -38,7 +38,7 @@ export const resXExporter: Exporter = async (data: IntermediateTranslationFormat
  _attributes: { name: translation.term, 'xml:space': 'preserve' },
  value: escape(translation.translation),
  }));
- var xml = xmlJs.js2xml(
+ const xml = xmlJs.js2xml(
  {
  _declaration: { _attributes: { version: '1.0', encoding: 'utf-8' } },
  root: {