From 5cdbd15a6fd8315a7d89fbf5c16ed9bfa93295ab Mon Sep 17 00:00:00 2001 From: fernandoporazzi Date: Tue, 21 Feb 2017 19:26:03 -0300 Subject: [PATCH 1/2] Translate sweetalert buttons on send files and update password --- .../account/accountProfile.coffee | 12 +++++++++--- packages/rocketchat-ui/lib/fileUpload.coffee | 2 ++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/packages/rocketchat-ui-account/account/accountProfile.coffee b/packages/rocketchat-ui-account/account/accountProfile.coffee index 68c4529bf6fe..5ea19ee59113 100644 --- a/packages/rocketchat-ui-account/account/accountProfile.coffee +++ b/packages/rocketchat-ui-account/account/accountProfile.coffee @@ -117,7 +117,9 @@ Template.accountProfile.events type: "input", inputType: "password", showCancelButton: true, - closeOnConfirm: false + closeOnConfirm: false, + confirmButtonText: t('Save'), + cancelButtonText: t('Cancel') , (typedPassword) => if typedPassword @@ -144,7 +146,9 @@ Template.accountProfile.events type: "input", inputType: "password", showCancelButton: true, - closeOnConfirm: false + closeOnConfirm: false, + confirmButtonText: t('Delete') + cancelButtonText: t('Cancel') , (typedPassword) => if typedPassword @@ -165,7 +169,9 @@ Template.accountProfile.events text: t("If_you_are_sure_type_in_your_username"), type: "input", showCancelButton: true, - closeOnConfirm: false + closeOnConfirm: false, + confirmButtonText: t('Delete') + cancelButtonText: t('Cancel') , (deleteConfirmation) => if deleteConfirmation is Meteor.user()?.username diff --git a/packages/rocketchat-ui/lib/fileUpload.coffee b/packages/rocketchat-ui/lib/fileUpload.coffee index 690e4c707111..3eb4e7a448f8 100644 --- a/packages/rocketchat-ui/lib/fileUpload.coffee +++ b/packages/rocketchat-ui/lib/fileUpload.coffee @@ -84,6 +84,8 @@ readAsArrayBuffer = (file, callback) -> showCancelButton: true closeOnConfirm: false closeOnCancel: false + confirmButtonText: t('Send') + cancelButtonText: t('Cancel') html: true , (isConfirm) -> consume() From 046754a11fc7bb2732ce2e3c4e9021c09c92aa66 Mon Sep 17 00:00:00 2001 From: fernandoporazzi Date: Fri, 24 Feb 2017 11:31:06 -0300 Subject: [PATCH 2/2] Translate Sweetalert cancel button when body is rendered --- packages/rocketchat-ui-master/master/main.coffee | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/rocketchat-ui-master/master/main.coffee b/packages/rocketchat-ui-master/master/main.coffee index d75417bb01c4..91663a587aae 100644 --- a/packages/rocketchat-ui-master/master/main.coffee +++ b/packages/rocketchat-ui-master/master/main.coffee @@ -226,7 +226,10 @@ Template.main.onRendered -> $('.input-message').focus() , 100 + Tracker.autorun -> + swal.setDefaults({cancelButtonText: t('Cancel')}) + prefs = Meteor.user()?.settings?.preferences if prefs?.hideUsernames $(document.body).on('mouseleave', 'button.thumb', (e) ->