Merge pull request #13582 from Raroun/Leftovers-from-PR-#13339

Leftovers from pr #13339

doc/Account-Basics.md

@@ -23,10 +23,10 @@ If you do not have an OpenID address or do not wish to use OpenID, leave this fi
 If you have an OpenID account elsewhere and wish to use it, enter the address into this field and click 'Register'.
 Friendica will attempt to extract as much information as possible from your OpenID provider and return to this page with those items already filled in.
 
-### Your Full Name
+### Your Display Name
 
-Please provide your full name **as you would like it to be displayed on this system**.
+Please provide your display name **as you would like it to be displayed on this system**.
-Most people use their real name for this, but you're under no obligation to do so yourself.
+Some people use their real name for this, but you're under no obligation to do so yourself.
 
 ### Email Address
 

doc/Settings.md

@@ -77,11 +77,11 @@ Additionally to the setting in the admin panel, you can decide if registrations
 To enable invitation based registration, you have to set the `invitation_only` setting to `true` in the `system` section of the [config/local.config.php](/help/Config) file.
 If you want to use this method, the registration policy has to be set to either *open* or *requires approval*.
 
-#### Check Full Names
+#### Check Display Names
 
 You may find a lot of spammers trying to register on your site.
-During testing we discovered that since these registrations were automatic, the "Full Name" field was often set to just an account name with no space between first and last name.
+During testing we discovered that since these registrations were automatic, the "Display Name" field was often set to just an account name with no space between first and last name.
-If you would like to support people with only one name as their full name, you may change this setting to true.
+If you would like to support people with only one name as their display name, you can leave this setting set to false.
 Default is false.
 
 #### OpenID

src/Model/User.php

@@ -1160,7 +1160,7 @@ class User
 			throw new Exception(DI::l10n()->tt('Username should be at most %s character.', 'Username should be at most %s characters.', $username_max_length));
 		}
 
