Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] Variable rendering problem on Import recent history page #15997

Merged
merged 8 commits into from
Apr 14, 2020
+1 −1
Merged

[FIX] Variable rendering problem on Import recent history page #15997

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d26207b
Fix variable rendering problem
ritwizsinha Dec 17, 2019
fda67c9
Made changes in the template by adding a helper to translate
ritwizsinha Dec 21, 2019
2c60187
Corrected the code
ritwizsinha Feb 5, 2020
3045b4e
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into pr/1…
gabriellsh Feb 13, 2020
b92ed5d
Fixed
gabriellsh Feb 13, 2020
eece80c
Merge branch 'develop' into 15996
ritwizsinha Feb 13, 2020
48707a6
Merge branch '15996' of github.com:ritwizsinha/Rocket.Chat into pr/15…
gabriellsh Feb 13, 2020
624fd75
Merge branch 'develop' into 15996
gabriellsh Mar 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/importer/client/admin/adminImportHistory.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<h1>{{ statusMessage}}</h1>

<span style="font-weight: 600;">{{_ "Import_Type"}}:</span>
<span>{{ type}} [{{ importerKey}}]</span>
<span>{{translate type}} [{{ importerKey}}]</span>
ritwizsinha marked this conversation as resolved.
Show resolved Hide resolved
<br/>

<span style="font-weight: 600;">{{_ "Last_Updated"}}:</span>
Expand Down
4 changes: 4 additions & 0 deletions app/importer/client/admin/adminImportHistory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,10 @@ Template.adminImportHistory.helpers({
const date = new Date(this.msg.ts);
return date.toLocaleString();
},
translate(type) {
ritwizsinha marked this conversation as resolved.
Show resolved Hide resolved
return t(type);
},

ritwizsinha marked this conversation as resolved.
Show resolved Hide resolved
});

Template.adminImportHistory.events({
Expand Down