wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-08-09 12:30:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into translations-de-4.4.1

Browse Source
This commit is contained in:
Kim Gardner
2018-05-21 11:06:17 -04:00
committed by GitHub
parent 8ee90387f6 e2ba08e708
commit ced9d2ea4b
42 changed files with 469 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/talk-plugin-profile-data/client/components/DeleteMyAccount.js
+11 -10
View File
@@ -63,17 +63,18 @@ class DeleteMyAccount extends React.Component {
<p className="talk-plugin-auth--delete-my-account-description">
{t('delete_request.delete_my_account_description')}
</p>
<p className="talk-plugin-auth--delete-my-account-description">
{scheduledDeletionDate &&
t(
'delete_request.already_submitted_request_description',
moment(scheduledDeletionDate).format('MMM Do YYYY, h:mm:ss a')
)}
</p>
{scheduledDeletionDate ? (
<Button onClick={this.cancelAccountDeletion}>
{t('delete_request.cancel_account_deletion_request')}
</Button>
<div>
<p className="talk-plugin-auth--delete-my-account-description">
{t(
'delete_request.already_submitted_request_description',
moment(scheduledDeletionDate).format('MMM Do YYYY, h:mm:ss a')
)}
</p>
<Button onClick={this.cancelAccountDeletion}>
{t('delete_request.cancel_account_deletion_request')}
</Button>
</div>
) : (
<Button icon="delete" onClick={this.showDialog}>
{t('delete_request.delete_my_account')}