ztechno_core 0.0.6 → 0.0.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/mail_service.js +1 -1
- package/lib/translate_service.d.ts +4 -2
- package/lib/translate_service.js +12 -10
- package/package.json +3 -2
package/lib/mail_service.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { ZSqlService } from './sql_service';
|
|
1
2
|
type TranslateData = {
|
|
2
3
|
value: string;
|
|
3
4
|
meta?: {
|
|
@@ -11,12 +12,13 @@ type dbTranslationRow = {
|
|
|
11
12
|
value: string;
|
|
12
13
|
};
|
|
13
14
|
export declare class ZTranslateService {
|
|
15
|
+
private sql;
|
|
14
16
|
private localCache;
|
|
15
17
|
surpressErrors: boolean;
|
|
16
18
|
getLanguages(): string[];
|
|
17
19
|
getSourceLang(): string;
|
|
18
20
|
getDefaultLang(): string;
|
|
19
|
-
constructor();
|
|
21
|
+
constructor(sql: ZSqlService);
|
|
20
22
|
static init(opt: { key: string }): void;
|
|
21
23
|
private codes;
|
|
22
24
|
getLang(cookies: { [key: string]: string }): string;
|
|
@@ -40,6 +42,6 @@ export declare class ZTranslateService {
|
|
|
40
42
|
[key: string]: dbTranslationRow[];
|
|
41
43
|
}>;
|
|
42
44
|
private fetchAll;
|
|
43
|
-
static get(): ZTranslateService;
|
|
45
|
+
static get(sqlService: ZSqlService): ZTranslateService;
|
|
44
46
|
}
|
|
45
47
|
export {};
|
package/lib/translate_service.js
CHANGED
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
3
3
|
exports.ZTranslateService = void 0;
|
|
4
|
-
const sql_service_1 = require('./sql_service');
|
|
5
4
|
const DomParser = require('dom-parser');
|
|
6
5
|
const translate = require('translate');
|
|
7
6
|
const htmlParser = new DomParser();
|
|
8
|
-
const sql = sql_service_1.ZSqlService.get();
|
|
9
7
|
let instance = null;
|
|
10
8
|
class ZTranslateService {
|
|
11
9
|
getLanguages() {
|
|
@@ -17,7 +15,8 @@ class ZTranslateService {
|
|
|
17
15
|
getDefaultLang() {
|
|
18
16
|
return 'nl';
|
|
19
17
|
}
|
|
20
|
-
constructor() {
|
|
18
|
+
constructor(sql) {
|
|
19
|
+
this.sql = sql;
|
|
21
20
|
this.localCache = {};
|
|
22
21
|
this.surpressErrors = true;
|
|
23
22
|
this.codes = {
|
|
@@ -142,7 +141,7 @@ class ZTranslateService {
|
|
|
142
141
|
}
|
|
143
142
|
}
|
|
144
143
|
async update(key, lang, data) {
|
|
145
|
-
return await sql.query(
|
|
144
|
+
return await this.sql.query(
|
|
146
145
|
`
|
|
147
146
|
INSERT INTO translations
|
|
148
147
|
(\`key\`, \`lang\`, \`value\`)
|
|
@@ -170,7 +169,10 @@ class ZTranslateService {
|
|
|
170
169
|
});
|
|
171
170
|
}
|
|
172
171
|
async fetch(key, lang) {
|
|
173
|
-
const results = await sql.query(`SELECT \`value\` FROM translations WHERE \`lang\`=? AND \`key\`=?`, [
|
|
172
|
+
const results = await this.sql.query(`SELECT \`value\` FROM translations WHERE \`lang\`=? AND \`key\`=?`, [
|
|
173
|
+
lang,
|
|
174
|
+
key,
|
|
175
|
+
]);
|
|
174
176
|
if (results.length > 0) {
|
|
175
177
|
// api.query(`UPDATE translations SET last_used=CURRENT_TIMESTAMP WHERE \`lang\`=? AND \`key\`=?`, [lang, key])
|
|
176
178
|
// .catch(err => console.error(err))
|
|
@@ -181,14 +183,14 @@ class ZTranslateService {
|
|
|
181
183
|
return false;
|
|
182
184
|
}
|
|
183
185
|
async insert(key, lang, data) {
|
|
184
|
-
await sql.query(`INSERT IGNORE INTO translations (\`key\`, \`lang\`, \`value\`) VALUES (?, ?, ?)`, [
|
|
186
|
+
await this.sql.query(`INSERT IGNORE INTO translations (\`key\`, \`lang\`, \`value\`) VALUES (?, ?, ?)`, [
|
|
185
187
|
key,
|
|
186
188
|
lang,
|
|
187
189
|
data.value,
|
|
188
190
|
]);
|
|
189
191
|
}
|
|
190
192
|
fetchLang(lang) {
|
|
191
|
-
return sql.query(
|
|
193
|
+
return this.sql.query(
|
|
192
194
|
`SELECT \`key\`, \`lang\`, \`value\`, \`verified\`, \`created_at\` FROM translations WHERE \`lang\`=?`,
|
|
193
195
|
[lang],
|
|
194
196
|
);
|
|
@@ -206,11 +208,11 @@ class ZTranslateService {
|
|
|
206
208
|
return output;
|
|
207
209
|
}
|
|
208
210
|
fetchAll() {
|
|
209
|
-
return sql.query(`SELECT \`key\`, \`lang\`, \`value\`, \`verified\`, \`created_at\` FROM translations`);
|
|
211
|
+
return this.sql.query(`SELECT \`key\`, \`lang\`, \`value\`, \`verified\`, \`created_at\` FROM translations`);
|
|
210
212
|
}
|
|
211
|
-
static get() {
|
|
213
|
+
static get(sqlService) {
|
|
212
214
|
if (instance == null) {
|
|
213
|
-
instance = new ZTranslateService();
|
|
215
|
+
instance = new ZTranslateService(sqlService);
|
|
214
216
|
}
|
|
215
217
|
return instance;
|
|
216
218
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ztechno_core",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.8",
|
|
4
4
|
"description": "Core files for ztechno framework",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -17,7 +17,8 @@
|
|
|
17
17
|
"lint": "tslint -p tsconfig.json",
|
|
18
18
|
"preversion": "npm run lint",
|
|
19
19
|
"version": "npm run format && git add -A src",
|
|
20
|
-
"postversion": "git push && git push --tags"
|
|
20
|
+
"postversion": "git push && git push --tags",
|
|
21
|
+
"update": "npm run build && npm version patch && npm publish"
|
|
21
22
|
},
|
|
22
23
|
"keywords": [
|
|
23
24
|
"ztechno",
|