From bdeb0aab4f67f08bce0c8cffc2f833478dd65f26 Mon Sep 17 00:00:00 2001 From: Guy Marriott Date: Mon, 29 Jun 2020 12:09:10 -0700 Subject: [PATCH 1/5] Merge pull request #9565 from tom890180/check_items_exist --- .../GridField/GridFieldDetailForm_ItemRequest.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php b/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php index 3e35bcfeb..1f204fe90 100644 --- a/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php +++ b/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php @@ -452,8 +452,10 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler if ($toplevelController->hasMethod('Backlink')) { $backlink = $toplevelController->Backlink(); } elseif ($this->popupController->hasMethod('Breadcrumbs')) { - $parents = $this->popupController->Breadcrumbs(false)->items; - $backlink = array_pop($parents)->Link; + $parents = $this->popupController->Breadcrumbs(false); + if ($parents && $parents = $parents->items) { + $backlink = array_pop($parents)->Link; + } } } if (!$backlink) { @@ -774,6 +776,10 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler /** @var ArrayList $items */ $items = $this->popupController->Breadcrumbs($unlinked); + if (!$items) { + $items = new ArrayList(); + } + if ($this->record && $this->record->ID) { $title = ($this->record->Title) ? $this->record->Title : "#{$this->record->ID}"; $items->push(new ArrayData([ From 44fae4497b3f141721ec144cded938cbfd081bea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Kiste?= Date: Tue, 30 Mar 2021 13:19:55 +1300 Subject: [PATCH 2/5] Better describe the 'keep me signed in' checkbox --- lang/bg.yml | 2 -- lang/cs.yml | 1 - lang/da.yml | 2 -- lang/de.yml | 2 -- lang/en.yml | 3 +-- lang/eo.yml | 2 -- lang/es.yml | 1 - lang/fa_IR.yml | 1 - lang/fi.yml | 2 -- lang/fi_FI.yml | 2 -- lang/fr.yml | 2 -- lang/it.yml | 2 -- lang/nl.yml | 2 -- lang/pl.yml | 2 -- lang/ru.yml | 2 -- lang/sk.yml | 1 - lang/sl.yml | 2 -- lang/sl_SI.yml | 1 - lang/sv.yml | 2 -- src/Security/MemberAuthenticator/CMSMemberLoginForm.php | 7 ++----- src/Security/MemberAuthenticator/MemberLoginForm.php | 7 ++----- 21 files changed, 5 insertions(+), 43 deletions(-) diff --git a/lang/bg.yml b/lang/bg.yml index 2baddd055..baf9866d9 100644 --- a/lang/bg.yml +++ b/lang/bg.yml @@ -217,7 +217,6 @@ bg: ERRORWRONGCRED: 'Детайлите не са коректни. Моля, опитайте отново.' FIRSTNAME: Име INTERFACELANG: Език - KEEPMESIGNEDIN: 'Нека да остана логнат' LOGGEDINAS: 'Вие сте влезли като {name}.' NEWPASSWORD: 'Нова парола' PASSWORD: Парола @@ -226,7 +225,6 @@ bg: PLURALS: one: Потребител other: '{count} потребителя' - REMEMBERME: 'Запомни ме следващия път? (за {count} ден/дни на това устройство)' SINGULARNAME: Потребител SUBJECTPASSWORDCHANGED: 'Вашата парола беше променена' SUBJECTPASSWORDRESET: 'Връзка за анулиране на паролата' diff --git a/lang/cs.yml b/lang/cs.yml index f844c3f6e..554c8ecc4 100644 --- a/lang/cs.yml +++ b/lang/cs.yml @@ -134,7 +134,6 @@ cs: ERRORWRONGCRED: 'Poskytnuté detaily vypadají být nesprávné. Prosím zkuste to znovu.' FIRSTNAME: 'Křestní jméno' INTERFACELANG: 'Jazyk rozhraní' - KEEPMESIGNEDIN: 'Drž mě přihlášeného' LOGGEDINAS: 'Jste přihlášen/a jako {name}.' NEWPASSWORD: 'Nové heslo' PASSWORD: Heslo diff --git a/lang/da.yml b/lang/da.yml index ae420557f..11f2530f5 100644 --- a/lang/da.yml +++ b/lang/da.yml @@ -220,7 +220,6 @@ da: ERRORWRONGCRED: 'De indtastede værdier ser ikke ud til at være korrekte. Forsøg venligst igen.' FIRSTNAME: Fornavn INTERFACELANG: 'Sprog i brugerfladen' - KEEPMESIGNEDIN: 'Hold mig logget ind' LOGGEDINAS: 'Du er logget ind som {name}.' NEWPASSWORD: 'Nyt kodeord' PASSWORD: Kodeord @@ -229,7 +228,6 @@ da: PLURALS: one: 'En bruger' other: '{count} brugere' - REMEMBERME: 'Husk mig til næste gang? (i {count} dage på denne enhed)' SINGULARNAME: Bruger SUBJECTPASSWORDCHANGED: 'Dit kodeord er blevet ændret' SUBJECTPASSWORDRESET: 'Link til at nulstille dit kodeord' diff --git a/lang/de.yml b/lang/de.yml index 77274e801..645454246 100644 --- a/lang/de.yml +++ b/lang/de.yml @@ -258,7 +258,6 @@ de: ERRORWRONGCRED: 'Ihre Eingaben scheinen nicht richtig zu sein. Bitte versuchen Sie es erneut.' FIRSTNAME: Vorname INTERFACELANG: CMS-Sprache - KEEPMESIGNEDIN: 'Eingeloggt bleiben' LOGGEDINAS: 'Sie sind als {name} eingeloggt.' NEWPASSWORD: 'Neues Passwort' PASSWORD: Passwort @@ -267,7 +266,6 @@ de: PLURALS: one: 'Ein Mitglied' other: '{count} Mitglieder' - REMEMBERME: 'Für das nächste Mal merken? (für {count} Tage auf diesem Gerät)' SINGULARNAME: Benutzer SUBJECTPASSWORDCHANGED: 'Ihr Passwort wurde geändert' SUBJECTPASSWORDRESET: 'Ihr Link zur Passwortrücksetzung' diff --git a/lang/en.yml b/lang/en.yml index f03d3ab86..287c993c5 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -266,7 +266,7 @@ en: ERRORWRONGCRED: 'The provided details don''t seem to be correct. Please try again.' FIRSTNAME: 'First Name' INTERFACELANG: 'Interface Language' - KEEPMESIGNEDIN: 'Keep me signed in' + KEEPMESIGNEDIN: 'Remember me for {count} days' LOGGEDINAS: 'You''re logged in as {name}.' NEWPASSWORD: 'New Password' PASSWORD: Password @@ -275,7 +275,6 @@ en: PLURALS: one: 'A Member' other: '{count} Members' - REMEMBERME: 'Remember me next time? (for {count} days on this device)' SINGULARNAME: Member SUBJECTPASSWORDCHANGED: 'Your password has been changed' SUBJECTPASSWORDRESET: 'Your password reset link' diff --git a/lang/eo.yml b/lang/eo.yml index 97dff767a..93e4b203f 100644 --- a/lang/eo.yml +++ b/lang/eo.yml @@ -264,7 +264,6 @@ eo: ERRORWRONGCRED: 'La donitaj detaloj ŝajnas malĝustaj. Bonvole reprovu.' FIRSTNAME: Antaŭnomo INTERFACELANG: 'Interfaca Lingvo' - KEEPMESIGNEDIN: 'Konservi mian ensaluton' LOGGEDINAS: 'Vi ensalutis kiel {name}.' NEWPASSWORD: 'Novan pasvorton' PASSWORD: Pasvorto @@ -273,7 +272,6 @@ eo: PLURALS: one: 'Unu membro' other: '{count} membroj' - REMEMBERME: 'Memoru min je la sekva fojo? (por {count} tagoj ĉe ĉi tiu aparato)' SINGULARNAME: Membro SUBJECTPASSWORDCHANGED: 'Via pasvorto estas ŝanĝita' SUBJECTPASSWORDRESET: 'Via pasvorto reagordis ligilon' diff --git a/lang/es.yml b/lang/es.yml index 0a3ee0108..4e2e4b510 100644 --- a/lang/es.yml +++ b/lang/es.yml @@ -168,7 +168,6 @@ es: ERRORWRONGCRED: 'Los detalles provistos no parecen estar correctos. Por favor intentar nuevamente.' FIRSTNAME: Nombre(s) INTERFACELANG: 'Idioma de la Interfaz' - KEEPMESIGNEDIN: 'Manténme conectado' LOGGEDINAS: 'Estás conectado como {name}.' NEWPASSWORD: 'Nueva Contraseña' PASSWORD: Contraseña diff --git a/lang/fa_IR.yml b/lang/fa_IR.yml index d4257ec5c..493209314 100644 --- a/lang/fa_IR.yml +++ b/lang/fa_IR.yml @@ -123,7 +123,6 @@ fa_IR: ERRORPASSWORDNOTMATCH: 'گذرواژه کنونی همانند نیست، لطفاً مجدداً تلاش نمایید' FIRSTNAME: نام INTERFACELANG: 'زبان برنامه' - KEEPMESIGNEDIN: 'مرا واردشده نگه‌دار' LOGGEDINAS: 'شما به {name} عنوان وارد شده‌اید.' NEWPASSWORD: 'گذرواژه تازه' PASSWORD: گذرواژه diff --git a/lang/fi.yml b/lang/fi.yml index 431672ba1..b4651df17 100644 --- a/lang/fi.yml +++ b/lang/fi.yml @@ -232,7 +232,6 @@ fi: ERRORWRONGCRED: 'Antamasi tiedot eivät näytä oikeilta. Yritä uudelleen.' FIRSTNAME: Etunimi INTERFACELANG: 'Käyttöliittymän kieli' - KEEPMESIGNEDIN: 'Pidä minut kirjautuneena' LOGGEDINAS: 'Olet kirjautuneena nimellä {name}.' NEWPASSWORD: 'Uusi salasana' PASSWORD: Salasana @@ -241,7 +240,6 @@ fi: PLURALS: one: Käyttäjä other: '{count} Käyttäjää' - REMEMBERME: 'Muista minut? ({days} päivän ajan tällä koneella)' SINGULARNAME: Käyttäjä SUBJECTPASSWORDCHANGED: 'Salasanasi on vaihdettu' SUBJECTPASSWORDRESET: 'Salasanasi palautuslinkki' diff --git a/lang/fi_FI.yml b/lang/fi_FI.yml index 737b310d5..29ea719bc 100644 --- a/lang/fi_FI.yml +++ b/lang/fi_FI.yml @@ -258,7 +258,6 @@ fi_FI: ERRORWRONGCRED: 'Antamasi tiedot eivät näytä oikeilta. Yritä uudelleen.' FIRSTNAME: Etunimi INTERFACELANG: 'Käyttöliittymän kieli' - KEEPMESIGNEDIN: 'Pidä minut kirjautuneena' LOGGEDINAS: 'Olet kirjautuneena nimellä {name}.' NEWPASSWORD: 'Uusi salasana' PASSWORD: Salasana @@ -267,7 +266,6 @@ fi_FI: PLURALS: one: Käyttäjä other: '{count} Käyttäjää' - REMEMBERME: 'Muista minut? ({days} päivän ajan tällä koneella)' SINGULARNAME: Käyttäjä SUBJECTPASSWORDCHANGED: 'Salasanasi on vaihdettu' SUBJECTPASSWORDRESET: 'Salasanasi palautuslinkki' diff --git a/lang/fr.yml b/lang/fr.yml index 70fe5ed56..8a87ed38f 100644 --- a/lang/fr.yml +++ b/lang/fr.yml @@ -220,7 +220,6 @@ fr: ERRORWRONGCRED: 'Il semble que ce ne soit pas le bon email ou mot de passe. Merci de réessayer.' FIRSTNAME: Prénom INTERFACELANG: 'Langue de l''interface' - KEEPMESIGNEDIN: 'Se souvenir de moi' LOGGEDINAS: 'Vous êtes connecté en tant que {name}.' NEWPASSWORD: 'Nouveau mot de passe' PASSWORD: 'Mot de passe' @@ -229,7 +228,6 @@ fr: PLURALS: one: 'Un membre' other: '{count} membres' - REMEMBERME: 'Se souvenir de moi la prochaine fois ? (pour une durée de {count} jours sur cet appareil)' SINGULARNAME: Membre SUBJECTPASSWORDCHANGED: 'Votre mot de passe a été changé' SUBJECTPASSWORDRESET: 'Lien pour modifier votre mot de passe' diff --git a/lang/it.yml b/lang/it.yml index 5bcb6acd4..600cadb04 100644 --- a/lang/it.yml +++ b/lang/it.yml @@ -224,7 +224,6 @@ it: ERRORWRONGCRED: 'I dettagli forniti non sembrano corretti. Per favore riprovare.' FIRSTNAME: Nome INTERFACELANG: 'Lingua dell''interfaccia' - KEEPMESIGNEDIN: 'Resta autenticato' LOGGEDINAS: 'Sei collegato come {name}.' NEWPASSWORD: 'Nuova password' PASSWORD: Password @@ -233,7 +232,6 @@ it: PLURALS: one: 'Un Utente' other: '{count} Utenti' - REMEMBERME: 'Ricordati di me la prossima volta? (per {count} giorni su questo dispositivo)' SINGULARNAME: Utente SUBJECTPASSWORDCHANGED: 'La tua password è stata cambiata' SUBJECTPASSWORDRESET: 'Link per azzerare la tua password' diff --git a/lang/nl.yml b/lang/nl.yml index 4a69de8cf..a8e767f8d 100644 --- a/lang/nl.yml +++ b/lang/nl.yml @@ -264,7 +264,6 @@ nl: ERRORWRONGCRED: 'De ingevulde gegevens lijken niet correct. Probeer het nog een keer.' FIRSTNAME: Voornaam INTERFACELANG: 'Interface taal' - KEEPMESIGNEDIN: 'Houd mij ingelogd' LOGGEDINAS: 'U bent ingelogd als {name}.' NEWPASSWORD: 'Nieuw wachtwoord' PASSWORD: Wachtwoord @@ -273,7 +272,6 @@ nl: PLURALS: one: 'Een lid' other: '{count} leden' - REMEMBERME: 'Onthoud mij voor volgende keer? (voor {count} dagen op dit apparaat)' SINGULARNAME: Lid SUBJECTPASSWORDCHANGED: 'Uw wachtwoord is veranderd' SUBJECTPASSWORDRESET: 'Link om uw wachtwoord opnieuw aan te maken' diff --git a/lang/pl.yml b/lang/pl.yml index 710d0acbe..219f2274d 100644 --- a/lang/pl.yml +++ b/lang/pl.yml @@ -264,7 +264,6 @@ pl: ERRORWRONGCRED: 'Podane dane są niepoprawne. Proszę spróbować ponownie.' FIRSTNAME: Imię INTERFACELANG: 'Język interfejsu' - KEEPMESIGNEDIN: 'Zapamiętaj mnie' LOGGEDINAS: 'Zostałeś zalogowany jako {name}.' NEWPASSWORD: 'Nowe hasło' PASSWORD: Hasło @@ -275,7 +274,6 @@ pl: few: '{count} użytkowników' many: '{count} użytkowników' other: '{count} użytkowników' - REMEMBERME: 'Pamiętaj mnie następnym razem? (przez {count} dni na tym urządzeniu)' SINGULARNAME: Użytkownik SUBJECTPASSWORDCHANGED: 'Twoje hasło zostało zmienione' SUBJECTPASSWORDRESET: 'Twój link do zmiany hasła' diff --git a/lang/ru.yml b/lang/ru.yml index e9d798144..529551a36 100644 --- a/lang/ru.yml +++ b/lang/ru.yml @@ -233,7 +233,6 @@ ru: ERRORWRONGCRED: 'Похоже, что указанные данные не верны. Пожалуйста, повторите попытку позже.' FIRSTNAME: Имя INTERFACELANG: 'Язык интерфейса' - KEEPMESIGNEDIN: 'Запомните меня' LOGGEDINAS: 'Вы вошли в систему как {name}.' NEWPASSWORD: 'Новый пароль' PASSWORD: Пароль @@ -244,7 +243,6 @@ ru: few: '{count} участника' many: '{count} участников' other: '{count} участников' - REMEMBERME: 'Запомнить меня? (на {count} дней на этом устройстве)' SINGULARNAME: Пользователь SUBJECTPASSWORDCHANGED: 'Ваш пароль изменен' SUBJECTPASSWORDRESET: 'Ссылка для переустановки пароля' diff --git a/lang/sk.yml b/lang/sk.yml index f3ea4897d..4b1879540 100644 --- a/lang/sk.yml +++ b/lang/sk.yml @@ -166,7 +166,6 @@ sk: ERRORWRONGCRED: 'Poskytnuté detaily vyzerajú byť nesprávne. Prosím skúste opäť.' FIRSTNAME: Meno INTERFACELANG: 'Jazyk rozhrania' - KEEPMESIGNEDIN: 'Držať ma prihláseného' LOGGEDINAS: 'Ste prihlásený/á ako {name}.' NEWPASSWORD: 'Nové heslo' PASSWORD: Heslo diff --git a/lang/sl.yml b/lang/sl.yml index bbb72990e..61f855c07 100644 --- a/lang/sl.yml +++ b/lang/sl.yml @@ -282,7 +282,6 @@ sl: ERRORWRONGCRED: 'Izgleda, da podani podatki niso točni. Poskusite ponovno' FIRSTNAME: Ime INTERFACELANG: Jezik - KEEPMESIGNEDIN: 'Ohranjaj prijavo' LOGGEDINAS: 'Vpisan(a) si kot: {name}.' NEWPASSWORD: 'Novo geslo' PASSWORD: Geslo @@ -293,7 +292,6 @@ sl: two: '{count} uporabnika' few: '{count} uporabnikov' other: '{count} uporabnikov' - REMEMBERME: 'Ohranjaj prijavo na tej napravi naslednjih {count} dni.' SINGULARNAME: Uporabnik SUBJECTPASSWORDCHANGED: 'Geslo je bilo spremenjeno' SUBJECTPASSWORDRESET: 'Povezava za resetiranje vašega gesla' diff --git a/lang/sl_SI.yml b/lang/sl_SI.yml index bddbd27bc..00918ea61 100644 --- a/lang/sl_SI.yml +++ b/lang/sl_SI.yml @@ -53,7 +53,6 @@ sl_SI: EDIT_PASSWORD: 'Novo geslo' EMAIL: E-pošta FIRSTNAME: Ime - KEEPMESIGNEDIN: 'Zapomni si me prijavljenega' LOGGEDINAS: 'Prijavljeni ste kot {name}.' NEWPASSWORD: 'Novo geslo' PASSWORD: Geslo diff --git a/lang/sv.yml b/lang/sv.yml index 922bc36ae..9da66f8ce 100644 --- a/lang/sv.yml +++ b/lang/sv.yml @@ -216,7 +216,6 @@ sv: ERRORWRONGCRED: 'Antingen e-postadressen eller lösenordet är fel. Försök igen.' FIRSTNAME: Förnamn INTERFACELANG: Gränssnittsspråk - KEEPMESIGNEDIN: 'Håll mig inloggad' LOGGEDINAS: 'Du är inloggad som {name}.' NEWPASSWORD: 'Nytt lösenord' PASSWORD: Lösenord @@ -225,7 +224,6 @@ sv: PLURALS: one: 'En medlem' other: '{count} medlemmar' - REMEMBERME: 'Kom ihåg mig nästa gång? (i {count} dagar på denna enhet)' SINGULARNAME: Medlem SUBJECTPASSWORDCHANGED: 'Ditt lösenord har ändrats' SUBJECTPASSWORDRESET: 'Din återställningslänk' diff --git a/src/Security/MemberAuthenticator/CMSMemberLoginForm.php b/src/Security/MemberAuthenticator/CMSMemberLoginForm.php index 361677931..a304d6970 100644 --- a/src/Security/MemberAuthenticator/CMSMemberLoginForm.php +++ b/src/Security/MemberAuthenticator/CMSMemberLoginForm.php @@ -58,12 +58,9 @@ class CMSMemberLoginForm extends MemberLoginForm 'Password', CheckboxField::create( "Remember", - _t('SilverStripe\\Security\\Member.KEEPMESIGNEDIN', "Keep me signed in") - )->setAttribute( - 'title', _t( - 'SilverStripe\\Security\\Member.REMEMBERME', - "Remember me next time? (for {count} days on this device)", + 'SilverStripe\\Security\\Member.KEEPMESIGNEDIN', + "Remember me for {count} days", [ 'count' => RememberLoginHash::config()->uninherited('token_expiry_days') ] ) ) diff --git a/src/Security/MemberAuthenticator/MemberLoginForm.php b/src/Security/MemberAuthenticator/MemberLoginForm.php index 8465689eb..eb6318a65 100644 --- a/src/Security/MemberAuthenticator/MemberLoginForm.php +++ b/src/Security/MemberAuthenticator/MemberLoginForm.php @@ -153,12 +153,9 @@ class MemberLoginForm extends BaseLoginForm $fields->push( CheckboxField::create( "Remember", - _t('SilverStripe\\Security\\Member.KEEPMESIGNEDIN', "Keep me signed in") - )->setAttribute( - 'title', _t( - 'SilverStripe\\Security\\Member.REMEMBERME', - "Remember me next time? (for {count} days on this device)", + 'SilverStripe\\Security\\Member.KEEPMESIGNEDIN', + "Remember me for {count} days", [ 'count' => RememberLoginHash::config()->uninherited('token_expiry_days') ] ) ) From 8692aabe9b0bf391b580218a6771d354c17e969e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Kiste?= Date: Thu, 8 Apr 2021 12:32:12 +1200 Subject: [PATCH 3/5] Use new designs --- lang/en.yml | 1 + src/Security/MemberAuthenticator/CMSMemberLoginForm.php | 9 +++++++++ src/Security/MemberAuthenticator/MemberLoginForm.php | 9 +++++++++ 3 files changed, 19 insertions(+) diff --git a/lang/en.yml b/lang/en.yml index 287c993c5..1185753ef 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -267,6 +267,7 @@ en: FIRSTNAME: 'First Name' INTERFACELANG: 'Interface Language' KEEPMESIGNEDIN: 'Remember me for {count} days' + KEEP_ME_SIGNED_IN_TOOLTIP: 'You will remain authenticated on this device for {count} days. Only use this feature if you trust the device you are using. Authenticated devices can be managed in your profile.' LOGGEDINAS: 'You''re logged in as {name}.' NEWPASSWORD: 'New Password' PASSWORD: Password diff --git a/src/Security/MemberAuthenticator/CMSMemberLoginForm.php b/src/Security/MemberAuthenticator/CMSMemberLoginForm.php index a304d6970..bcfd3deea 100644 --- a/src/Security/MemberAuthenticator/CMSMemberLoginForm.php +++ b/src/Security/MemberAuthenticator/CMSMemberLoginForm.php @@ -64,6 +64,15 @@ class CMSMemberLoginForm extends MemberLoginForm [ 'count' => RememberLoginHash::config()->uninherited('token_expiry_days') ] ) ) + ->setAttribute('data-toggle', 'tooltip') + ->setAttribute( + 'title', + _t( + 'SilverStripe\\Security\\Member.KEEP_ME_SIGNED_IN_TOOLTIP', + 'You will remain authenticated on this device for {count} days. Only use this feature if you trust the device you are using. Authenticated devices can be managed in your profile.', + ['count' => RememberLoginHash::config()->uninherited('token_expiry_days')] + ) + ) ); } diff --git a/src/Security/MemberAuthenticator/MemberLoginForm.php b/src/Security/MemberAuthenticator/MemberLoginForm.php index eb6318a65..406631769 100644 --- a/src/Security/MemberAuthenticator/MemberLoginForm.php +++ b/src/Security/MemberAuthenticator/MemberLoginForm.php @@ -159,6 +159,15 @@ class MemberLoginForm extends BaseLoginForm [ 'count' => RememberLoginHash::config()->uninherited('token_expiry_days') ] ) ) + ->setAttribute('data-toggle', 'tooltip') + ->setAttribute( + 'title', + _t( + 'SilverStripe\\Security\\Member.KEEP_ME_SIGNED_IN_TOOLTIP', + 'You will remain authenticated on this device for {count} days. Only use this feature if you trust the device you are using. Authenticated devices can be managed in your profile.', + ['count' => RememberLoginHash::config()->uninherited('token_expiry_days')] + ) + ) ); } From bbcc187c025d42d24e7dc00f81da96c666bfde42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Kiste?= Date: Mon, 12 Apr 2021 11:42:57 +1200 Subject: [PATCH 4/5] Update conflicting translations. Revert removal of translations. --- lang/bg.yml | 2 ++ lang/cs.yml | 1 + lang/da.yml | 2 ++ lang/de.yml | 2 ++ lang/en.yml | 3 ++- lang/eo.yml | 2 ++ lang/es.yml | 1 + lang/fa_IR.yml | 1 + lang/fi.yml | 2 ++ lang/fi_FI.yml | 2 ++ lang/fr.yml | 2 ++ lang/it.yml | 2 ++ lang/nl.yml | 2 ++ lang/pl.yml | 2 ++ lang/ru.yml | 2 ++ lang/sk.yml | 1 + lang/sl.yml | 2 ++ lang/sl_SI.yml | 1 + lang/sv.yml | 2 ++ src/Security/MemberAuthenticator/CMSMemberLoginForm.php | 2 +- src/Security/MemberAuthenticator/MemberLoginForm.php | 2 +- 21 files changed, 35 insertions(+), 3 deletions(-) diff --git a/lang/bg.yml b/lang/bg.yml index baf9866d9..2baddd055 100644 --- a/lang/bg.yml +++ b/lang/bg.yml @@ -217,6 +217,7 @@ bg: ERRORWRONGCRED: 'Детайлите не са коректни. Моля, опитайте отново.' FIRSTNAME: Име INTERFACELANG: Език + KEEPMESIGNEDIN: 'Нека да остана логнат' LOGGEDINAS: 'Вие сте влезли като {name}.' NEWPASSWORD: 'Нова парола' PASSWORD: Парола @@ -225,6 +226,7 @@ bg: PLURALS: one: Потребител other: '{count} потребителя' + REMEMBERME: 'Запомни ме следващия път? (за {count} ден/дни на това устройство)' SINGULARNAME: Потребител SUBJECTPASSWORDCHANGED: 'Вашата парола беше променена' SUBJECTPASSWORDRESET: 'Връзка за анулиране на паролата' diff --git a/lang/cs.yml b/lang/cs.yml index 554c8ecc4..f844c3f6e 100644 --- a/lang/cs.yml +++ b/lang/cs.yml @@ -134,6 +134,7 @@ cs: ERRORWRONGCRED: 'Poskytnuté detaily vypadají být nesprávné. Prosím zkuste to znovu.' FIRSTNAME: 'Křestní jméno' INTERFACELANG: 'Jazyk rozhraní' + KEEPMESIGNEDIN: 'Drž mě přihlášeného' LOGGEDINAS: 'Jste přihlášen/a jako {name}.' NEWPASSWORD: 'Nové heslo' PASSWORD: Heslo diff --git a/lang/da.yml b/lang/da.yml index 11f2530f5..ae420557f 100644 --- a/lang/da.yml +++ b/lang/da.yml @@ -220,6 +220,7 @@ da: ERRORWRONGCRED: 'De indtastede værdier ser ikke ud til at være korrekte. Forsøg venligst igen.' FIRSTNAME: Fornavn INTERFACELANG: 'Sprog i brugerfladen' + KEEPMESIGNEDIN: 'Hold mig logget ind' LOGGEDINAS: 'Du er logget ind som {name}.' NEWPASSWORD: 'Nyt kodeord' PASSWORD: Kodeord @@ -228,6 +229,7 @@ da: PLURALS: one: 'En bruger' other: '{count} brugere' + REMEMBERME: 'Husk mig til næste gang? (i {count} dage på denne enhed)' SINGULARNAME: Bruger SUBJECTPASSWORDCHANGED: 'Dit kodeord er blevet ændret' SUBJECTPASSWORDRESET: 'Link til at nulstille dit kodeord' diff --git a/lang/de.yml b/lang/de.yml index 645454246..77274e801 100644 --- a/lang/de.yml +++ b/lang/de.yml @@ -258,6 +258,7 @@ de: ERRORWRONGCRED: 'Ihre Eingaben scheinen nicht richtig zu sein. Bitte versuchen Sie es erneut.' FIRSTNAME: Vorname INTERFACELANG: CMS-Sprache + KEEPMESIGNEDIN: 'Eingeloggt bleiben' LOGGEDINAS: 'Sie sind als {name} eingeloggt.' NEWPASSWORD: 'Neues Passwort' PASSWORD: Passwort @@ -266,6 +267,7 @@ de: PLURALS: one: 'Ein Mitglied' other: '{count} Mitglieder' + REMEMBERME: 'Für das nächste Mal merken? (für {count} Tage auf diesem Gerät)' SINGULARNAME: Benutzer SUBJECTPASSWORDCHANGED: 'Ihr Passwort wurde geändert' SUBJECTPASSWORDRESET: 'Ihr Link zur Passwortrücksetzung' diff --git a/lang/en.yml b/lang/en.yml index 1185753ef..6b1bd193b 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -266,7 +266,8 @@ en: ERRORWRONGCRED: 'The provided details don''t seem to be correct. Please try again.' FIRSTNAME: 'First Name' INTERFACELANG: 'Interface Language' - KEEPMESIGNEDIN: 'Remember me for {count} days' + KEEPMESIGNEDIN: 'Keep me signed in' + REMEMBER_ME: 'Remember me for {count} days' KEEP_ME_SIGNED_IN_TOOLTIP: 'You will remain authenticated on this device for {count} days. Only use this feature if you trust the device you are using. Authenticated devices can be managed in your profile.' LOGGEDINAS: 'You''re logged in as {name}.' NEWPASSWORD: 'New Password' diff --git a/lang/eo.yml b/lang/eo.yml index 93e4b203f..97dff767a 100644 --- a/lang/eo.yml +++ b/lang/eo.yml @@ -264,6 +264,7 @@ eo: ERRORWRONGCRED: 'La donitaj detaloj ŝajnas malĝustaj. Bonvole reprovu.' FIRSTNAME: Antaŭnomo INTERFACELANG: 'Interfaca Lingvo' + KEEPMESIGNEDIN: 'Konservi mian ensaluton' LOGGEDINAS: 'Vi ensalutis kiel {name}.' NEWPASSWORD: 'Novan pasvorton' PASSWORD: Pasvorto @@ -272,6 +273,7 @@ eo: PLURALS: one: 'Unu membro' other: '{count} membroj' + REMEMBERME: 'Memoru min je la sekva fojo? (por {count} tagoj ĉe ĉi tiu aparato)' SINGULARNAME: Membro SUBJECTPASSWORDCHANGED: 'Via pasvorto estas ŝanĝita' SUBJECTPASSWORDRESET: 'Via pasvorto reagordis ligilon' diff --git a/lang/es.yml b/lang/es.yml index 4e2e4b510..0a3ee0108 100644 --- a/lang/es.yml +++ b/lang/es.yml @@ -168,6 +168,7 @@ es: ERRORWRONGCRED: 'Los detalles provistos no parecen estar correctos. Por favor intentar nuevamente.' FIRSTNAME: Nombre(s) INTERFACELANG: 'Idioma de la Interfaz' + KEEPMESIGNEDIN: 'Manténme conectado' LOGGEDINAS: 'Estás conectado como {name}.' NEWPASSWORD: 'Nueva Contraseña' PASSWORD: Contraseña diff --git a/lang/fa_IR.yml b/lang/fa_IR.yml index 493209314..d4257ec5c 100644 --- a/lang/fa_IR.yml +++ b/lang/fa_IR.yml @@ -123,6 +123,7 @@ fa_IR: ERRORPASSWORDNOTMATCH: 'گذرواژه کنونی همانند نیست، لطفاً مجدداً تلاش نمایید' FIRSTNAME: نام INTERFACELANG: 'زبان برنامه' + KEEPMESIGNEDIN: 'مرا واردشده نگه‌دار' LOGGEDINAS: 'شما به {name} عنوان وارد شده‌اید.' NEWPASSWORD: 'گذرواژه تازه' PASSWORD: گذرواژه diff --git a/lang/fi.yml b/lang/fi.yml index b4651df17..431672ba1 100644 --- a/lang/fi.yml +++ b/lang/fi.yml @@ -232,6 +232,7 @@ fi: ERRORWRONGCRED: 'Antamasi tiedot eivät näytä oikeilta. Yritä uudelleen.' FIRSTNAME: Etunimi INTERFACELANG: 'Käyttöliittymän kieli' + KEEPMESIGNEDIN: 'Pidä minut kirjautuneena' LOGGEDINAS: 'Olet kirjautuneena nimellä {name}.' NEWPASSWORD: 'Uusi salasana' PASSWORD: Salasana @@ -240,6 +241,7 @@ fi: PLURALS: one: Käyttäjä other: '{count} Käyttäjää' + REMEMBERME: 'Muista minut? ({days} päivän ajan tällä koneella)' SINGULARNAME: Käyttäjä SUBJECTPASSWORDCHANGED: 'Salasanasi on vaihdettu' SUBJECTPASSWORDRESET: 'Salasanasi palautuslinkki' diff --git a/lang/fi_FI.yml b/lang/fi_FI.yml index 29ea719bc..737b310d5 100644 --- a/lang/fi_FI.yml +++ b/lang/fi_FI.yml @@ -258,6 +258,7 @@ fi_FI: ERRORWRONGCRED: 'Antamasi tiedot eivät näytä oikeilta. Yritä uudelleen.' FIRSTNAME: Etunimi INTERFACELANG: 'Käyttöliittymän kieli' + KEEPMESIGNEDIN: 'Pidä minut kirjautuneena' LOGGEDINAS: 'Olet kirjautuneena nimellä {name}.' NEWPASSWORD: 'Uusi salasana' PASSWORD: Salasana @@ -266,6 +267,7 @@ fi_FI: PLURALS: one: Käyttäjä other: '{count} Käyttäjää' + REMEMBERME: 'Muista minut? ({days} päivän ajan tällä koneella)' SINGULARNAME: Käyttäjä SUBJECTPASSWORDCHANGED: 'Salasanasi on vaihdettu' SUBJECTPASSWORDRESET: 'Salasanasi palautuslinkki' diff --git a/lang/fr.yml b/lang/fr.yml index 8a87ed38f..70fe5ed56 100644 --- a/lang/fr.yml +++ b/lang/fr.yml @@ -220,6 +220,7 @@ fr: ERRORWRONGCRED: 'Il semble que ce ne soit pas le bon email ou mot de passe. Merci de réessayer.' FIRSTNAME: Prénom INTERFACELANG: 'Langue de l''interface' + KEEPMESIGNEDIN: 'Se souvenir de moi' LOGGEDINAS: 'Vous êtes connecté en tant que {name}.' NEWPASSWORD: 'Nouveau mot de passe' PASSWORD: 'Mot de passe' @@ -228,6 +229,7 @@ fr: PLURALS: one: 'Un membre' other: '{count} membres' + REMEMBERME: 'Se souvenir de moi la prochaine fois ? (pour une durée de {count} jours sur cet appareil)' SINGULARNAME: Membre SUBJECTPASSWORDCHANGED: 'Votre mot de passe a été changé' SUBJECTPASSWORDRESET: 'Lien pour modifier votre mot de passe' diff --git a/lang/it.yml b/lang/it.yml index 600cadb04..5bcb6acd4 100644 --- a/lang/it.yml +++ b/lang/it.yml @@ -224,6 +224,7 @@ it: ERRORWRONGCRED: 'I dettagli forniti non sembrano corretti. Per favore riprovare.' FIRSTNAME: Nome INTERFACELANG: 'Lingua dell''interfaccia' + KEEPMESIGNEDIN: 'Resta autenticato' LOGGEDINAS: 'Sei collegato come {name}.' NEWPASSWORD: 'Nuova password' PASSWORD: Password @@ -232,6 +233,7 @@ it: PLURALS: one: 'Un Utente' other: '{count} Utenti' + REMEMBERME: 'Ricordati di me la prossima volta? (per {count} giorni su questo dispositivo)' SINGULARNAME: Utente SUBJECTPASSWORDCHANGED: 'La tua password è stata cambiata' SUBJECTPASSWORDRESET: 'Link per azzerare la tua password' diff --git a/lang/nl.yml b/lang/nl.yml index a8e767f8d..4a69de8cf 100644 --- a/lang/nl.yml +++ b/lang/nl.yml @@ -264,6 +264,7 @@ nl: ERRORWRONGCRED: 'De ingevulde gegevens lijken niet correct. Probeer het nog een keer.' FIRSTNAME: Voornaam INTERFACELANG: 'Interface taal' + KEEPMESIGNEDIN: 'Houd mij ingelogd' LOGGEDINAS: 'U bent ingelogd als {name}.' NEWPASSWORD: 'Nieuw wachtwoord' PASSWORD: Wachtwoord @@ -272,6 +273,7 @@ nl: PLURALS: one: 'Een lid' other: '{count} leden' + REMEMBERME: 'Onthoud mij voor volgende keer? (voor {count} dagen op dit apparaat)' SINGULARNAME: Lid SUBJECTPASSWORDCHANGED: 'Uw wachtwoord is veranderd' SUBJECTPASSWORDRESET: 'Link om uw wachtwoord opnieuw aan te maken' diff --git a/lang/pl.yml b/lang/pl.yml index 219f2274d..710d0acbe 100644 --- a/lang/pl.yml +++ b/lang/pl.yml @@ -264,6 +264,7 @@ pl: ERRORWRONGCRED: 'Podane dane są niepoprawne. Proszę spróbować ponownie.' FIRSTNAME: Imię INTERFACELANG: 'Język interfejsu' + KEEPMESIGNEDIN: 'Zapamiętaj mnie' LOGGEDINAS: 'Zostałeś zalogowany jako {name}.' NEWPASSWORD: 'Nowe hasło' PASSWORD: Hasło @@ -274,6 +275,7 @@ pl: few: '{count} użytkowników' many: '{count} użytkowników' other: '{count} użytkowników' + REMEMBERME: 'Pamiętaj mnie następnym razem? (przez {count} dni na tym urządzeniu)' SINGULARNAME: Użytkownik SUBJECTPASSWORDCHANGED: 'Twoje hasło zostało zmienione' SUBJECTPASSWORDRESET: 'Twój link do zmiany hasła' diff --git a/lang/ru.yml b/lang/ru.yml index 529551a36..e9d798144 100644 --- a/lang/ru.yml +++ b/lang/ru.yml @@ -233,6 +233,7 @@ ru: ERRORWRONGCRED: 'Похоже, что указанные данные не верны. Пожалуйста, повторите попытку позже.' FIRSTNAME: Имя INTERFACELANG: 'Язык интерфейса' + KEEPMESIGNEDIN: 'Запомните меня' LOGGEDINAS: 'Вы вошли в систему как {name}.' NEWPASSWORD: 'Новый пароль' PASSWORD: Пароль @@ -243,6 +244,7 @@ ru: few: '{count} участника' many: '{count} участников' other: '{count} участников' + REMEMBERME: 'Запомнить меня? (на {count} дней на этом устройстве)' SINGULARNAME: Пользователь SUBJECTPASSWORDCHANGED: 'Ваш пароль изменен' SUBJECTPASSWORDRESET: 'Ссылка для переустановки пароля' diff --git a/lang/sk.yml b/lang/sk.yml index 4b1879540..f3ea4897d 100644 --- a/lang/sk.yml +++ b/lang/sk.yml @@ -166,6 +166,7 @@ sk: ERRORWRONGCRED: 'Poskytnuté detaily vyzerajú byť nesprávne. Prosím skúste opäť.' FIRSTNAME: Meno INTERFACELANG: 'Jazyk rozhrania' + KEEPMESIGNEDIN: 'Držať ma prihláseného' LOGGEDINAS: 'Ste prihlásený/á ako {name}.' NEWPASSWORD: 'Nové heslo' PASSWORD: Heslo diff --git a/lang/sl.yml b/lang/sl.yml index 61f855c07..bbb72990e 100644 --- a/lang/sl.yml +++ b/lang/sl.yml @@ -282,6 +282,7 @@ sl: ERRORWRONGCRED: 'Izgleda, da podani podatki niso točni. Poskusite ponovno' FIRSTNAME: Ime INTERFACELANG: Jezik + KEEPMESIGNEDIN: 'Ohranjaj prijavo' LOGGEDINAS: 'Vpisan(a) si kot: {name}.' NEWPASSWORD: 'Novo geslo' PASSWORD: Geslo @@ -292,6 +293,7 @@ sl: two: '{count} uporabnika' few: '{count} uporabnikov' other: '{count} uporabnikov' + REMEMBERME: 'Ohranjaj prijavo na tej napravi naslednjih {count} dni.' SINGULARNAME: Uporabnik SUBJECTPASSWORDCHANGED: 'Geslo je bilo spremenjeno' SUBJECTPASSWORDRESET: 'Povezava za resetiranje vašega gesla' diff --git a/lang/sl_SI.yml b/lang/sl_SI.yml index 00918ea61..bddbd27bc 100644 --- a/lang/sl_SI.yml +++ b/lang/sl_SI.yml @@ -53,6 +53,7 @@ sl_SI: EDIT_PASSWORD: 'Novo geslo' EMAIL: E-pošta FIRSTNAME: Ime + KEEPMESIGNEDIN: 'Zapomni si me prijavljenega' LOGGEDINAS: 'Prijavljeni ste kot {name}.' NEWPASSWORD: 'Novo geslo' PASSWORD: Geslo diff --git a/lang/sv.yml b/lang/sv.yml index 9da66f8ce..922bc36ae 100644 --- a/lang/sv.yml +++ b/lang/sv.yml @@ -216,6 +216,7 @@ sv: ERRORWRONGCRED: 'Antingen e-postadressen eller lösenordet är fel. Försök igen.' FIRSTNAME: Förnamn INTERFACELANG: Gränssnittsspråk + KEEPMESIGNEDIN: 'Håll mig inloggad' LOGGEDINAS: 'Du är inloggad som {name}.' NEWPASSWORD: 'Nytt lösenord' PASSWORD: Lösenord @@ -224,6 +225,7 @@ sv: PLURALS: one: 'En medlem' other: '{count} medlemmar' + REMEMBERME: 'Kom ihåg mig nästa gång? (i {count} dagar på denna enhet)' SINGULARNAME: Medlem SUBJECTPASSWORDCHANGED: 'Ditt lösenord har ändrats' SUBJECTPASSWORDRESET: 'Din återställningslänk' diff --git a/src/Security/MemberAuthenticator/CMSMemberLoginForm.php b/src/Security/MemberAuthenticator/CMSMemberLoginForm.php index bcfd3deea..0a45bbc53 100644 --- a/src/Security/MemberAuthenticator/CMSMemberLoginForm.php +++ b/src/Security/MemberAuthenticator/CMSMemberLoginForm.php @@ -59,7 +59,7 @@ class CMSMemberLoginForm extends MemberLoginForm CheckboxField::create( "Remember", _t( - 'SilverStripe\\Security\\Member.KEEPMESIGNEDIN', + 'SilverStripe\\Security\\Member.REMEMBER_ME', "Remember me for {count} days", [ 'count' => RememberLoginHash::config()->uninherited('token_expiry_days') ] ) diff --git a/src/Security/MemberAuthenticator/MemberLoginForm.php b/src/Security/MemberAuthenticator/MemberLoginForm.php index 406631769..0af431850 100644 --- a/src/Security/MemberAuthenticator/MemberLoginForm.php +++ b/src/Security/MemberAuthenticator/MemberLoginForm.php @@ -154,7 +154,7 @@ class MemberLoginForm extends BaseLoginForm CheckboxField::create( "Remember", _t( - 'SilverStripe\\Security\\Member.KEEPMESIGNEDIN', + 'SilverStripe\\Security\\Member.REMEMBER_ME', "Remember me for {count} days", [ 'count' => RememberLoginHash::config()->uninherited('token_expiry_days') ] ) From e2777ded8e7800550c6e0c89e3c0782eca678cfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Kiste?= Date: Tue, 13 Apr 2021 15:33:49 +1200 Subject: [PATCH 5/5] =?UTF-8?q?=E2=80=A2=20Add=20missing=20string=20?= =?UTF-8?q?=E2=80=A2=20Move=20attribute=20to=20login-forms?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lang/en.yml | 1 + src/Security/MemberAuthenticator/CMSMemberLoginForm.php | 1 - src/Security/MemberAuthenticator/MemberLoginForm.php | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lang/en.yml b/lang/en.yml index 6b1bd193b..ab75bf9ba 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -277,6 +277,7 @@ en: PLURALS: one: 'A Member' other: '{count} Members' + REMEMBERME: 'Remember me next time? (for {count} days on this device)' SINGULARNAME: Member SUBJECTPASSWORDCHANGED: 'Your password has been changed' SUBJECTPASSWORDRESET: 'Your password reset link' diff --git a/src/Security/MemberAuthenticator/CMSMemberLoginForm.php b/src/Security/MemberAuthenticator/CMSMemberLoginForm.php index 0a45bbc53..24bdda81c 100644 --- a/src/Security/MemberAuthenticator/CMSMemberLoginForm.php +++ b/src/Security/MemberAuthenticator/CMSMemberLoginForm.php @@ -64,7 +64,6 @@ class CMSMemberLoginForm extends MemberLoginForm [ 'count' => RememberLoginHash::config()->uninherited('token_expiry_days') ] ) ) - ->setAttribute('data-toggle', 'tooltip') ->setAttribute( 'title', _t( diff --git a/src/Security/MemberAuthenticator/MemberLoginForm.php b/src/Security/MemberAuthenticator/MemberLoginForm.php index 0af431850..3b299dc64 100644 --- a/src/Security/MemberAuthenticator/MemberLoginForm.php +++ b/src/Security/MemberAuthenticator/MemberLoginForm.php @@ -159,7 +159,6 @@ class MemberLoginForm extends BaseLoginForm [ 'count' => RememberLoginHash::config()->uninherited('token_expiry_days') ] ) ) - ->setAttribute('data-toggle', 'tooltip') ->setAttribute( 'title', _t(