tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

FIX Capitalisation fixes in welcome back message (#9439)

Browse Source
This commit is contained in:
Robbie Averill 2020-03-22 19:54:30 -07:00 committed by GitHub
parent 88660e6435
commit 5002f514b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/en/02_Developer_Guides/01_Templates/02_Common_Variables.md
View File

@ -54,7 +54,7 @@ Returns the currently logged in [Member](api:SilverStripe\Security\Member) insta
```ss ```ss
<% if $CurrentMember %> <% if $CurrentMember %>
Welcome Back, $CurrentMember.FirstName Welcome back, $CurrentMember.FirstName
<% end_if %> <% end_if %>
``` ```

2
docs/en/02_Developer_Guides/06_Testing/How_Tos/01_Write_a_FunctionalTest.md
View File

@ -44,7 +44,7 @@ class HomePageTest extends FunctionalTest
$page = $this->get('home/'); $page = $this->get('home/');
$this->assertExactHTMLMatchBySelector("#Welcome", [ $this->assertExactHTMLMatchBySelector("#Welcome", [
'Welcome Back' 'Welcome back'
]); ]);
} }
} }

2
lang/en.yml
View File

@ -276,7 +276,7 @@ en:
SURNAME: Surname SURNAME: Surname
VALIDATIONADMINLOSTACCESS: 'Cannot remove all admin groups from your profile' VALIDATIONADMINLOSTACCESS: 'Cannot remove all admin groups from your profile'
ValidationIdentifierFailed: 'Can''t overwrite existing member #{id} with identical identifier ({name} = {value}))' ValidationIdentifierFailed: 'Can''t overwrite existing member #{id} with identical identifier ({name} = {value}))'
WELCOMEBACK: 'Welcome Back, {firstname}' WELCOMEBACK: 'Welcome back, {firstname}'
YOUROLDPASSWORD: 'Your old password' YOUROLDPASSWORD: 'Your old password'
belongs_many_many_Groups: Groups belongs_many_many_Groups: Groups
db_Locale: 'Interface Locale' db_Locale: 'Interface Locale'

2
src/Security/MemberAuthenticator/LoginHandler.php
View File

@ -201,7 +201,7 @@ class LoginHandler extends RequestHandler
// Welcome message // Welcome message
$message = _t( $message = _t(
'SilverStripe\\Security\\Member.WELCOMEBACK', 'SilverStripe\\Security\\Member.WELCOMEBACK',
'Welcome Back, {firstname}', 'Welcome back, {firstname}',
['firstname' => $member->FirstName] ['firstname' => $member->FirstName]
); );
Security::singleton()->setSessionMessage($message, ValidationResult::TYPE_GOOD); Security::singleton()->setSessionMessage($message, ValidationResult::TYPE_GOOD);