From b7b1aba3fbc56a87c95beefb50051f4d40e00443 Mon Sep 17 00:00:00 2001 From: Daniel Hensby Date: Fri, 26 Feb 2016 14:45:07 +0000 Subject: [PATCH 1/4] FIX undeclared constant issue --- core/Constants.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/Constants.php b/core/Constants.php index a7e1b92aa..b166c629c 100644 --- a/core/Constants.php +++ b/core/Constants.php @@ -185,7 +185,7 @@ if(!isset($_SERVER['HTTP_HOST'])) { if (TRUSTED_PROXY && !empty($_SERVER[$trustedProxyHeader])) { // Get the first host, in case there's multiple separated through commas - $_SERVER['HTTP_HOST'] = strtok($_SERVER[SS_TRUSTED_PROXY_HOST_HEADER], ','); + $_SERVER['HTTP_HOST'] = strtok($_SERVER[$trustedProxyHeader], ','); } } From 80a6242912cf48f3efc7db68bab8d898a6af3e2a Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Sat, 27 Feb 2016 20:38:29 +1300 Subject: [PATCH 2/4] Update translations --- lang/cs.yml | 6 +++++- lang/it.yml | 15 +++++++++++++++ lang/lt.yml | 1 - lang/sk.yml | 1 - 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/lang/cs.yml b/lang/cs.yml index 9d5cdfa03..6b0139ef9 100644 --- a/lang/cs.yml +++ b/lang/cs.yml @@ -301,6 +301,8 @@ cs: FROMWEB: 'Z webu' FindInFolder: 'Hledat ve složce' IMAGEALT: 'Alternativní text (alt)' + IMAGEALTTEXT: 'Alternativní text (alt) - bude ukázán, když obrázek nemúže být zobrazen' + IMAGEALTTEXTDESC: 'Zobrazeno na obrazovce, když obrázek nemůže být zobrazen' IMAGEDIMENSIONS: Rozměry IMAGEHEIGHTPX: Výška IMAGETITLE: 'Titul text (tooltip) - další informace o obrázku' @@ -334,11 +336,13 @@ cs: LeftAndMain: CANT_REORGANISE: 'Nemáte oprávnění měnit stránky nejvyšší úrovně. Vaše změna nebyla uložena.' DELETED: Smazáno. - DropdownBatchActionsDefault: Akce + DropdownBatchActionsDefault: 'Vyberte akci...' HELP: Nápověda + PAGETYPE: 'Typ stránky' PERMAGAIN: 'Byli jste odhlášeni z CMS. Pokud se chcete znovu přihlásit, zadejte níže své uživatelské jméno a heslo.' PERMALREADY: 'Omlouvám se, ale nemůžete vstoupit do této části CMS. Pokud se chcete přihlásit jako někdo jiný, udělejte tak níže.' PERMDEFAULT: 'Musíte být přihlášen/a k přístup do oblasti administrace, níže zadejte vaše přihlašovací údaje, prosím.' + PLEASESAVE: 'Prosím uložte stránku: Tato stránka nemohla být aktualizována, protože ještě nebyla uložena.' PreviewButton: Náhled REORGANISATIONSUCCESSFUL: 'Strom webu reorganizován úspěšně.' SAVEDUP: Uloženo. diff --git a/lang/it.yml b/lang/it.yml index 4ead4226b..e10283e12 100644 --- a/lang/it.yml +++ b/lang/it.yml @@ -1,5 +1,6 @@ it: AssetAdmin: + HIDEALLOWEDEXTS: 'Nascondi estensioni permesse' NEWFOLDER: NuovaCartella SHOWALLOWEDEXTS: 'Mostra le estensioni consentite' AssetTableField: @@ -7,12 +8,14 @@ it: DIM: Dimensioni FILENAME: Nome del file FOLDER: Cartella + HEIGHT: Altezza LASTEDIT: 'Ultima modifica' OWNER: Proprietario SIZE: 'Dimensione' TITLE: Titolo TYPE: 'Tipo di file' URL: URL + WIDTH: Larghezza AssetUploadField: ChooseFiles: 'Scegli file' DRAGFILESHERE: 'Trascina file qui' @@ -23,7 +26,10 @@ it: FILES: Files FROMCOMPUTER: 'Scegli file dal tuo computer' FROMCOMPUTERINFO: 'Carica dal tuo conputer' + INSERTURL: 'Inserisci da URL' + REMOVEINFO: 'Rimuovi questo file da questo campo' TOTAL: Totale + TOUPLOAD: 'Scegli file da caricare...' UPLOADINPROGRESS: 'Attendere prego... caricamento in corso' UPLOADOR: O BBCodeParser: @@ -76,6 +82,8 @@ it: PASSWORDEXPIRED: '

La tua password è scaduta. Per favore selezionarne una nuova.

' CMSPageHistoryController_versions_ss: PREVIEW: 'Preview del sito' + CMSPagesController_Tools_ss: + FILTER: Filtro CMSProfileController: MENUTITLE: 'Il mio Profilo' CMSSecurity: @@ -104,6 +112,7 @@ it: MAXIMUM: 'La password deve essere lunga almeno {max} caratteri.' SHOWONCLICKTITLE: 'Cambia password' ContentController: + DRAFT_SITE_ACCESS_RESTRICTION: 'Devi loggarti con la tua password per vedere la bozza o il contenuto archiviato. Premi qui per tornare indietro al sito pubblicato.' NOTLOGGEDIN: 'Non autenticato' CreditCardField: FIRST: primo @@ -143,6 +152,7 @@ it: INVALID_REQUEST: 'Richiesta non valida' DropdownField: CHOOSE: (Scegli) + CHOOSESEARCH: '(Scegli o Cerca)' SOURCE_VALIDATION: 'Per favore selezionare un valore tra quelli forniti. {value} non è un''opzione valida' EmailField: VALIDATION: 'Inserisci un indirizzo e-mail' @@ -295,6 +305,7 @@ it: IMAGETITLETEXT: 'Titolo (tooltip)' IMAGETITLETEXTDESC: 'Per informazioni addizionali sull''immagine' IMAGEWIDTHPX: Larghezza + INSERTMEDIA: 'Inserisci Media' LINK: 'Inserisci Link' LINKANCHOR: 'Ancora su questa pagina' LINKDESCR: 'Descrizione del link' @@ -307,7 +318,11 @@ it: PAGE: Pagina SUBJECT: 'Oggetto email' URL: URL + URLDESCRIPTION: 'Inserisci video e immagini dal Web nella tua pagina semplicemente inserendo l''URL del file. + + Si sicuro di avere i diritti o i permessi prima di condividere media direttamente dal Web.

NB : i file non sono aggiunti allo storage file del CMS, ma incorpora il file dalla sua location principale, se per un qualsiasi motivo il file non e'' più raggiungibile nella sua location principale, non sara'' più visibile su questa pagina.' URLNOTANOEMBEDRESOURCE: 'L''URL ''{url}'' non può essere convertito in una risorsa media.' + UpdateMEDIA: 'Aggiorna Media' Image: PLURALNAME: Files SINGULARNAME: File diff --git a/lang/lt.yml b/lang/lt.yml index 82e108d93..2a06f3eb5 100644 --- a/lang/lt.yml +++ b/lang/lt.yml @@ -334,7 +334,6 @@ lt: LeftAndMain: CANT_REORGANISE: 'Jūs neturite leidimo keisti aukščiausio lygio puslapių. Jūsų pakeitimai neišsaugoti.' DELETED: Ištrinta. - DropdownBatchActionsDefault: Veiksmai HELP: Pagalba PERMAGAIN: 'Jūs atsijungėte. Norėdami vėl prisijungti, įveskite savo duomenis į žemiau esančius laukelius.' PERMALREADY: 'Deja, bet Jūs negalite patekti į šią TVS dalį. Jeigu norite prisijungti kitu vartotoju, tai atlikite žemiau.' diff --git a/lang/sk.yml b/lang/sk.yml index a44465826..52bba5a82 100644 --- a/lang/sk.yml +++ b/lang/sk.yml @@ -334,7 +334,6 @@ sk: LeftAndMain: CANT_REORGANISE: 'Nemáte oprávnenie meniť stránky najvyššej úrovne. Vaša zmena nebola uložená.' DELETED: Zmazané. - DropdownBatchActionsDefault: Akcie HELP: Pomoc PERMAGAIN: 'Boli ste odhlásený' PERMALREADY: 'Je nám ľúto, ale k tejto časti CMS nemáte prístup . Ak sa chcete prihlásiť ako niekto iný, urobte tak nižšie.' From 3d2c87029c636e391b39b8b7be2b2f65f4ddd30c Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Sat, 27 Feb 2016 20:58:38 +1300 Subject: [PATCH 3/4] Added 3.3.1-rc2 changelog --- docs/en/04_Changelogs/rc/3.3.1-rc2.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 docs/en/04_Changelogs/rc/3.3.1-rc2.md diff --git a/docs/en/04_Changelogs/rc/3.3.1-rc2.md b/docs/en/04_Changelogs/rc/3.3.1-rc2.md new file mode 100644 index 000000000..851fd2009 --- /dev/null +++ b/docs/en/04_Changelogs/rc/3.3.1-rc2.md @@ -0,0 +1,5 @@ +# 3.3.1-rc2 + + + +## Change Log From 807377ad2dba641594793d3a7ddaf3696ccf3c68 Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Sat, 27 Feb 2016 21:02:09 +1300 Subject: [PATCH 4/4] Added 3.3.1-rc2 changelog --- docs/en/04_Changelogs/rc/3.3.1-rc2.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/en/04_Changelogs/rc/3.3.1-rc2.md b/docs/en/04_Changelogs/rc/3.3.1-rc2.md index 851fd2009..5e36f5891 100644 --- a/docs/en/04_Changelogs/rc/3.3.1-rc2.md +++ b/docs/en/04_Changelogs/rc/3.3.1-rc2.md @@ -3,3 +3,7 @@ ## Change Log + +### Bugfixes + + * 2016-02-26 [b7b1aba](https://github.com/silverstripe/silverstripe-framework/commit/b7b1aba3fbc56a87c95beefb50051f4d40e00443) undeclared constant issue (Daniel Hensby)