From f0c47bfb6d8d348972ae7c2b4aa0411617864faf Mon Sep 17 00:00:00 2001 From: "John Molakvoæ (skjnldsv)" Date: Thu, 22 Oct 2020 12:12:48 +0200 Subject: Fix sharing input placeholder for emails MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) Signed-off-by: npmbuildbot[bot] --- apps/files_sharing/src/components/SharingInput.vue | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'apps/files_sharing/src') diff --git a/apps/files_sharing/src/components/SharingInput.vue b/apps/files_sharing/src/components/SharingInput.vue index 104ffb1699c..06b39db4fcb 100644 --- a/apps/files_sharing/src/components/SharingInput.vue +++ b/apps/files_sharing/src/components/SharingInput.vue @@ -117,22 +117,16 @@ export default { }, inputPlaceholder() { const allowRemoteSharing = this.config.isRemoteShareAllowed - const allowMailSharing = this.config.isMailShareAllowed if (!this.canReshare) { return t('files_sharing', 'Resharing is not allowed') } - if (!allowRemoteSharing && allowMailSharing) { - return t('files_sharing', 'Name or email address …') - } - if (allowRemoteSharing && !allowMailSharing) { - return t('files_sharing', 'Name or federated cloud ID …') - } - if (allowRemoteSharing && allowMailSharing) { - return t('files_sharing', 'Name, federated cloud ID or email address …') + // We can always search with email addresses for users too + if (!allowRemoteSharing) { + return t('files_sharing', 'Name or email …') } - return t('files_sharing', 'Name …') + return t('files_sharing', 'Name, email, or federated cloud ID …') }, isValidQuery() { -- cgit v1.2.3