From b4050a73924bc3515f4efd915893245b9ae09b76 Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Thu, 17 Nov 2016 10:17:56 +1300 Subject: [PATCH 01/11] Remove obsolete branch-alias --- composer.json | 72 ++++++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 38 deletions(-) diff --git a/composer.json b/composer.json index 7cd27a7..d333288 100755 --- a/composer.json +++ b/composer.json @@ -1,39 +1,35 @@ { - "name": "silverstripe/blog", - "description": "A fresh take on blogging in Silverstripe set out to tackle the issue of a cluttered Site Tree.", - "keywords": [ - "silverstripe", - "blog", - "news" - ], - "type": "silverstripe-module", - "require": { - "silverstripe/cms": "^3.1.0", - "silverstripe/lumberjack": "~1.1", - "silverstripe/tagfield": "^1.0" - }, - "require-dev": { - "phpunit/PHPUnit": "~3.7@stable" - }, - "extra": { - "branch-alias": { - "dev-master": "2.4.x-dev" - } - }, - "license": "BSD-2-Clause", - "authors": [ - { - "name": "Michael Strong", - "email": "github@michaelstrong.co.uk" - } - ], - "suggest": { - "silverstripe/widgets": "Some widgets come with the blog which are compatible with the widgets module.", - "silverstripe/comments": "This module adds comments to your blog." - }, - "replace": { - "micmania1/silverstripe-blog": "*" - }, - "minimum-stability": "dev", - "prefer-stable": true -} + "name": "silverstripe/blog", + "description": "A fresh take on blogging in Silverstripe set out to tackle the issue of a cluttered Site Tree.", + "keywords": [ + "silverstripe", + "blog", + "news" + ], + "type": "silverstripe-module", + "require": { + "silverstripe/cms": "^3.1.0", + "silverstripe/lumberjack": "~1.1", + "silverstripe/tagfield": "^1.0" + }, + "require-dev": { + "phpunit/PHPUnit": "~3.7@stable" + }, + "extra": [], + "license": "BSD-2-Clause", + "authors": [ + { + "name": "Michael Strong", + "email": "github@michaelstrong.co.uk" + } + ], + "suggest": { + "silverstripe/widgets": "Some widgets come with the blog which are compatible with the widgets module.", + "silverstripe/comments": "This module adds comments to your blog." + }, + "replace": { + "micmania1/silverstripe-blog": "*" + }, + "minimum-stability": "dev", + "prefer-stable": true +} \ No newline at end of file From 7583e0bcd53dfd61e332f177c99e70b802582d4b Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Thu, 17 Nov 2016 12:39:49 +1300 Subject: [PATCH 02/11] Update translations --- lang/de.yml | 21 ++++++++++++++------ lang/eo.yml | 11 +++++----- lang/fa_IR.yml | 20 +++++++++---------- lang/fi.yml | 48 ++++++++++++++++++++++---------------------- lang/fi_FI.yml | 10 +++++----- lang/fr.yml | 6 +++--- lang/hr.yml | 2 +- lang/it.yml | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ lang/nl.yml | 10 +++++----- lang/ru.yml | 52 ++++++++++++++++++++++++++++++++++++++++++++---- lang/sv.yml | 16 +++++++-------- 11 files changed, 179 insertions(+), 71 deletions(-) diff --git a/lang/de.yml b/lang/de.yml index 679c876..1086f8a 100644 --- a/lang/de.yml +++ b/lang/de.yml @@ -3,6 +3,7 @@ de: PLURALNAME: 'Archiv Widgets' SINGULARNAME: 'Archiv Widget' Blog: + AND: und Archive: Archiv By: von CONTRIBUTOR: Mitwirkende @@ -16,7 +17,7 @@ de: FILTERDESCRIPTION_DATE: 'Am {date}' FILTERDESCRIPTION_PAGE: 'Seite {page}' FILTERDESCRIPTION_TAG: 'Verschlagwortet mit {tag}' - LumberjackTitle: 'Blog-Einträge' + LumberjackTitle: Blog-Einträge NoPosts: 'Keine Blog-Einträge vorhanden' PERMISSIONS_CATEGORY: 'Blog Berechtigungen' PERMISSION_MANAGE_USERS_DESCRIPTION: 'Benutzer für einzelne Blog-Einträge verwalten' @@ -51,28 +52,31 @@ de: Description: 'Ändern Sie die Sortierung der Kategorien, die von diesem Widget angezeigt werden.' Label: Sortierung BlogCategory: + Duplicate: 'Es gibt bereits eine Blog-Kategorie mit diesem Namen' PLURALNAME: 'Blog Kategorien' SINGULARNAME: 'Blog Kategorie' Title: Titel BlogEntry: DESCRIPTION: 'Allgemeine Inhaltsseite' PLURALNAME: 'Basis Seiten' - SINGULARNAME: 'Blogeintrag' + SINGULARNAME: Blogeintrag BlogHolder: DESCRIPTION: 'Allgemeine Inhaltsseite' PLURALNAME: 'Basis Seiten' - SINGULARNAME: 'Blog' + SINGULARNAME: Blog BlogPost: AUTHOR: Autor AdditionalCredits: 'Zusätzliche Credits' + AdditionalCredits_Description: 'Wenn Autoren dieses Eintrags keinen Zugang zum CMS haben, können Sie die Namen hier mit Kommas getrennt eintragen.' Authors: Autoren - CUSTOMSUMMARY: 'Zusammenfassung' + CUSTOMSUMMARY: Zusammenfassung Categories: Kategorien DESCRIPTION: 'Allgemeine Inhaltsseite' PLURALNAME: 'Basis Seiten' - PageTitleLabel: 'Titel' + PageTitleLabel: Titel PublishDate: 'Datum der Veröffentlichung' - SINGULARNAME: 'Blog-Eintrag' + PublishDate_Description: 'Jetzt, wenn nichts eingegeben wird.' + SINGULARNAME: Blog-Eintrag SUMMARY_DESCRIPTION: 'Wenn keine Zusammenfassung angegeben wird, werden die ersten 30 Wörter verwendet.' Tags: Schlagworte BlogRecentPostsWidget: @@ -81,9 +85,14 @@ de: PLURALNAME: 'Aktuelle Blog Einträge Widgets' SINGULARNAME: 'Aktuelle Blog Einträge Widget' BlogTag: + Duplicate: 'Es gibt bereits einen Blog-Tag mit diesem Namen' PLURALNAME: 'Blog Schlagworte' SINGULARNAME: 'Blog Schlagwort' Title: Titel + BlogTagsCloudWidget: + Blog: Blog + PLURALNAME: Blog-Tag-Cloud-Widgets + SINGULARNAME: Blog-Tag-Cloud-Widget BlogTagsWidget: Blog: Blog Direction: diff --git a/lang/eo.yml b/lang/eo.yml index 9bec566..21fac6a 100644 --- a/lang/eo.yml +++ b/lang/eo.yml @@ -3,6 +3,7 @@ eo: PLURALNAME: 'Enarĥivi fenestraĵojn' SINGULARNAME: 'Enarĥivi fenestraĵon' Blog: + AND: kaj Archive: Arkivo By: de CONTRIBUTOR: Kontribuinto @@ -29,7 +30,7 @@ eo: ReadMoreAbout: 'Legi plu pri ''{title}''...' SINGULARNAME: Blogo Tag: Etikedo - Tagged: Havas etikedon + Tagged: 'Havas etikedon' Tags: Etikedoj WRITER: Verkanto BlogArchiveWidget: @@ -59,11 +60,11 @@ eo: BlogEntry: DESCRIPTION: 'Komuna enhavpaĝo' PLURALNAME: 'Bazaj paĝoj' - SINGULARNAME: 'Blogero' + SINGULARNAME: Blogero BlogHolder: DESCRIPTION: 'Komuna enhavpaĝo' PLURALNAME: 'Bazaj paĝoj' - SINGULARNAME: 'Blogenhavo' + SINGULARNAME: Blogenhavo BlogPost: AUTHOR: Aŭtoro AdditionalCredits: 'Kromaj agnoskoj' @@ -77,7 +78,7 @@ eo: PageTitleLabel: 'Titolo de afiŝo' PublishDate: 'Dato de publikigo' PublishDate_Description: 'Agordiĝos al "nun", se publikigita sen valoro' - SINGULARNAME: 'Blogaĵo' + SINGULARNAME: Blogaĵo SUMMARY_DESCRIPTION: 'Se resumo ne estas agordita, la unuaj 30 vortoj uziĝos.' Tags: Etikedoj BlogRecentPostsWidget: @@ -110,7 +111,7 @@ eo: BlogTree: DESCRIPTION: 'Komuna enhavpaĝo' PLURALNAME: 'Bazaj paĝoj' - SINGULARNAME: 'Blogarbo' + SINGULARNAME: Blogarbo GridFieldAddByDBField: Add: 'Aldoni {name}' AddFail: '{klaso} ne estas konservebla al la datumbazo.' diff --git a/lang/fa_IR.yml b/lang/fa_IR.yml index 2a3eb92..1126ab0 100644 --- a/lang/fa_IR.yml +++ b/lang/fa_IR.yml @@ -5,9 +5,9 @@ fa_IR: Blog: Archive: بایگانی By: توسط - CONTRIBUTOR: مشارکت‌کننده - Categories: مجموعه‌ها - Category: مجموعه + CONTRIBUTOR: 'مشارکت‌کننده' + Categories: 'مجموعه‌ها' + Category: 'مجموعه' Comments: دیدگاه‌ها DESCRIPTION: 'یک وبلاگ به سایت شما می‌افزاید.' EDITOR: ویرایشگر @@ -23,7 +23,7 @@ fa_IR: PERMISSION_MANAGE_USERS_DESCRIPTION: 'مدیریت کاربران برای بلاگ‌های انفرادی' PERMISSION_MANAGE_USERS_HELP: 'تعیین اجازه‌ی دسترسی ویرایش‌گران، نویسندگان یا مشارکت‌کنندگان به وبلاگ' PLURALNAME: 'صفحات پایه‌ای' - Posted: ارسال شده + Posted: 'ارسال شده' PostedIn: 'ارسال شده در' PostsPerPage: 'تعداد ارسال در صفحه' ReadMoreAbout: 'درباره ''{title}'' بیشتر بخوانید...' @@ -33,7 +33,7 @@ fa_IR: Tags: تگ‌ها WRITER: نویسنده BlogArchiveWidget: - ArchiveType: نوع بایگانی + ArchiveType: 'نوع بایگانی' Blog: وبلاگ NumberToDisplay: 'شمار در نمایش' PLURALNAME: 'ویجت‌های بایگانی بلاگ' @@ -43,12 +43,12 @@ fa_IR: Direction: Label: جهت Limit: - Label: محدود کردن + Label: 'محدود کردن' PLURALNAME: 'ویجت‌های مجموعه‌های بلاگ' SINGULARNAME: 'ویجت‌ مجموعه‌های بلاگ' Sort: Description: 'تغییر ترتیب مجموعه‌های نمایش داده‌‌شده توسط این ویجت' - Label: مرتب‌سازی + Label: 'مرتب‌سازی' BlogCategory: PLURALNAME: 'مجموعه‌های وبلاگ' SINGULARNAME: 'مجموعه وبلاگ' @@ -66,7 +66,7 @@ fa_IR: AdditionalCredits: 'دیگر مشارکت‌کنندگان' Authors: نگارندگان CUSTOMSUMMARY: 'افزودن یک خلاصه دلخواه' - Categories: مجموعه‌ها + Categories: 'مجموعه‌ها' DESCRIPTION: 'صفحه محتوای عمومی' PLURALNAME: 'صفحات پایه‌ای' PageTitleLabel: 'عنوان ارسال' @@ -89,11 +89,11 @@ fa_IR: Label: جهت Limit: Description: 'محدود کردن تعداد تگ‌های نمایش داده شده توسط این ویجت (روی 0 بگذارید تا همه به نمایش دربیایند)' - Label: محدود کردن + Label: 'محدود کردن' PLURALNAME: 'ویجت‌های تگ‌های وبلاگ' SINGULARNAME: 'ویجت تگ‌های وبلاگ' Sort: - Label: مرتب‌سازی + Label: 'مرتب‌سازی' BlogTree: DESCRIPTION: 'صفحه محتوای عمومی' PLURALNAME: 'صفحات پایه‌ای' diff --git a/lang/fi.yml b/lang/fi.yml index bfe5c74..b6b523a 100755 --- a/lang/fi.yml +++ b/lang/fi.yml @@ -1,7 +1,7 @@ fi: ArchiveWidget: - PLURALNAME: 'Arkistovimpaimet' - SINGULARNAME: 'Arkistovimpain' + PLURALNAME: Arkistovimpaimet + SINGULARNAME: Arkistovimpain Blog: Archive: Arkisto By: kirjoittanut @@ -16,13 +16,13 @@ fi: FILTERDESCRIPTION_DATE: 'Pvm: {date}' FILTERDESCRIPTION_PAGE: 'Sivu {page}' FILTERDESCRIPTION_TAG: 'Avainsanat: {tag}' - LumberjackTitle: 'Blogikirjoitukset' + LumberjackTitle: Blogikirjoitukset NoPosts: 'Ei kirjoituksia' NoUnfeaturedPosts: 'Ei artikkeleita, jotka eivät ole nostoja' PERMISSIONS_CATEGORY: 'Blogin oikeudet' PERMISSION_MANAGE_USERS_DESCRIPTION: 'Hallinnoi käyttäjiä yksittäisissä blogeissa' PERMISSION_MANAGE_USERS_HELP: 'Salli toimittajien, kirjoittajien tai avustajien kiinnittäminen blogeihin' - PLURALNAME: 'Pohjasivut' + PLURALNAME: Pohjasivut Posted: Kirjoitettu PostedIn: 'Kirjoitettu:' PostsPerPage: 'Kirjoitusta per sivu' @@ -35,9 +35,9 @@ fi: BlogArchiveWidget: ArchiveType: Arkistotyyppi Blog: Blogi - NumberToDisplay: 'Näytetään' - PLURALNAME: 'Blogiarkisto-vimpaimet' - SINGULARNAME: 'Blogiarkisto-vimpain' + NumberToDisplay: Näytetään + PLURALNAME: Blogiarkisto-vimpaimet + SINGULARNAME: Blogiarkisto-vimpain BlogCategoriesWidget: Blog: Blogi Direction: @@ -46,38 +46,38 @@ fi: Limit: Description: 'Rajoita näytettävien kategorioiden määrää tässä vimpaimessa (aseta arvoksi 0, jos haluat näyttää kaikki kategoriat).' Label: Rajoita - PLURALNAME: 'Blogikategoriat-vimpaimet' - SINGULARNAME: 'Blogikategoriat-vimpain' + PLURALNAME: Blogikategoriat-vimpaimet + SINGULARNAME: Blogikategoriat-vimpain Sort: Description: 'Vaihda vimpaimen näytettävien kategorioiden järjestys.' Label: Järjestä BlogCategory: Duplicate: 'Tämä blogikategoria on jo olemassa' - PLURALNAME: 'Blogikategoriat' - SINGULARNAME: 'Blogikategoria' + PLURALNAME: Blogikategoriat + SINGULARNAME: Blogikategoria Title: Otsikko BlogEntry: DESCRIPTION: 'Yleinen sisältösivu' - PLURALNAME: 'Pohjasivut' - SINGULARNAME: 'Blogikirjoitus' + PLURALNAME: Pohjasivut + SINGULARNAME: Blogikirjoitus BlogHolder: DESCRIPTION: 'Yleinen sisältösivu' - PLURALNAME: 'Pohjasivut' + PLURALNAME: Pohjasivut SINGULARNAME: 'Blogin koontisivu' BlogPost: AUTHOR: Kirjoittaja - AdditionalCredits: 'Lisäkiitokset' + AdditionalCredits: Lisäkiitokset AdditionalCredits_Description: 'Mikäli kaikilla artikkelin kirjoittajilla ei ole pääsyä sisällönhallintajärjestelmään, syötä heidän nimensä (nimi) tähän. Erota useampi pilkulla.' Authors: Kirjoittajat CUSTOMSUMMARY: 'Lisää tiivistelmä' Categories: Kategoriat DESCRIPTION: 'Yleinen sisältösivu' - FeaturedImage: 'Kuvanosto' - PLURALNAME: 'Pohjasivut' - PageTitleLabel: 'Otsikko' - PublishDate: 'Julkaisupäivä' + FeaturedImage: Kuvanosto + PLURALNAME: Pohjasivut + PageTitleLabel: Otsikko + PublishDate: Julkaisupäivä PublishDate_Description: 'Asetetaan "nyt", mikäli arvo jätetään asettamatta.' - SINGULARNAME: 'Blogikirjoitus' + SINGULARNAME: Blogikirjoitus SUMMARY_DESCRIPTION: 'Mikäli tiivistelmää ei ole kirjoitettu, käytetään 30 ensimmäistä sanaa kirjoituksesta.' Tags: Avainsanat BlogRecentPostsWidget: @@ -102,15 +102,15 @@ fi: Limit: Description: 'Rajoita vimpaimella näytettävien avainsanojen määrää (aseta arvoksi 0, jos haluat näyttää kaikki avainsanat).' Label: Rajoita - PLURALNAME: 'Avainsanat-vimpaimet' - SINGULARNAME: 'Avainsanat-vimpain' + PLURALNAME: Avainsanat-vimpaimet + SINGULARNAME: Avainsanat-vimpain Sort: Description: 'Vaihda vimpaimella näytettävien avainsanojen järjestystä.' Label: Järjestä BlogTree: DESCRIPTION: 'Yleinen sisältösivu' - PLURALNAME: 'Pohjasivut' - SINGULARNAME: 'Blogihakemistopuu' + PLURALNAME: Pohjasivut + SINGULARNAME: Blogihakemistopuu GridFieldAddByDBField: Add: 'Lisää {name}' AddFail: '{class} ei voida tallentaa tietokantaan.' diff --git a/lang/fi_FI.yml b/lang/fi_FI.yml index f6c5982..1a293ed 100644 --- a/lang/fi_FI.yml +++ b/lang/fi_FI.yml @@ -1,16 +1,16 @@ fi_FI: Blog: FILTERDESCRIPTION_PAGE: 'Sivu {page}' - PLURALNAME: 'Pohjasivut' + PLURALNAME: Pohjasivut BlogCategory: Title: Otsikko BlogEntry: - PLURALNAME: 'Pohjasivut' + PLURALNAME: Pohjasivut BlogHolder: - PLURALNAME: 'Pohjasivut' + PLURALNAME: Pohjasivut BlogPost: - PLURALNAME: 'Pohjasivut' + PLURALNAME: Pohjasivut BlogTag: Title: Otsikko BlogTree: - PLURALNAME: 'Pohjasivut' + PLURALNAME: Pohjasivut diff --git a/lang/fr.yml b/lang/fr.yml index 77dc8b3..0e30653 100644 --- a/lang/fr.yml +++ b/lang/fr.yml @@ -22,7 +22,7 @@ fr: PERMISSIONS_CATEGORY: 'Permissions du blog' PERMISSION_MANAGE_USERS_DESCRIPTION: 'Gérer les utilisateurs pour un blog' PERMISSION_MANAGE_USERS_HELP: 'Autoriser l''assignation d''éditeurs, auteurs ou contributeurs au blog' - PLURALNAME: 'Blogs' + PLURALNAME: Blogs Posted: Publié PostedIn: 'Publié dans' PostsPerPage: 'Billets par page' @@ -70,11 +70,11 @@ fr: CUSTOMSUMMARY: 'Ajouter un sommaire personnalisé' Categories: Catégories DESCRIPTION: 'Un billet du blog' - PLURALNAME: 'Billets' + PLURALNAME: Billets PageTitleLabel: 'Titre du billet' PublishDate: 'Date de publication' PublishDate_Description: 'Sera mis à "maintenant" si publié sans valeur.' - SINGULARNAME: 'Billet' + SINGULARNAME: Billet SUMMARY_DESCRIPTION: 'Si aucun sommaire, les 30 premiers mots seront utilisés.' Tags: Tags BlogRecentPostsWidget: diff --git a/lang/hr.yml b/lang/hr.yml index be00f5a..55d114f 100644 --- a/lang/hr.yml +++ b/lang/hr.yml @@ -32,7 +32,7 @@ hr: Tags: Tagovi WRITER: Pisac BlogArchiveWidget: - ArchiveType: Tip arhive + ArchiveType: 'Tip arhive' Blog: Blog NumberToDisplay: 'Broj za prikaz' BlogCategoriesWidget: diff --git a/lang/it.yml b/lang/it.yml index 9ffc61e..5932796 100644 --- a/lang/it.yml +++ b/lang/it.yml @@ -1,5 +1,9 @@ it: + ArchiveWidget: + PLURALNAME: 'Widget Archiviazione' + SINGULARNAME: 'Widget Archiviazione' Blog: + AND: e Archive: Archivia By: di CONTRIBUTOR: Collaboratore @@ -15,9 +19,11 @@ it: FILTERDESCRIPTION_TAG: 'Etichettato con {tag}' LumberjackTitle: 'Articoli del Blog' NoPosts: 'Non ci sono articoli' + NoUnfeaturedPosts: 'Non ci sono articoli non-featured' PERMISSIONS_CATEGORY: 'Permessi del blog' PERMISSION_MANAGE_USERS_DESCRIPTION: 'Gestire utenti per i singoli blog' PERMISSION_MANAGE_USERS_HELP: 'Consenti l''assegnazione di Editori, Scrittori o Collaboratori ai blog' + PLURALNAME: 'Pagine Base' Posted: Inserito PostedIn: 'Inserito il' PostsPerPage: 'Articoli Per Pagina' @@ -28,25 +34,50 @@ it: Tags: Etichette WRITER: Scrittore BlogArchiveWidget: + ArchiveType: TipoArchiviazione Blog: Blog NumberToDisplay: 'N. da Visualizzare' PLURALNAME: 'Widget Archiviazione Blog' SINGULARNAME: 'Widget Archiviazione Blog' BlogCategoriesWidget: Blog: Blog + Direction: + Description: 'Modificare la direzione di ordinamento delle categorie mostrate da questo widget.' + Label: Direzione + Limit: + Description: 'Limitare il numero di categorie mostrate da questo widget (impostare a 0 per mostrare tutte le categorie).' + Label: Limite PLURALNAME: 'Widget Categorie Blog' SINGULARNAME: 'Widget Categorie Blog' + Sort: + Description: 'Modificare l''ordine delle categorie mostrate da questo widget.' + Label: Ordine BlogCategory: + Duplicate: 'Esiste già una categoria blog con quel nome' + PLURALNAME: 'Categorie Blog' + SINGULARNAME: 'Categoria Blog' Title: Titolo + BlogEntry: + DESCRIPTION: 'Pagina di contenuto generico' + PLURALNAME: 'Pagine Base' + SINGULARNAME: 'Voce Blog' + BlogHolder: + DESCRIPTION: 'Pagina di contenuto generico' + PLURALNAME: 'Pagine Base' + SINGULARNAME: 'Contenitore Blog' BlogPost: AUTHOR: Autore AdditionalCredits: 'Riconoscimenti Aggiuntivi' + AdditionalCredits_Description: 'Se l''autore di questo articolo non ha accesso al CMS inserire qui il suo nome(i). Separare nomi multipli con la virgola.' Authors: Autori CUSTOMSUMMARY: 'Aggiungi una Sintesi Personalizzata' Categories: Categorie DESCRIPTION: 'Pagina di contenuto generico' + FeaturedImage: 'Immagine in Evidenza' + PLURALNAME: 'Pagine Base' PageTitleLabel: 'Titolo Articolo' PublishDate: 'Data Pubblicazione' + PublishDate_Description: 'Sarà impostato a "now" se pubblicato senza un valore.' SINGULARNAME: 'Articolo del Blog' SUMMARY_DESCRIPTION: 'Se non è specificata una sintesi saranno usate le prime 30 parole.' Tags: Etichette @@ -56,11 +87,31 @@ it: PLURALNAME: 'Widget Articoli Blog Recenti' SINGULARNAME: 'Widget Articoli Blog Recenti' BlogTag: + Duplicate: 'Esiste già un''etichetta con quel nome' + PLURALNAME: 'Etichette Blog' + SINGULARNAME: 'Etichetta Blog' Title: Titolo + BlogTagsCloudWidget: + Blog: Blog + PLURALNAME: 'Widget Tag Cloud del Blog' + SINGULARNAME: 'Widget Tag Cloud del Blog' BlogTagsWidget: Blog: Blog + Direction: + Description: 'Modificare la direzione di ordinamento delle etichette mostrate da questo widget.' + Label: Direzione + Limit: + Description: 'Limitare il numero di etichette mostrate da questo widget (impostare a 0 per mostrare tutte le etichette).' + Label: Limite PLURALNAME: 'Widget Etichette Blog' SINGULARNAME: 'Widget Etichette Blog' + Sort: + Description: 'Modificare l''ordine delle etichette mostrate da questo widget.' + Label: Ordine + BlogTree: + DESCRIPTION: 'Pagina di contenuto generico' + PLURALNAME: 'Pagine Base' + SINGULARNAME: 'Albero del blog' GridFieldAddByDBField: Add: 'Aggiungi {name}' AddFail: 'Impossibile salvare {class} nel database.' @@ -69,3 +120,6 @@ it: Draft: ' Salvato come bozza il {date}' Published: ' Pubblicato il {date}' Timer: ' Pubblicare al {date}' + TagCloudWidget: + PLURALNAME: 'Widget Tag Cloud' + SINGULARNAME: 'Widget Tag Cloud' diff --git a/lang/nl.yml b/lang/nl.yml index 017cefd..1e8ab94 100644 --- a/lang/nl.yml +++ b/lang/nl.yml @@ -1,7 +1,7 @@ nl: ArchiveWidget: - PLURALNAME: 'Archief-widgets' - SINGULARNAME: 'Archief-widget' + PLURALNAME: Archief-widgets + SINGULARNAME: Archief-widget Blog: Archive: Archief By: door @@ -22,7 +22,7 @@ nl: PERMISSIONS_CATEGORY: 'Blog rechten' PERMISSION_MANAGE_USERS_DESCRIPTION: 'Beheer gebruikers voor individuele blogs' PERMISSION_MANAGE_USERS_HELP: 'Laat toewijzing van Redacteurs, Auteurs en Co-auteurs toe.' - PLURALNAME: 'Blogs' + PLURALNAME: Blogs Posted: Geplaatst PostedIn: 'Geplaatst in' PostsPerPage: 'Artikelen per pagina' @@ -66,7 +66,7 @@ nl: SINGULARNAME: 'Blog Houder' BlogPost: AUTHOR: Auteur - AdditionalCredits: 'Dankbetuigingen' + AdditionalCredits: Dankbetuigingen AdditionalCredits_Description: 'Indien (enkele) auteurs geen toegang hebben tot dit CMS, kunnen ze hier toegevoegd worden. Scheid namen door middel van komma''s' Authors: Auterus CUSTOMSUMMARY: 'Voeg een eigen samenvatting toe' @@ -75,7 +75,7 @@ nl: FeaturedImage: 'Prominente Afbeelding' PLURALNAME: 'Blog Artikelen' PageTitleLabel: 'Artikel Titel' - PublishDate: 'Publicatiedatum' + PublishDate: Publicatiedatum PublishDate_Description: 'Wordt op "nu" gezet indien gepubliceerd zonder waarde.' SINGULARNAME: 'Blog Artikel' SUMMARY_DESCRIPTION: 'Als geen samenvatting ingevoerd wordt, worden de eerste 30 worden gebruikt.' diff --git a/lang/ru.yml b/lang/ru.yml index 4849cac..9c54615 100644 --- a/lang/ru.yml +++ b/lang/ru.yml @@ -3,14 +3,15 @@ ru: PLURALNAME: 'Виджеты для архива' SINGULARNAME: 'Виджет для архива' Blog: - Archive: Архив + AND: и + Archive: 'Архив' By: 'автор:' CONTRIBUTOR: Автор Categories: Категории Category: Категория Comments: Комментарии DESCRIPTION: 'Добавляет к сайту блог.' - EDITOR: Редактор + EDITOR: 'Редактор' FILTERDESCRIPTION_AUTHOR: 'Автор: {author}' FILTERDESCRIPTION_CATEGORY: 'В категории: {category}' FILTERDESCRIPTION_DATE: 'Дата: {date}' @@ -21,9 +22,10 @@ ru: NoUnfeaturedPosts: 'В блоге нет отмеченых записей' PERMISSIONS_CATEGORY: 'Права доступа к содержимому блога' PERMISSION_MANAGE_USERS_DESCRIPTION: 'Управление пользователями для индивидуальных блогов' + PERMISSION_MANAGE_USERS_HELP: 'Разрешить назначать Редакторов, Писателей и Авторов к блогам' PLURALNAME: 'Базовые страницы' Posted: Отправлено - PostedIn: 'Отправлено' + PostedIn: Отправлено PostsPerPage: 'Записей на странице' ReadMoreAbout: 'Узнать больше о ''{title}''...' SINGULARNAME: Блог @@ -32,42 +34,84 @@ ru: Tags: Метки WRITER: Автор BlogArchiveWidget: - ArchiveType: Тип архива + ArchiveType: 'Тип архива' Blog: Блог + NumberToDisplay: 'Отображать:' PLURALNAME: 'Виджеты архива' SINGULARNAME: 'Виджет архива' BlogCategoriesWidget: Blog: Блог + Direction: + Description: 'Изменять направление сортировки категорий отображаемых в этом блоке.' + Label: Направление + Limit: + Description: 'Ограничить количество категорий отображаемых в этом блоке (укажите 0 чтобы отображать все категории).' + Label: Ограничение + PLURALNAME: 'Блоки категорий блога' + SINGULARNAME: 'Блок категорий блога' Sort: + Description: 'Изменить порядок категорий в этом блоке.' Label: Сортировать + BlogCategory: + Duplicate: 'Категория блога с этим именем уже существует' + PLURALNAME: 'Категории Блога' + SINGULARNAME: 'Категория Блога' + Title: Заголовок BlogEntry: DESCRIPTION: 'Обычная страница' PLURALNAME: 'Базовые страницы' + SINGULARNAME: 'Сообщение Блога' BlogHolder: DESCRIPTION: 'Обычная страница' PLURALNAME: 'Базовые страницы' + SINGULARNAME: 'Контейнер Блога' BlogPost: AUTHOR: Автор AdditionalCredits: 'Дополнительные сведения' + AdditionalCredits_Description: 'Если некоторые авторы этого сообщения не имеют доступа к админке укажите их имена здесь. Для разделения имён используется запятая.' Authors: Авторы + CUSTOMSUMMARY: 'Добавить уникальное описание' + Categories: Категории DESCRIPTION: 'Обычная страница' + FeaturedImage: Изображение PLURALNAME: 'Базовые страницы' + PageTitleLabel: 'Заголовок Сообщения' + PublishDate: 'Дата публикации' + PublishDate_Description: 'Будет использована текущая дата если не будет указанно значение.' SINGULARNAME: 'Запись в блоге' + SUMMARY_DESCRIPTION: 'Если не указанно описание будут использованы первые 30 слов.' Tags: Метки BlogRecentPostsWidget: Blog: Блог NumberOfPosts: 'Количество записей' + PLURALNAME: 'Блоки последних сообщений блога' + SINGULARNAME: 'Блок последних сообщений блога' BlogTag: + Duplicate: 'Тэги блога с таким именем уже существуют' + PLURALNAME: 'Тэги Блога' + SINGULARNAME: 'Тэг Блога' Title: Заголовок + BlogTagsCloudWidget: + Blog: Блог + PLURALNAME: 'Блоки облака тэгов' + SINGULARNAME: 'Блок облака тэгов' BlogTagsWidget: Blog: Блог + Direction: + Description: 'Изменить направление сортировки тэгов отображаемых в этом блоке.' + Label: Направление + Limit: + Description: 'Ограничить количество тэгов в этом блоке (укажите 0 чтобы отобразить все тэги).' + Label: Ограничение PLURALNAME: 'Виджеты для меток блога' SINGULARNAME: 'Виджет для меток блога' Sort: + Description: 'Изменить порядок тэгов в этом блоке.' Label: Сортировать BlogTree: DESCRIPTION: 'Обычная страница' PLURALNAME: 'Базовые страницы' + SINGULARNAME: 'Древо Блога' GridFieldAddByDBField: Add: 'Добавить {name}' AddFail: 'Не удалось сохранить {class} в базе данных.' diff --git a/lang/sv.yml b/lang/sv.yml index 1337843..9064683 100644 --- a/lang/sv.yml +++ b/lang/sv.yml @@ -1,7 +1,7 @@ sv: ArchiveWidget: - PLURALNAME: 'Arkiv-Widgets' - SINGULARNAME: 'Arkiv-Widget' + PLURALNAME: Arkiv-Widgets + SINGULARNAME: Arkiv-Widget Blog: Archive: Arkiv By: av @@ -16,7 +16,7 @@ sv: FILTERDESCRIPTION_DATE: 'På {date}' FILTERDESCRIPTION_PAGE: 'Sida {page}' FILTERDESCRIPTION_TAG: 'Taggat med {tag}' - LumberjackTitle: 'Bloginlägg' + LumberjackTitle: Bloginlägg NoPosts: 'Det finns inga bloginlägg' NoUnfeaturedPosts: 'Det finns inga icke-etablerade inlägg' PERMISSIONS_CATEGORY: 'Blogg rättigheter' @@ -58,11 +58,11 @@ sv: BlogEntry: DESCRIPTION: 'Generisk innehållssida' PLURALNAME: 'Bas sidor' - SINGULARNAME: 'Blogginägg' + SINGULARNAME: Blogginägg BlogHolder: DESCRIPTION: 'Generisk innehållssida' PLURALNAME: 'Bas sidor' - SINGULARNAME: 'Blogg' + SINGULARNAME: Blogg BlogPost: AUTHOR: Författare AdditionalCredits: 'Ytterligare erkännanden' @@ -71,10 +71,10 @@ sv: Categories: Kategorier DESCRIPTION: 'Generisk innehållssida' PLURALNAME: 'Bas sidor' - PageTitleLabel: 'Blogginläggstitel' + PageTitleLabel: Blogginläggstitel PublishDate: 'Publicerat datum' PublishDate_Description: 'Kommer att sättas till "nu" om publiceras utan ett värde .' - SINGULARNAME: 'Bloginlägg' + SINGULARNAME: Bloginlägg SUMMARY_DESCRIPTION: 'Om ingen sammanfattning anges, kommer de första 30 orden att användas .' Tags: Taggar BlogRecentPostsWidget: @@ -102,7 +102,7 @@ sv: BlogTree: DESCRIPTION: 'Generisk innehållssida' PLURALNAME: 'Bas sidor' - SINGULARNAME: 'Blggträd' + SINGULARNAME: Blggträd GridFieldAddByDBField: Add: 'Lägg till {name}' AddFail: 'Det går inte att spara {class} till databasen .' From 3e298b7b108c2a04d956716fe05bd05ba9703bc9 Mon Sep 17 00:00:00 2001 From: Daniel Hensby Date: Tue, 20 Dec 2016 15:20:16 +0000 Subject: [PATCH 03/11] Updating composer alias --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7cd27a7..8c8909a 100755 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ }, "extra": { "branch-alias": { - "dev-master": "2.4.x-dev" + "2.x-dev": "2.5.x-dev" } }, "license": "BSD-2-Clause", From fef1462f566dcb8fa68866a931220d44f00895ad Mon Sep 17 00:00:00 2001 From: Christopher Darling Date: Wed, 15 Mar 2017 14:31:18 +0000 Subject: [PATCH 04/11] BlogMigrationTask missing title and description Otherwise shows up in dev/tasks/ as "Database Migrations" --- code/compat/tasks/BlogMigrationTask.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/compat/tasks/BlogMigrationTask.php b/code/compat/tasks/BlogMigrationTask.php index 143fb7c..9c52dde 100644 --- a/code/compat/tasks/BlogMigrationTask.php +++ b/code/compat/tasks/BlogMigrationTask.php @@ -2,6 +2,9 @@ class BlogMigrationTask extends MigrationTask { + protected $title = "Legacy blog migration to 2.x task"; + protected $description = "Provide atomic database changes (not implemented yet)"; + /** * Should this task be invoked automatically via dev/build? * From 2cd7db9beb44804f71fd18519d6b39a0e033a3db Mon Sep 17 00:00:00 2001 From: Rastislav Brandobur Date: Wed, 12 Apr 2017 10:33:29 +0200 Subject: [PATCH 05/11] FIX Add translation to some areas of BlogMemberExtension that were missing them --- code/extensions/BlogMemberExtension.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/extensions/BlogMemberExtension.php b/code/extensions/BlogMemberExtension.php index 1a3f2d7..e37c9c2 100644 --- a/code/extensions/BlogMemberExtension.php +++ b/code/extensions/BlogMemberExtension.php @@ -97,11 +97,11 @@ class BlogMemberExtension extends DataExtension Requirements::css(BLOGGER_DIR . '/css/cms.css'); Requirements::javascript(BLOGGER_DIR . '/js/cms.js'); - $tab = new Tab('BlogPosts', 'Blog Posts'); + $tab = new Tab('BlogPosts', _t('BlogMemberExtension.TABBLOGPOSTS', 'Blog Posts')); $gridField = new GridField( 'BlogPosts', - 'Blog Posts', + _t('BlogMemberExtension.BLOGPOSTS', 'Blog Posts'), $this->owner->BlogPosts(), new GridFieldConfig_BlogPost() ); From 0132a02cf0d25c60f3c42dbb0470f5d081be862d Mon Sep 17 00:00:00 2001 From: Daniel Hensby Date: Thu, 25 May 2017 08:57:47 +0100 Subject: [PATCH 06/11] Adding .codecov.yml file --- .codecov.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 .codecov.yml diff --git a/.codecov.yml b/.codecov.yml new file mode 100644 index 0000000..69cb760 --- /dev/null +++ b/.codecov.yml @@ -0,0 +1 @@ +comment: false From bd23bb2f0ac0a45fc564a2ecdb79611b66ad69f9 Mon Sep 17 00:00:00 2001 From: Alexandre Saelens Date: Wed, 14 Jun 2017 14:05:40 +1200 Subject: [PATCH 07/11] Prevent user_error when querying object from Solr --- code/extensions/BlogPostFilter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/extensions/BlogPostFilter.php b/code/extensions/BlogPostFilter.php index 1795bc8..3f70cb6 100644 --- a/code/extensions/BlogPostFilter.php +++ b/code/extensions/BlogPostFilter.php @@ -18,7 +18,7 @@ class BlogPostFilter extends DataExtension { $stage = Versioned::current_stage(); - if (Controller::curr() instanceof LeftAndMain) { + if (Controller::has_curr() && Controller::curr() instanceof LeftAndMain) { return; } From 16d684dcfaacde7f52f2611cc7450ec3c344efe2 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Thu, 15 Jun 2017 09:58:30 +1200 Subject: [PATCH 08/11] Add PHP7 + SS3.6 build to Travis configuration --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 41abb51..c0cb24d 100755 --- a/.travis.yml +++ b/.travis.yml @@ -40,12 +40,14 @@ matrix: env: DB=MYSQL - php: hhvm env: DB=MYSQL + - php: 7.1 + env: DB=MYSQL CORE_RELEASE=3.6 before_script: - phpenv rehash - composer self-update || true - - git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support + - git clone git://github.com/silverstripe/silverstripe-travis-support.git ~/travis-support - php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss --require "silverstripe/comments" --require "silverstripe/widgets" - cd ~/builds/ss From abe6015a347d41a785d8ded19cdcccfb5600acd6 Mon Sep 17 00:00:00 2001 From: Rastislav Brandobur Date: Thu, 15 Jun 2017 02:00:40 +0200 Subject: [PATCH 09/11] added BlogMemberExtension definitions to lang subfolder --- lang/en.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lang/en.yml b/lang/en.yml index 9ba7ddd..891b51a 100755 --- a/lang/en.yml +++ b/lang/en.yml @@ -65,6 +65,9 @@ en: DESCRIPTION: 'Generic content page' PLURALNAME: 'Base Pages' SINGULARNAME: 'Blog Holder' + BlogMemberExtension: + BLOGPOSTS: 'Blog Posts' + TABBLOGPOSTS: 'Blog Posts' BlogPost: AUTHOR: Author AdditionalCredits: 'Additional Credits' From e5415b1ea805020209e64c9ea4fa06755035a79c Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Fri, 16 Jun 2017 09:11:22 +1200 Subject: [PATCH 10/11] Remove hhvm from Travis build matrix --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index c0cb24d..aa61385 100755 --- a/.travis.yml +++ b/.travis.yml @@ -21,8 +21,6 @@ env: - MODULE_PATH=blog matrix: - allow_failures: - - php: hhvm-nightly include: - php: 5.6 env: DB=MYSQL COVERAGE=1 @@ -38,8 +36,6 @@ matrix: env: DB=SQLITE - php: 5.3 env: DB=MYSQL - - php: hhvm - env: DB=MYSQL - php: 7.1 env: DB=MYSQL CORE_RELEASE=3.6 From d5340a87dce5939cd99dd8e25c55cc1bc7af679e Mon Sep 17 00:00:00 2001 From: Cam Findlay Date: Mon, 3 Jul 2017 13:56:26 +1200 Subject: [PATCH 11/11] FEATURE config to disable sending spam notifications --- code/extensions/BlogPostNotifications.php | 12 ++++++++++++ docs/en/configuring-notifications.md | 15 +++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 docs/en/configuring-notifications.md diff --git a/code/extensions/BlogPostNotifications.php b/code/extensions/BlogPostNotifications.php index e3d7ca2..f733b04 100644 --- a/code/extensions/BlogPostNotifications.php +++ b/code/extensions/BlogPostNotifications.php @@ -7,6 +7,12 @@ */ class BlogPostNotifications extends DataExtension { + /** + * Configure whether to send notifications even for spam comments + * @config + */ + private static $notification_on_spam = true; + /** * Notify all authors of notifications. * @@ -15,7 +21,13 @@ class BlogPostNotifications extends DataExtension */ public function updateNotificationRecipients(&$list, &$comment) { + //default is notification is on regardless of spam status $list = $this->owner->Authors(); + + // If comment is spam and notification are set to not send on spam clear the recipient list + if (Config::inst()->get(__CLASS__, 'notification_on_spam') == false && $comment->IsSpam) { + $list = array(); + } } /** diff --git a/docs/en/configuring-notifications.md b/docs/en/configuring-notifications.md new file mode 100644 index 0000000..6558838 --- /dev/null +++ b/docs/en/configuring-notifications.md @@ -0,0 +1,15 @@ +# Configuring notifications + +## Configuring whether notifications will send to authors of blogs if comments are spam + +Default behaviour using the `silverstripe/comment-notifications` module is to send notification to authors of comments occuring regardless if they are spam or not. + +In some cases you may wish to not send a notification email to an author if the comment is spam, this is a configurable option. + +Add the following into your yaml config: + +``` +BlogPostNotifications: + notification_on_spam: false +``` +