forked from RocketChat/Rocket.Chat
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'new-reports-ui' of https://github.com/wreiske/Rocket.Chat…
… into new-reports-ui * 'new-reports-ui' of https://github.com/wreiske/Rocket.Chat: (97 commits) LingoHub Update 🚀 (RocketChat#14643) [FIX] Role name spacing on Permissions page (RocketChat#14625) [FIX] Avatar images on old Livechat client (RocketChat#14590) [FIX] Inject code at the end of <head> tag (RocketChat#14623) [FIX] Mailer breaking if user doesn't have an email address (RocketChat#14614) Ci improvements (RocketChat#14600) [FIX] E2E messages not decrypting in message threads (RocketChat#14580) Fix: emoji render performance for alias (RocketChat#14593) [FIX] Send replyTo for livechat offline messages (RocketChat#14568) Federation i18n message changes (RocketChat#14595) [REGRESSION] Fix Slack bridge channel owner on channel creation (RocketChat#14565) Fix thumbs up emoji shortname (RocketChat#14581) Fix broken logo url in app.json (RocketChat#14572) Add digitalocean button to readme (RocketChat#14583) Fix: Add emoji shortnames to emoji's list (RocketChat#14576) [IMPROVE] Message rendering time (RocketChat#14252) [IMPROVE] Change user presence events to Meteor Streams (RocketChat#14488) Removed unnecessary DDP unblocks (RocketChat#13641) [FIX] Downloading files when running in sub directory (RocketChat#14485) [FIX] Broken layout when sidebar is open on IE/Edge (RocketChat#14567) ...
- Loading branch information
Showing
1,505 changed files
with
31,462 additions
and
15,100 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,3 +22,4 @@ public/livechat/ | |
!.scripts | ||
!packages/rocketchat-livechat/.app | ||
public/pdf.worker.min.js | ||
imports/client/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
/** | ||
* This script will: | ||
* | ||
* - remove any duplicated i18n key on the same file; | ||
* - re-order all keys based on source i18n file (en.i18n.json) | ||
* - remove all keys not present in source i18n file | ||
*/ | ||
|
||
const fs = require('fs'); | ||
|
||
const fg = require('fast-glob'); | ||
|
||
const fixFiles = (path, source, newlineAtEnd = false) => { | ||
const sourceFile = JSON.parse(fs.readFileSync(`${ path }${ source }`, 'utf8')); | ||
const sourceKeys = Object.keys(sourceFile); | ||
|
||
fg([`${ path }/**/*.i18n.json`]).then((entries) => { | ||
entries.forEach((file) => { | ||
console.log(file); | ||
|
||
const json = JSON.parse(fs.readFileSync(file, 'utf8')); | ||
|
||
fs.writeFileSync(file, `${ JSON.stringify(json, sourceKeys, 2) }${ newlineAtEnd ? '\n' : '' }`); | ||
}); | ||
}); | ||
}; | ||
|
||
fixFiles('./packages/rocketchat-i18n', '/i18n/en.i18n.json'); | ||
fixFiles('./packages/rocketchat-livechat/.app/i18n', '/en.i18n.json'); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,5 +17,3 @@ settings.addGroup('Accounts', function() { | |
}); | ||
}); | ||
}); | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.