-		// So now we are just looking for a space in the full name.
+		// So now we are just looking for a space in the display name.
 		$loose_reg = DI::config()->get('system', 'no_regfullname');
 		if (!$loose_reg) {
 			$username = mb_convert_case($username, MB_CASE_TITLE, 'UTF-8');
@@ -1530,10 +1530,9 @@ class User
 		You may also wish to add some basic information to your default profile
 		(on the "Profiles" page) so that other people can easily find you.
 
-		We recommend setting your full name, adding a profile photo,
+		We recommend adding a profile photo, adding some profile "keywords" 
-		adding some profile "keywords" (very useful in making new friends) - and
+		(very useful in making new friends) - and perhaps what country you live in; 
-		perhaps what country you live in; if you do not wish to be more specific
+		if you do not wish to be more specific than that.
-		than that.
 
 		We fully respect your right to privacy, and none of these items are necessary.
 		If you are new and do not know anybody here, they may help
@@ -1634,10 +1633,9 @@ class User
 			You may also wish to add some basic information to your default profile
 			' . "\x28" . 'on the "Profiles" page' . "\x29" . ' so that other people can easily find you.
 
-			We recommend setting your full name, adding a profile photo,
+			We recommend adding a profile photo, adding some profile "keywords" ' . "\x28" . 'very useful
-			adding some profile "keywords" ' . "\x28" . 'very useful in making new friends' . "\x29" . ' - and
+			in making new friends' . "\x29" . ' - and perhaps what country you live in; if you do not wish
-			perhaps what country you live in; if you do not wish to be more specific
+			to be more specific than that.
-			than that.
 
 			We fully respect your right to privacy, and none of these items are necessary.
 			If you are new and do not know anybody here, they may help

src/Module/Admin/Site.php

@@ -462,7 +462,7 @@ class Site extends BaseAdmin
 			'$allow_users_remote_self'=> ['allow_users_remote_self', DI::l10n()->t('Allow Users to set remote_self'), DI::config()->get('system', 'allow_users_remote_self'), DI::l10n()->t('With checking this, every user is allowed to mark every contact as a remote_self in the repair contact dialog. Setting this flag on a contact causes mirroring every posting of that contact in the users stream.')],
 			'$enable_multi_reg'       => ['enable_multi_reg', DI::l10n()->t('Enable multiple registrations'), !DI::config()->get('system', 'block_extended_register'), DI::l10n()->t('Enable users to register additional accounts for use as pages.')],
 			'$enable_openid'          => ['enable_openid', DI::l10n()->t('Enable OpenID'), !DI::config()->get('system', 'no_openid'), DI::l10n()->t('Enable OpenID support for registration and logins.')],
-			'$enable_regfullname'     => ['enable_regfullname', DI::l10n()->t('Enable Fullname check'), !DI::config()->get('system', 'no_regfullname'), DI::l10n()->t('Enable check to only allow users to register with a space between the first name and the last name in their full name.')],
+			'$enable_regfullname'     => ['enable_regfullname', DI::l10n()->t('Enable full name check'), !DI::config()->get('system', 'no_regfullname'), DI::l10n()->t('Prevents users from registering with a display name with fewer than two parts separated by spaces.')],
 			'$register_notification'  => ['register_notification', DI::l10n()->t('Email administrators on new registration'), DI::config()->get('system', 'register_notification'), DI::l10n()->t('If enabled and the system is set to an open registration, an email for each new registration is sent to the administrators.')],
 			'$community_page_style'   => ['community_page_style', DI::l10n()->t('Community pages for visitors'), DI::config()->get('system', 'community_page_style'), DI::l10n()->t('Which community pages should be available for visitors. Local users always see both pages.'), $community_page_style_choices],
 			'$max_author_posts_community_page' => ['max_author_posts_community_page', DI::l10n()->t('Posts per user on community page'), DI::config()->get('system', 'max_author_posts_community_page'), DI::l10n()->t('The maximum number of posts per user on the community page. (Not valid for "Global Community")')],

src/Module/Register.php

@@ -155,7 +155,7 @@ class Register extends BaseModule
 			'$fillext'      => $fillext,
 			'$oidlabel'     => $oidlabel,
 			'$openid'       => $openid_url,
-			'$namelabel'    => DI::l10n()->t('Your Full Name (e.g. Joe Smith, real or real-looking): '),
+			'$namelabel'    => DI::l10n()->t('Your Display Name (as you would like it to be displayed on this system'),
 			'$addrlabel'    => DI::l10n()->t('Your Email Address: (Initial information will be send there, so this has to be an existing address.)'),
 			'$addrlabel2'   => DI::l10n()->t('Please repeat your e-mail address:'),
 			'$ask_password' => $ask_password,

src/Navigation/Notifications/Repository/Notify.php

@@ -476,7 +476,7 @@ class Notify extends BaseRepository
 							'[url='.$params['source_link'].']'.$params['source_name'].'[/url]'
 						);
 
-						$body = $l10n->t("Full Name:	%s\nSite Location:	%s\nLogin Name:	%s (%s)",
+						$body = $l10n->t("Display Name:	%s\nSite Location:	%s\nLogin Name:	%s (%s)",
 							$params['source_name'],
 							$siteurl, $params['source_mail'],
 							$params['source_nick']
@@ -497,7 +497,7 @@ class Notify extends BaseRepository
 							'[url='.$params['source_link'].']'.$params['source_name'].'[/url]'
 						);
 
-						$body = $l10n->t("Full Name:	%s\nSite Location:	%s\nLogin Name:	%s (%s)",
+						$body = $l10n->t("Display Name:	%s\nSite Location:	%s\nLogin Name:	%s (%s)",
 							$params['source_name'],
 							$siteurl, $params['source_mail'],
 							$params['source_nick']

static/settings.config.php

@@ -161,7 +161,7 @@ return [
 		'min_memory' => 0,
 
 		// no_regfullname (Boolean)
-		// Allow pseudonyms (true) or enforce a space between first name and last name in Full name, as an anti spam measure (false).
+		// Allow users to register with a display name comporting fewer than two parts separated by spaces.
 		'no_regfullname' => true,
 
 		// no_oembed_rich_content (Boolean)