Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FIX Change "login" to "log in" when used as a verb #122

Merged
merged 1 commit into from
Oct 9, 2023
Merged

FIX Change "login" to "log in" when used as a verb #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lang/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ en:
ASSERTLOGINBUTTON: 'Share your details with {orgname}'
AUTHENTICATOR_NAME: 'RealMe Account'
LOGINBUTTON: Login
LOGINBUTTON2: Log in
SilverStripe\RealMe\Authenticator\LoginHandler:
LOGINFAILURE: 'Unfortunately we''re not able to log you in through RealMe right now. Please try again shortly.'
SilverStripe\RealMe\Authenticator\MiniLoginForm:
Expand Down
4 changes: 2 additions & 2 deletions src/Authenticator/LoginForm.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,13 +202,13 @@ protected function getFormActions()
} else {
// Login button
$loginButtonContent = ArrayData::create(array(
'Label' => _t(self::class . '.LOGINBUTTON', 'Login'),
'Label' => _t(self::class . '.LOGINBUTTON2', 'Log in'),
'ShowNewWindowIcon' => true
))->renderWith(self::class . '/RealMeLoginButton');
}

return FieldList::create(array(
FormAction::create('doLogin', _t(self::class . '.LOGINBUTTON', 'Login'))
FormAction::create('doLogin', _t(self::class . '.LOGINBUTTON2', 'Log in'))
->setUseButtonTag(true)
->setButtonContent($loginButtonContent)
->setAttribute('class', 'realme_button')
Expand Down
4 changes: 2 additions & 2 deletions templates/SilverStripe/RealMe/Authenticator/LoginForm.ss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ or directly in your css, e.g. .realme_popup {width: 450px}
<% end_if %>

<div class="realme_widget realme_primary_login realme_theme_{$RealMeWidgetTheme}">
<h2 class="realme_title">Login with <span class="realme_title_brand">RealMe</span></h2>
<h2 class="realme_title">Log in with <span class="realme_title_brand">RealMe</span></h2>

<p class="realme_info">
To access the $ServiceName1, you need a RealMe login. If you've used a RealMe login somewhere else, you can use
it here too. If you don't already have a username and password, just select Login and choose to create one.
it here too. If you don't already have a username and password, just select "Log in" and choose to create one.
</p>

<div class="realme_login_lockup">
Expand Down
4 changes: 2 additions & 2 deletions templates/SilverStripe/RealMe/Authenticator/LoginForm_secondary.ss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ or directly in your css, e.g. .realme_popup {width: 450px}

"--%>
<div class="realme_widget realme_secondary_login realme_theme_dark no_touch" style="z-index: 1;">
<a href="{$BaseHref}Security/login#RealMeLoginForm_LoginForm" class="realme_login realme_pipe">Login <span class="realme_icon_link"></span></a>
<a href="{$BaseHref}Security/login#RealMeLoginForm_LoginForm" class="realme_login realme_pipe">Log in <span class="realme_icon_link"></span></a>
<a href="https://www.account.realme.govt.nz/account/" class="realme_create_account realme_pipe">Create <span class="realme_icon_link"></span></a>
<div class="realme_popup_position">
<a id="popup_trigger" href="http://www.realme.govt.nz" target="_blank" class="realme_link whats_realme">?</a>
<div class="realme_popup_wrapper realme_arrow_top_left">
<!-- realme_popup -->
<div class="realme_popup">
<h2 class="realme_popup_title">To login to this service you now need a RealMe account.</h2>
<h2 class="realme_popup_title">To log in to this service you now need a RealMe account.</h2>
<p><b>RealMe</b> is a service from the New Zealand government and New Zealand Post that includes a single login, letting you use one username and password to access a wide range of services online.</p>
<p>But there is much more to <b>RealMe</b> than just the convenience of a single login.</p>
<h2 class="realme_popup_title">Get Verified</h2>
Expand Down
2 changes: 1 addition & 1 deletion templates/SilverStripe/RealMe/Authenticator/MiniLoginForm.ss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class='realme_widget realme_secondary_login realme_theme_light'>
<a href='$RealMeMiniLoginLink' class='realme_login realme_pipe'>Login <span class='realme_icon_link'></span></a>
<a href='$RealMeMiniLoginLink' class='realme_login realme_pipe'>Log in <span class='realme_icon_link'></span></a>
<div class='realme_popup_position'>
<a id='popup_trigger' href='http://www.realme.govt.nz' target='_blank' class='link realme_link whats_realme'>?</a>

Expand Down