Merge branch 'release/4.1.38'

* release/4.1.38: (21 commits) updates the changelog updates the changelog updates the readme added multilingual support for Russian wip updated the number formats on summary view counts updates the changelog compile assets updates the readme wip refactored the scheduler in the service provider and updated the config added translations for the summary digest e-mail Apply fixes from StyleCI (#479) wip work Apply fixes from StyleCI (#478) initial push for weekly email digest added the styleci config Apply fixes from StyleCI (#477) renamed PostTags to PostsTags ...
austintoddj · May 21, 2019 · 64e2167 · 64e2167
2 parents 4db5fbc + bcd1af9
commit 64e2167
Show file tree

Hide file tree

Showing 29 changed files with 1,190 additions and 174 deletions.
diff --git a/.styleci.yml b/.styleci.yml
@@ -0,0 +1 @@
+preset: laravel
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,24 @@
 # Release Notes
 
+## [v4.1.38](https://github.com/cnvs/canvas/compare/v4.1.37...v4.1.38)
+
+### Changed
+- Refactored `PostTags` to `PostsTags` ([f091d32](https://github.com/cnvs/canvas/commit/f091d322430c27b2b29c8356bc68cde532b1eff1))
+
+### Added
+- Added support for a weekly digest e-mail ([7d385bd](https://github.com/cnvs/canvas/commit/7d385bd9da3a4a37ded04373c67203f35f531f19))
+- Added multilingual support for Russian ([418ad29](https://github.com/cnvs/canvas/commit/418ad290637cef92a8d561c0471af28f468c8e7b))
+
+## [v4.1.37](https://github.com/cnvs/canvas/compare/v4.1.36...v4.1.37)
+
+### Changed
+- Minor updates to the sponsorship page ([91a6ff5](https://github.com/cnvs/canvas/commit/91a6ff598821fe76627398be6b725c2ad3cb522c))
+
+## [v4.1.36](https://github.com/cnvs/canvas/compare/v4.1.35...v4.1.36)
+
+### Added
+- Added sponsor information ([6476549](https://github.com/cnvs/canvas/commit/64765492e228ac859399054f7aee05e5fcf07b33))
+
 ## [v4.1.35](https://github.com/cnvs/canvas/compare/v4.1.34...v4.1.35)
 
 ### Changed

diff --git a/config/canvas.php b/config/canvas.php
@@ -47,4 +47,19 @@
         'access_key' => env('CANVAS_UNSPLASH_ACCESS_KEY'),
     ],
 
+    /*
+   |--------------------------------------------------------------------------
+   | Weekly Summary Digest
+   |--------------------------------------------------------------------------
+   |
+   | This option enables Canvas to send notifications via e-mail. A weekly
+   | summary digest will be delivered via the default mail driver. This
+   | will provide helpful insights into your content and its impact.
+   |
+   */
+
+    'mail' => [
+        'enabled' => env('CANVAS_MAIL_ENABLED', false),
+    ],
+
 ];
diff --git a/readme.md b/readme.md
@@ -54,6 +54,20 @@ If you want to include [Unsplash](https://unsplash.com) images in your post cont
 ],
 ```
 
+**Want a weekly summary?** Canvas provides support for a weekly digest e-mail that includes detailed stats on content you've authored, delivered straight to your inbox. Once your application is [configured for sending mail](https://laravel.com/docs/5.8/mail), update `config/canvas.php`:
+
+```php
+'mail' => [
+    'enabled' => env('CANVAS_MAIL_ENABLED', false),
+],
+```
+
+Since the weekly summary e-mail runs on [Laravel's Scheduler](https://laravel.com/docs/5.8/scheduling#introduction), you'll need to add the following cron entry to your server:
+
+```bash
+* * * * * cd /path-to-your-project && php artisan schedule:run >> /dev/null 2>&1
+```
+
 ## Updates
 
 You may update your Canvas installation using composer:

diff --git a/resources/lang/cn/mail.php b/resources/lang/cn/mail.php
@@ -0,0 +1,23 @@
+<?php
+
+return [
+
+    'general' => [
+        'sent_by' => '由..送出',
+    ],
+
+    'digest' => [
+        'summary'         => '您的每周作家摘要',
+        'details'         => '你在Canvas上的帖子',
+        'from'            => '从',
+        'to'              => '至',
+        'data'            => '收到你的帖子',
+        'views'           => '视图（s）',
+        'views_this_week' => '查看本周',
+
+        'email' => [
+            'subject' => '您的帖子的统计信息',
+        ],
+    ],
+
+];
diff --git a/resources/lang/en/mail.php b/resources/lang/en/mail.php
@@ -0,0 +1,23 @@
+<?php
+
+return [
+
+    'general' => [
+        'sent_by' => 'Sent by',
+    ],
+
+    'digest' => [
+        'summary'         => 'Your weekly writer summary for',
+        'details'         => 'Your posts on Canvas',
+        'from'            => 'From',
+        'to'              => 'to',
+        'data'            => 'your posts received',
+        'views'           => 'View(s)',
+        'views_this_week' => 'View(s) this week',
+
+        'email' => [
+            'subject' => 'Stats for your posts',
+        ],
+    ],
+
+];
diff --git a/resources/lang/fr/mail.php b/resources/lang/fr/mail.php
@@ -0,0 +1,23 @@
+<?php
+
+return [
+
+    'general' => [
+        'sent_by' => 'Envoyée par',
+    ],
+
+    'digest' => [
+        'summary'         => 'Votre résumé de rédacteur hebdomadaire pour',
+        'details'         => 'Vos messages sur Canvas',
+        'from'            => 'De',
+        'to'              => 'à',
+        'data'            => 'vos messages reçus',
+        'views'           => 'Vue(s)',
+        'views_this_week' => 'Vue(s) cette semaine',
+
+        'email' => [
+            'subject' => 'Statistiques pour vos messages',
+        ],
+    ],
+
+];
diff --git a/resources/lang/pt/mail.php b/resources/lang/pt/mail.php
@@ -0,0 +1,23 @@
+<?php
+
+return [
+
+    'general' => [
+        'sent_by' => 'Enviado por',
+    ],
+
+    'digest' => [
+        'summary'         => 'Seu resumo do escritor semanal para',
+        'details'         => 'Suas postagens na tela',
+        'from'            => 'De',
+        'to'              => 'para',
+        'data'            => 'suas postagens recebidas',
+        'views'           => 'Vista(s)',
+        'views_this_week' => 'Ver(s) esta semana',
+
+        'email' => [
+            'subject' => 'Estatísticas para suas postagens',
+        ],
+    ],
+
+];
diff --git a/resources/lang/ru/blog.php b/resources/lang/ru/blog.php
@@ -0,0 +1,34 @@
+<?php
+
+return [
+
+    'title'   => 'Блог',
+    'buttons' => [
+        'learn' => 'Учить больше',
+        'next'  => 'Читать это дальше',
+        'enjoy' => 'Вы могли бы наслаждаться',
+        'edit'  => 'Редактировать сообщение',
+        'stats' => 'Посмотреть статистику',
+    ],
+    'empty'   => [
+        'description' => 'Посты не найдены, начните с',
+        'action'      => 'добавление нового поста',
+    ],
+    'nav'     => [
+        'user' => [
+            'posts'  => 'Сообщений',
+            'tags'   => 'Теги',
+            'topics' => 'темы',
+            'stats'  => 'Статистика',
+            'login'  => 'войти в систему',
+            'logout' => 'выход',
+        ],
+    ],
+    'posts'   => [
+        'label' => 'Недавние Посты',
+    ],
+    'tags'    => [
+        'label' => 'Теги',
+    ],
+
+];
diff --git a/resources/lang/ru/buttons.php b/resources/lang/ru/buttons.php
@@ -0,0 +1,33 @@
+<?php
+
+return [
+
+    'general' => [
+        'cancel' => 'отменить',
+        'delete' => 'удалять',
+        'done'   => 'Готово',
+        'load'   => 'Показать больше',
+        'save'   => 'Сохранить',
+        'next'   => 'Следущая страница',
+    ],
+    'posts'   => [
+        'create'   => 'Новый пост',
+        'edit'     => 'Редактировать сообщение',
+        'update'   => 'Обновить сообщение',
+        'save'     => 'Сохранить и опубликовать',
+        'schedule' => 'График публикации',
+    ],
+    'stats'   => [
+        'index' => 'Посмотреть всю статистику',
+        'show'  => 'подробности',
+    ],
+    'tags'    => [
+        'create' => 'Новый тег',
+        'update' => 'Сохранить изменения',
+    ],
+    'topics'  => [
+        'create' => 'Новая тема',
+        'update' => 'Сохранить изменения',
+    ],
+
+];
diff --git a/resources/lang/ru/mail.php b/resources/lang/ru/mail.php
@@ -0,0 +1,23 @@
+<?php
+
+return [
+
+    'general' => [
+        'sent_by' => 'Отправлено от',
+    ],
+
+    'digest' => [
+        'summary'         => 'Ваше еженедельное резюме для писателя',
+        'details'         => 'Ваши посты на холсте',
+        'from'            => 'От',
+        'to'              => 'в',
+        'data'            => 'ваши сообщения получены',
+        'views'           => 'Просмотры)',
+        'views_this_week' => 'Просмотр (ы) на этой неделе',
+
+        'email' => [
+            'subject' => 'Статистика для ваших сообщений',
+        ],
+    ],
+
+];
diff --git a/resources/lang/ru/nav.php b/resources/lang/ru/nav.php
@@ -0,0 +1,26 @@
+<?php
+
+return [
+
+    'context'  => [
+        'published' => 'опубликованный',
+        'draft'     => 'Проект',
+    ],
+    'notify'   => [
+        'success' => 'Сохраненный!',
+    ],
+    'user'     => [
+        'posts'  => 'Сообщений',
+        'tags'   => 'Теги',
+        'topics' => 'темы',
+        'stats'  => 'Статистика',
+        'logout' => 'выход',
+    ],
+    'controls' => [
+        'stats'    => 'Посмотреть статистику',
+        'settings' => 'Общие настройки',
+        'image'    => 'Популярное изображение',
+        'seo'      => 'SEO и социальные сети',
+    ],
+
+];