Skip to content

Commit

Permalink
login -> log in (verb)
Browse files Browse the repository at this point in the history
  • Loading branch information
FlorisFokkinga committed Oct 11, 2024
1 parent 341b326 commit 7be0ee9
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion dashboard-gui/src/javascripts/components/header.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class Header extends React.Component {
<div className="meta">
{currentUser.guest && (
<a className="login" href="/login" onClick={e => login(e)}>
Login
Log in
</a>
)}
{!currentUser.guest && this.renderDropDownToggle()}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class PolicyDetailHelpEn extends React.Component {
<h1>How to create Policies?</h1>

<p>
Access policies define when a user is allowed to login to an application based on the user attributes provided by
Access policies define when a user is allowed to log in to an application based on the user attributes provided by
the Institution and other attribute providers.
</p>

Expand Down
8 changes: 4 additions & 4 deletions dashboard-gui/src/javascripts/locale/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ I18n.translations.en = {
you: 'You',
profile: 'Profile',
switch_idp: 'Switch IDP',
loginRequired: 'Please login for more information',
loginRequired: 'Please log in for more information',
super_user_switch: 'Switch identity',
welcome_txt:
'Here you will find all the applications connected to SURFconext. Log in for information tailored to your institution.',
Expand Down Expand Up @@ -706,7 +706,7 @@ I18n.translations.en = {
not_found: {
title: 'OOPS, I currently can’t show you that page.',
subTitle: 'This can be due to, and may be fixed by:',
reasonLoginPre: 'You’re trying to access a page where you need to login for. Please press ',
reasonLoginPre: 'You’re trying to access a page where you need to log in for. Please press ',
reasonLoginPost: ' and see if that takes you to the page you tried to access.',
reasonHelp:
'You don’t have the right authorisation to access that URL. Please check the <a href="https://wiki.surfnet.nl/display/surfconextdev/SURFconext+IdP+dashboard+-+help+page" target="_blank" rel="noopener noreferrer">Help pages</a> to see who should be able to access what.',
Expand Down Expand Up @@ -958,7 +958,7 @@ I18n.translations.en = {
create_policy: 'Create new authorization policy',
deny: 'Deny',
deny_info:
'Deny policies are less common to use. If the attributes in the policy match those of the person trying to login then this will result in a Deny. No match will result in a Permit.',
'Deny policies are less common to use. If the attributes in the policy match those of the person trying to log in then this will result in a Deny. No match will result in a Permit.',
deny_message: 'English message',
deny_message_info: 'This is the message displayed to the user if access is denied based on this policy.',
deny_message_nl: 'Dutch message',
Expand All @@ -978,7 +978,7 @@ I18n.translations.en = {
rule: 'Rule',
rules: 'Rules',
rule_and: 'AND',
rule_and_info: 'Policies with a logical AND rule enforce that all attributes defined must match those of the person trying to login.',
rule_and_info: 'Policies with a logical AND rule enforce that all attributes defined must match those of the person trying to log in.',
rule_info_add: ' Note that attribute values with the same attribute name always be evaluated with the logical OR.',
rule_info_add_2:
'Note that a Deny access authorization policy always and implicitly uses the logical AND for different attribute names.',
Expand Down
2 changes: 1 addition & 1 deletion dashboard-gui/src/javascripts/locale/nl.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ I18n.translations.nl = {
you: 'Jij',
profile: 'Profiel',
switch_idp: 'Kies IDP',
loginRequired: 'Login voor meer informatie',
loginRequired: 'Log in voor meer informatie',
super_user_switch: 'Switch identiteit',
welcome_txt:
'Je vindt hier alle op SURFconext aangesloten applicaties. Log in voor informatie toegesneden op jouw instelling.',
Expand Down
4 changes: 2 additions & 2 deletions dashboard-gui/src/javascripts/locale/pt.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ I18n.translations.pt = {
you: 'Você',
profile: 'Perfil',
switch_idp: 'Escolher outro IDP',
loginRequired: 'Please login for more information',
loginRequired: 'Please log in for more information',
super_user_switch: 'Trocar Identidade',
welcome_txt:
"Bem-vindo ao painel SURFconext. Nesta página, você vê quais serviços estão conectados ao SURFconext: se sua instituição permitir, você poderá acessar esses serviços usando sua conta institucional. Se você fizer login neste painel (canto superior direito), mostraremos os dados personalizados para sua instituição. Mais informações sobre este painel? Clique em 'Ajuda' no canto superior direito da tela.",
Expand Down Expand Up @@ -661,7 +661,7 @@ I18n.translations.pt = {
not_found: {
title: 'OOPS, I currently can’t show you that page.',
subTitle: 'This can be due to, and may be fixed by:',
reasonLoginPre: 'You’re trying to access a page where you need to login for. Please press ',
reasonLoginPre: 'You’re trying to access a page where you need to log in for. Please press ',
reasonLoginPost: ' and see if that takes you to the page you tried to access.',
reasonHelp:
'You don’t have the right authorisation to access that URL. Please check the Help pages <a href="https://edu.nl/p4um4" target="_blank" rel="noopener noreferrer">Help</a> to see who should be able to access what.',
Expand Down
2 changes: 1 addition & 1 deletion dashboard-gui/src/javascripts/pages/not_found.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class NotFound extends React.Component {
{currentUser.guest && (
<li>
<span>{I18n.t('not_found.reasonLoginPre')}</span>
<a href="/login" onClick={e => login(e)}>Login</a>
<a href="/login" onClick={e => login(e)}>Log in</a>
<span>{I18n.t('not_found.reasonLoginPost')}</span>
</li>
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public List<Object> loginTimeFrame(@RequestParam("from") long from,
return stats.loginTimeFrame(from, to, scale, spEntityId);
}

//Used for retrieval of all logins for all SP's
//Used for retrieval of all logins for all SPs
@GetMapping("loginAggregated")
public List<Object> loginAggregated(@RequestParam("period") String period,
@RequestParam(value = "spEntityId", required = false) Optional<String> spEntityId) {
Expand Down

0 comments on commit 7be0ee9

Please sign in to comment.