diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2021-03-29 21:03:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-29 21:03:57 +0200 |
| commit | 30e2233354511be439eef319798efddfb5f2d416 (patch) | |
| tree | 82dcbbc81104985bbfa0484fe3d196922482e216 | |
| parent | e77088c7e8ca89135b0d5ad5afc2d0407965e36a (diff) | |
| parent | 6ae3de247df3e27db1e1768985fed37143fbfd4c (diff) | |
| download | nextcloud-server-30e2233354511be439eef319798efddfb5f2d416.tar.gz nextcloud-server-30e2233354511be439eef319798efddfb5f2d416.zip | |
Merge pull request #26355 from nextcloud/bugfix/noid/wording-fixes-for-phone-number-integration
Fix working for phone number integration
| -rw-r--r-- | apps/settings/js/federationscopemenu.js | 6 | ||||
| -rw-r--r-- | apps/settings/templates/settings/admin/sharing.php | 4 |
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 0fcf79fc7c4..9938955ae3d 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'); |