diff --git a/lang/de.yml b/lang/de.yml index c3d1f6975..c6e197974 100644 --- a/lang/de.yml +++ b/lang/de.yml @@ -288,6 +288,8 @@ de: db_LockedOutUntil: 'Gesperrt bis' db_Password: Passwort db_PasswordExpiry: 'Ablaufdatum des Passworts' + KEEP_ME_SIGNED_IN: '{count} Tage lang angemeldet bleiben' + KEEP_ME_SIGNED_IN_TOOLTIP: 'Sie bleiben auf diesem Gerät für {count} Tage angemeldet. Verwenden Sie diese Funktion nur, wenn Sie dem von Ihnen verwendeten Gerät vertrauen.' SilverStripe\Security\MemberAuthenticator\CMSMemberLoginForm: AUTHENTICATORNAME: 'CMS Benutzer Login Formular' BUTTONFORGOTPASSWORD: 'Passwort vergessen' diff --git a/lang/en.yml b/lang/en.yml index 7fb0e9ab6..7edee6a42 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -217,7 +217,6 @@ en: GROUPNAME: 'Group name' GroupReminder: 'If you choose a parent group, this group will take all it''s roles' HierarchyPermsError: 'Can''t assign parent group "{group}" with privileged permissions (requires ADMIN access)' - ValidationIdentifierAlreadyExists: 'A Group ({group}) already exists with the same {identifier}' Locked: 'Locked?' MEMBERS: Members NEWGROUP: 'New Group' @@ -233,6 +232,7 @@ en: RolesAddEditLink: 'Manage roles' SINGULARNAME: Group Sort: 'Sort Order' + ValidationIdentifierAlreadyExists: 'A Group ({group}) already exists with the same {identifier}' has_many_Permissions: Permissions many_many_Members: Members SilverStripe\Security\LoginAttempt: diff --git a/lang/it.yml b/lang/it.yml index 8598cc839..111d04835 100644 --- a/lang/it.yml +++ b/lang/it.yml @@ -72,7 +72,7 @@ it: VALIDATOR: Valiidatore VALIDCURRENCY: 'Inserisci una valuta valida' SilverStripe\Forms\FormField: - EXAMPLE: 'e.g. {format}' + EXAMPLE: 'p. es. {format}' NONE: nessuno SilverStripe\Forms\FormScaffolder: TABMAIN: Principale diff --git a/lang/nl.yml b/lang/nl.yml index 8844dbd53..31d6452c1 100644 --- a/lang/nl.yml +++ b/lang/nl.yml @@ -288,6 +288,8 @@ nl: db_LockedOutUntil: 'Gesloten tot' db_Password: Wachtwoord db_PasswordExpiry: 'Wachtwoord vervaldatum' + KEEP_ME_SIGNED_IN: 'Ingelogd blijven gedurende {count} dagen' + KEEP_ME_SIGNED_IN_TOOLTIP: 'Onthoud gedurende {count} dagen de inloggegevens op dit apparaat. Gebruik dit alleen op vertrouwde apparaten.' SilverStripe\Security\MemberAuthenticator\CMSMemberLoginForm: AUTHENTICATORNAME: Inlogformulier BUTTONFORGOTPASSWORD: 'Wachtwoord vergeten' @@ -345,8 +347,8 @@ nl: PLURALNAME: 'Versleutelde logins' PLURALS: one: 'Een versleutelde login' - other: '{count} versleutelde logins' - SINGULARNAME: 'Versleutelde login' + other: '{count} loginsleutels' + SINGULARNAME: Loginsleutel SilverStripe\Security\Security: ALREADYLOGGEDIN: 'U hebt geen toegang tot deze pagina. Als u een andere account met de nodige rechten hebt, kan u hieronder opnieuw inloggen.' BUTTONSEND: 'Nieuw wachtwoord aanmaken' @@ -355,7 +357,7 @@ nl: CONFIRMLOGOUT: 'Klik op onderstaande knop om uit te loggen.' ENTERNEWPASSWORD: 'Voer een nieuw wachtwoord in.' ERRORPASSWORDPERMISSION: 'U moet ingelogd zijn om uw wachtwoord te kunnen veranderen!' - LOGIN: 'Meld aan' + LOGIN: Inloggen LOGOUT: Uitloggen LOSTPASSWORDHEADER: 'Wachtwoord vergeten' NOTEPAGESECURED: 'Deze pagina is beveiligd. Voer uw gegevens in en u wordt automatisch doorgestuurd.' diff --git a/lang/sl.yml b/lang/sl.yml index 7960ac879..77b0d418c 100644 --- a/lang/sl.yml +++ b/lang/sl.yml @@ -308,6 +308,8 @@ sl: db_LockedOutUntil: 'Zaklenjeno do' db_Password: Geslo db_PasswordExpiry: 'Datum poteka veljavnosti gesla' + KEEP_ME_SIGNED_IN: 'Ohranjaj prijavo naslednjih ({count}) dni.' + KEEP_ME_SIGNED_IN_TOOLTIP: 'V tem brskalniku boste ostali prijavljeni naslednjih ({count}) dni. Uporabite to možnost samo, če uporabljate brskalnik, v katerem je to varno.' SilverStripe\Security\MemberAuthenticator\CMSMemberLoginForm: AUTHENTICATORNAME: 'Obrazec za prijavo v sistem' BUTTONFORGOTPASSWORD: 'Ne poznam gesla' diff --git a/src/Core/TempFolder.php b/src/Core/TempFolder.php index 6ca00a48d..11a41c660 100644 --- a/src/Core/TempFolder.php +++ b/src/Core/TempFolder.php @@ -39,7 +39,7 @@ class TempFolder $user = ''; if (function_exists('posix_getpwuid') && function_exists('posix_getuid')) { $userDetails = posix_getpwuid(posix_getuid()); - $user = $userDetails['name']; + $user = $userDetails['name'] ?? false; } if (!$user) { $user = Environment::getEnv('APACHE_RUN_USER');