Skip to content

Commit e28fb6d

Browse files
committed
Merge branch 'release/0.63.3-0.7.2' into develop
2 parents ee27d30 + e8bd733 commit e28fb6d

File tree

8 files changed

+356
-258
lines changed

8 files changed

+356
-258
lines changed

.scripts/translationDiff.js

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
#!/usr/bin/env node
2+
3+
const path = require('path');
4+
const fs = require('fs');
5+
const util = require('util');
6+
7+
// Convert fs.readFile into Promise version of same
8+
const readFile = util.promisify(fs.readFile);
9+
10+
const translationDir = path.resolve(__dirname, '../packages/rocketchat-i18n/i18n/');
11+
12+
async function translationDiff(source, target) {
13+
console.debug('loading translations from', translationDir);
14+
15+
function diffKeys(a, b) {
16+
const diff = {};
17+
Object.keys(a).forEach((key)=>{
18+
if (!b[key]) {
19+
diff[key] = a[key];
20+
}
21+
});
22+
23+
return diff;
24+
}
25+
26+
const sourceTranslations = JSON.parse(await readFile(`${ translationDir }/${ source }.i18n.json`, 'utf8'));
27+
const targetTranslations = JSON.parse(await readFile(`${ translationDir }/${ target }.i18n.json`, 'utf8'));
28+
29+
return diffKeys(sourceTranslations, targetTranslations);
30+
}
31+
32+
console.log('Note: You can set the source and target language of the comparison with env-variables SOURCE/TARGET_LANGUAGE');
33+
const sourceLang = process.env.SOURCE_LANGUAGE || 'en';
34+
const targetLang = process.env.TARGET_LANGUAGE || 'de';
35+
translationDiff(sourceLang, targetLang).then((diff) => {
36+
console.log('Diff between', sourceLang, 'and', targetLang);
37+
console.log(JSON.stringify(diff, '', 2));
38+
});

HISTORY.md

+21-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
# Assistify 0.63.2-0.7.0
1+
# Assistify 0.63.3-0.7.2
22

3-
This release "only" brings an up-to-date version of Rocket.Chat - But this one has a pack full of new features:
3+
This is a bugfix release and brings only minor enhancements
44

5-
- The "directory" - a list showing all rooms of your team
6-
- A revamped sidebar-header: You can now easily customize the view of your channel list
7-
- APIs for the new mobile apps - which are a huge leap forward, particularly for Android-users
8-
- Much much more in the details - check the below history if you wanted know it in detail
5+
- A way to update the knowledge base to the latest state of the chat (synchronization)
6+
- A better mobile livechat experience
97

108
# 0.63.3
119
`2018-04-18 · 2 🐛 · 2 🔍 · 1 👩‍💻👨‍💻`
@@ -27,6 +25,22 @@ This release "only" brings an up-to-date version of Rocket.Chat - But this one h
2725

2826
- [@nsuchy](https://github.com/nsuchy)
2927

28+
# Assistify 0.63.2-0.7.1
29+
30+
This is a bugfix release and brings only minor enhancements
31+
32+
- The ability to specify a password policy
33+
- A more convenient way to select a topic for a request :tada:
34+
35+
# Assistify 0.63.2-0.7.0
36+
37+
This release "only" brings an up-to-date version of Rocket.Chat - But this one has a pack full of new features:
38+
39+
- The "directory" - a list showing all rooms of your team
40+
- A revamped sidebar-header: You can now easily customize the view of your channel list
41+
- APIs for the new mobile apps - which are a huge leap forward, particularly for Android-users
42+
- Much much more in the details - check the below history if you wanted know it in detail
43+
3044
# 0.63.2
3145
`2018-04-17 · 1 🐛 · 1 🔍`
3246

@@ -2221,4 +2235,4 @@ This is a bug fix release. You may notice that your notification settings from a
22212235
- [@qge](https://github.com/qge)
22222236
- [@sezinkarli](https://github.com/sezinkarli)
22232237
- [@szluohua](https://github.com/szluohua)
2224-
- [@tgxn](https://github.com/tgxn)
2238+
- [@tgxn](https://github.com/tgxn)

package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@
7878
"version": "node .scripts/version.js",
7979
"set-version": "node .scripts/set-version.js",
8080
"release": "npm run set-version --silent",
81-
"testmode-debug": "meteor reset && TEST_MODE=true meteor run --inspect"
81+
"testmode-debug": "meteor reset && TEST_MODE=true meteor run --inspect",
82+
"translation-diff": "node .scripts/translationDiff.js"
8283
},
8384
"license": "MIT",
8485
"repository": {

packages/rocketchat-apps/.npm/package/npm-shrinkwrap.json

+15-20
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)