diff --git a/dashboard-gui/src/javascripts/components/header.jsx b/dashboard-gui/src/javascripts/components/header.jsx index c2238f4f7..4a357e733 100644 --- a/dashboard-gui/src/javascripts/components/header.jsx +++ b/dashboard-gui/src/javascripts/components/header.jsx @@ -62,7 +62,7 @@ class Header extends React.Component {
{currentUser.guest && ( login(e)}> - Login + Log in )} {!currentUser.guest && this.renderDropDownToggle()} diff --git a/dashboard-gui/src/javascripts/help/policy_detail_help_en.jsx b/dashboard-gui/src/javascripts/help/policy_detail_help_en.jsx index c338d63fd..c6e0a4459 100644 --- a/dashboard-gui/src/javascripts/help/policy_detail_help_en.jsx +++ b/dashboard-gui/src/javascripts/help/policy_detail_help_en.jsx @@ -8,7 +8,7 @@ class PolicyDetailHelpEn extends React.Component {

How to create Policies?

- 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.

diff --git a/dashboard-gui/src/javascripts/locale/en.js b/dashboard-gui/src/javascripts/locale/en.js index 64159f9f3..3c3891fe3 100644 --- a/dashboard-gui/src/javascripts/locale/en.js +++ b/dashboard-gui/src/javascripts/locale/en.js @@ -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.', @@ -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 Help pages to see who should be able to access what.', @@ -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', @@ -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.', diff --git a/dashboard-gui/src/javascripts/locale/nl.js b/dashboard-gui/src/javascripts/locale/nl.js index 737e728a3..b3e0aa3aa 100644 --- a/dashboard-gui/src/javascripts/locale/nl.js +++ b/dashboard-gui/src/javascripts/locale/nl.js @@ -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.', diff --git a/dashboard-gui/src/javascripts/locale/pt.js b/dashboard-gui/src/javascripts/locale/pt.js index f9ea0ab15..680348d63 100644 --- a/dashboard-gui/src/javascripts/locale/pt.js +++ b/dashboard-gui/src/javascripts/locale/pt.js @@ -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.", @@ -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 Help to see who should be able to access what.', diff --git a/dashboard-gui/src/javascripts/pages/not_found.jsx b/dashboard-gui/src/javascripts/pages/not_found.jsx index 55ebb80d1..b71454abe 100644 --- a/dashboard-gui/src/javascripts/pages/not_found.jsx +++ b/dashboard-gui/src/javascripts/pages/not_found.jsx @@ -17,7 +17,7 @@ class NotFound extends React.Component { {currentUser.guest && (
  • {I18n.t('not_found.reasonLoginPre')} - login(e)}>Login + login(e)}>Log in {I18n.t('not_found.reasonLoginPost')}
    • )} diff --git a/dashboard-server/src/main/java/dashboard/control/StatsController.java b/dashboard-server/src/main/java/dashboard/control/StatsController.java index 8fcc3b4b0..8571c9c3d 100644 --- a/dashboard-server/src/main/java/dashboard/control/StatsController.java +++ b/dashboard-server/src/main/java/dashboard/control/StatsController.java @@ -43,7 +43,7 @@ public List 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 loginAggregated(@RequestParam("period") String period, @RequestParam(value = "spEntityId", required = false) Optional spEntityId) {