summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJoas Schilling <213943+nickvergessen@users.noreply.github.com>2021-03-30 09:53:48 +0200
committerGitHub <noreply@github.com>2021-03-30 09:53:48 +0200
commit3ebe3a0e5f9dfe558faab3b445c0b69eb35a733a (patch)
tree74d252e0de934aa6bcadd425055df8bc0a8433bf /apps
parent68e9013c39f2efa2b7700e305cce65210bec4411 (diff)
parent2b8dfc03b6d00d47ace3de9e72ef9c3e9a4a5f05 (diff)
downloadnextcloud-server-3ebe3a0e5f9dfe558faab3b445c0b69eb35a733a.tar.gz
nextcloud-server-3ebe3a0e5f9dfe558faab3b445c0b69eb35a733a.zip
Merge pull request #26366 from nextcloud/backport/26355/stable21
[stable21] Fix working for phone number integration
Diffstat (limited to 'apps')
-rw-r--r--apps/settings/js/federationscopemenu.js6
-rw-r--r--apps/settings/templates/settings/admin/sharing.php4
2 files changed, 5 insertions, 5 deletions
diff --git a/apps/settings/js/federationscopemenu.js b/apps/settings/js/federationscopemenu.js
index 617a8e3d412..d19c9d7d0bf 100644
--- a/apps/settings/js/federationscopemenu.js
+++ b/apps/settings/js/federationscopemenu.js
@@ -30,14 +30,14 @@
{
name: 'v2-private',
displayName: t('settings', 'Private'),
- tooltip: t('settings', "Don't show via public link"),
- iconClass: 'icon-password',
+ tooltip: t('settings', 'Only visible to people matched via phone number integration through Talk on mobile'),
+ iconClass: 'icon-phone',
active: false
},
{
name: 'v2-local',
displayName: t('settings', 'Local'),
- tooltip: t('settings', "Don't synchronize to servers"),
+ tooltip: t('settings', 'Only visible to people on this instance and guests'),
iconClass: 'icon-password',
active: false
},
diff --git a/apps/settings/templates/settings/admin/sharing.php b/apps/settings/templates/settings/admin/sharing.php
index 65e84d29120..3fc3f2a5c1e 100644
--- a/apps/settings/templates/settings/admin/sharing.php
+++ b/apps/settings/templates/settings/admin/sharing.php
@@ -183,12 +183,12 @@
<?php if ($_['restrictUserEnumerationToPhone'] === 'yes') {
print_unescaped('checked="checked"');
} ?> />
- <label for="shareapi_restrict_user_enumeration_to_phone"><?php p($l->t('Allow username autocompletion to users based on phonebook matches'));?></label><br />
+ <label for="shareapi_restrict_user_enumeration_to_phone"><?php p($l->t('Allow username autocompletion to users based on phone number integration'));?></label><br />
</p>
<p id="shareapi_restrict_user_enumeration_combinewarning_setting" class="indent <?php if ($_['shareAPIEnabled'] === 'no' || $_['allowShareDialogUserEnumeration'] === 'no') {
p('hidden');
}?>">
- <em><?php p($l->t('If autocompletion "same group" and "phonebook matches" are enabled a match in either is enough to show the user.'));?></em><br />
+ <em><?php p($l->t('If autocompletion "same group" and "phone number integration" are enabled a match in either is enough to show the user.'));?></em><br />
</p>
<p id="shareapi_restrict_user_enumeration_full_match_setting" class="indent <?php if ($_['shareAPIEnabled'] === 'no') {
p('hidden');