From 0773311805c26822668c010ee5c8157f8ab85c8e Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Fri, 12 Apr 2019 10:39:17 +0100 Subject: [PATCH] Merge pull request #1674 from sharelatex/sk-email-make-primary-tooltip Change the wording on emails from 'default' to 'primary' GitOrigin-RevId: e09792f6fba73b626c09d8f1bf4298b6e9780d15 --- services/web/app/views/user/settings/user-affiliations.pug | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/services/web/app/views/user/settings/user-affiliations.pug b/services/web/app/views/user/settings/user-affiliations.pug index fd0dea0071..fa558debc9 100644 --- a/services/web/app/views/user/settings/user-affiliations.pug +++ b/services/web/app/views/user/settings/user-affiliations.pug @@ -16,7 +16,7 @@ form.row( ng-repeat="userEmail in userEmails" ) td - | {{ userEmail.email + (userEmail.default ? ' (default)' : '') }} + | {{ userEmail.email + (userEmail.default ? ' (primary)' : '') }} div(ng-if="!userEmail.confirmedAt").small strong #{translate('unconfirmed')}. | @@ -76,11 +76,12 @@ form.row( ) button.btn.btn-sm.btn-success.affiliations-table-inline-action( disabled - ) #{translate("make_default")} + ) #{translate("make_primary")} button.btn.btn-sm.btn-success.affiliations-table-inline-action( + tooltip=translate("make_email_primary_description") ng-if="!userEmail.default && (userEmail.confirmedAt && !ui.isMakingRequest)" ng-click="setDefaultUserEmail(userEmail)" - ) #{translate("make_default")} + ) #{translate("make_primary")} |   button.btn.btn-sm.btn-danger.affiliations-table-inline-action( ng-if="!userEmail.default"