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

Merge branch '4.11' into 4

Browse Source
This commit is contained in:
Guy Sartorelli 2022-05-11 12:07:46 +12:00
commit b64ad664bb
6 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lang/de.yml
View File

@ -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'

2
lang/en.yml
View File

@ -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:

2
lang/it.yml
View File

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

8
lang/nl.yml
View File

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

2
lang/sl.yml
View File

@ -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'

2
src/Core/TempFolder.php
View File

@ -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');