Merge branch 'release/4.2.3'

* release/4.2.3: (32 commits)
  updates the changelog
  added a user check in the setup command before seeding data
  updated the login translation string for pt-BR
  updates the changelog
  Apply fixes from StyleCI (#504)
  renames language files from pt to pt-BR #500
  updated translations for #498
  added support for assigning topics and tags to the demo posts
  compiled assets
  fixed translation issues
  refactored view trends to a single trait
  Apply fixes from StyleCI (#503)
  minor refactor of the StoreViewData listener
  minor refactor of the ViewThrottle middleware
  refactored faker words to text
  Apply fixes from StyleCI (#502)
  added the seed method to the setup command
  Removed the toFixed() method call on small numbers in the post list component
  refactored the routes
  Apply fixes from StyleCI (#501)
  ...

changelog.md

@@ -2,6 +2,20 @@
 
 ## [Unreleased](https://github.com/cnvs/canvas/compare/master...develop)
 
+## [4.2.3](https://github.com/cnvs/canvas/compare/v4.2.2...v4.2.3)
+
+## Changed
+- Refactored the `pt` language files to `pt-BR` ([#500](https://github.com/cnvs/canvas/issues/500), [865b392](https://github.com/cnvs/canvas/commit/865b392e9205bba15bc7d24ec4045743a62a574f))
+
+## Added
+- Added canonical link support to improve SEO ([#498](https://github.com/cnvs/canvas/pull/498))
+- Added multilingual support for Hindi ([047c299](https://github.com/cnvs/canvas/commit/047c299b37228a8690de802f446a8c342a795f5b))
+- Added a `--data` option for the setup command that will seed demo content ([#494](https://github.com/cnvs/canvas/issues/494), [009a5fb](https://github.com/cnvs/canvas/commit/009a5fb8dbc59876c532d5f1157ae66c347b8b2c))
+
+## Fixed
+- Patch for the default template to utilize the correct meta tags ([#496](https://github.com/cnvs/canvas/issues/496), [acff60c](https://github.com/cnvs/canvas/commit/acff60c546d77766de62b583e90f07855b0c54aa))
+- Removed a bad method call in the post list component ([0f373ae](https://github.com/cnvs/canvas/commit/0f373aed96e9cdce57a5174f940cef175fd3e4eb))
+
 ## [4.2.2](https://github.com/cnvs/canvas/compare/v4.2.1...v4.2.2)
 
 ## Changed

public/mix-manifest.json

@@ -1,7 +1,7 @@
 {
-    "/js/app.js": "/js/app.js?id=767a911cb95bfbbd5cca",
-    "/css/app.css": "/css/app.css?id=eb7fb7a5d8ba4b6dd0a4",
-    "/css/app-dark.css": "/css/app-dark.css?id=799369a3e5ded6772726",
-    "/js/app.js.map": "/js/app.js.map?id=5729db3fcef3925224ce",
+    "/js/app.js": "/js/app.js?id=69680342879d37e1aef8",
+    "/css/app.css": "/css/app.css?id=15945757b23b49162087",
+    "/css/app-dark.css": "/css/app-dark.css?id=dccaea5a525f30b7cc3b",
+    "/js/app.js.map": "/js/app.js.map?id=b09993e9aa65cf13f2d1",
     "/favicon.ico": "/favicon.ico?id=dbb0c05daa3432643753"
 }

resources/js/components/PostList.vue

@@ -29,32 +29,32 @@
              *
              * @return string
              */
-            suffixedNumber(n) {
-                let format = '';
+            suffixedNumber(number) {
+                let formatted = '';
                 let suffix = '';
 
-                if (n < 900) {
-                    format = n.toFixed();
+                if (number < 900) {
+                    formatted = number;
                     suffix = '';
-                } else if (n < 900000) {
-                    let n_total = n / 1000;
-                    format = parseFloat(n_total.toFixed(1));
+                } else if (number < 900000) {
+                    let n_total = number / 1000;
+                    formatted = parseFloat(n_total.toFixed(1));
                     suffix = 'K';
-                } else if (n < 900000000) {
-                    let n_total = n / 1000000;
-                    format = parseFloat(n_total.toFixed(1));
+                } else if (number < 900000000) {
+                    let n_total = number / 1000000;
+                    formatted = parseFloat(n_total.toFixed(1));
                     suffix = 'M';
-                } else if (n < 900000000000) {
-                    let n_total = n / 1000000000;
-                    format = parseFloat(n_total.toFixed(1));
+                } else if (number < 900000000000) {
+                    let n_total = number / 1000000000;
+                    formatted = parseFloat(n_total.toFixed(1));
                     suffix = 'B';
                 } else {
-                    let n_total = n / 1000000000000;
-                    format = parseFloat(n_total.toFixed(1));
+                    let n_total = number / 1000000000000;
+                    formatted = parseFloat(n_total.toFixed(1));
                     suffix = 'T';
                 }
 
-                return format + suffix;
+                return formatted + suffix;
             }
         },
 

resources/lang/ar/mail.php

@@ -5,17 +5,15 @@
     'general' => [
         'sent_by' => 'أرسلت بواسطة',
     ],
-
-    'digest' => [
+    'digest'  => [
         'summary'         => 'ملخص الكاتب الأسبوعي لـ',
-        'details'         => 'مشاركاتك على قماش',
+        'details'         => 'مشاركاتك على Canvas',
         'from'            => 'من عند',
         'to'              => 'إلى',
         'data'            => 'تلقى مشاركاتك',
         'views'           => 'الآراء)',
         'views_this_week' => 'عرض (ق) هذا الأسبوع',
-
-        'email' => [
+        'email'           => [
             'subject' => 'احصائيات لمشاركاتك',
         ],
     ],

resources/lang/ar/posts.php

@@ -73,9 +73,9 @@
             ],
         ],
         'seo'      => [
-            'header'   => 'كبار المسئولين الاقتصاديين والاجتماعية',
-            'meta'     => 'ميتا الوصف',
-            'facebook' => [
+            'header'    => 'كبار المسئولين الاقتصاديين والاجتماعية',
+            'meta'      => 'ميتا الوصف',
+            'facebook'  => [
                 'title'       => [
                     'label'       => 'عنوان بطاقة فيسبوك',
                     'placeholder' => 'العنوان في بطاقة فيسبوك',
@@ -85,7 +85,7 @@
                     'placeholder' => 'الوصف في الفيسبوك بطاقة',
                 ],
             ],
-            'twitter'  => [
+            'twitter'   => [
                 'title'       => [
                     'label'       => 'عنوان بطاقة تويتر',
                     'placeholder' => 'العنوان في بطاقة تويتر',
@@ -95,6 +95,10 @@
                     'placeholder' => 'الوصف في بطاقة تويتر',
                 ],
             ],
+            'canonical' => [
+                'label'       => 'العنوان الأساسي',
+                'placeholder' => 'URL الكنسي من المصدر الأصلي',
+            ],
         ],
         'settings' => [
             'header'  => 'الاعدادات العامة',

resources/lang/cn/mail.php

@@ -5,17 +5,15 @@
     'general' => [
         'sent_by' => '由..送出',
     ],
-
-    'digest' => [
+    'digest'  => [
         'summary'         => '您的每周作家摘要',
-        'details'         => '你在Canvas上的帖子',
+        'details'         => '你的帖子 Canvas',
         'from'            => '从',
         'to'              => '至',
         'data'            => '收到你的帖子',
         'views'           => '视图（s）',
         'views_this_week' => '查看本周',
-
-        'email' => [
+        'email'           => [
             'subject' => '您的帖子的统计信息',
         ],
     ],

resources/lang/cn/posts.php

@@ -73,9 +73,9 @@
             ],
         ],
         'seo'      => [
-            'header'   => 'SEO和社交',
-            'meta'     => '元描述',
-            'facebook' => [
+            'header'    => 'SEO和社交',
+            'meta'      => '元描述',
+            'facebook'  => [
                 'title'       => [
                     'label'       => '',
                     'placeholder' => 'Facebook Card的標題',
@@ -85,7 +85,7 @@
                     'placeholder' => 'Facebook Card中的描述',
                 ],
             ],
-            'twitter'  => [
+            'twitter'   => [
                 'title'       => [
                     'label'       => 'Twitter卡片標題',
                     'placeholder' => 'Twitter卡片中的標題',
@@ -95,6 +95,10 @@
                     'placeholder' => 'Twitter卡中的描述',
                 ],
             ],
+            'canonical' => [
+                'label'       => '典范',
+                'placeholder' => '原始来源的规范URL',
+            ],
         ],
         'settings' => [
             'header'  => '常規設置',

resources/lang/de/mail.php

@@ -5,17 +5,15 @@
     'general' => [
         'sent_by' => 'Gesendet von',
     ],
-
-    'digest' => [
+    'digest'  => [
         'summary'         => 'Deine wöchentliche Autorenübersicht für',
-        'details'         => 'Ihre Beiträge auf Leinwand',
+        'details'         => 'Deine Beiträge auf Canvas',
         'from'            => 'Von',
         'to'              => 'zu',
         'data'            => 'Ihre Beiträge erhalten',
         'views'           => 'Ansicht(en)',
         'views_this_week' => 'Ansicht(en) diese Woche',
-
-        'email' => [
+        'email'           => [
             'subject' => 'Statistiken für Ihre Beiträge',
         ],
     ],

resources/lang/de/posts.php

@@ -73,9 +73,9 @@
             ],
         ],
         'seo'      => [
-            'header'   => 'SEO & Soziales',
-            'meta'     => 'Meta-Beschreibung',
-            'facebook' => [
+            'header'    => 'SEO & Soziales',
+            'meta'      => 'Meta-Beschreibung',
+            'facebook'  => [
                 'title'       => [
                     'label'       => 'Facebook-Kartentitel',
                     'placeholder' => 'Titel in der Facebook-Karte',
@@ -85,7 +85,7 @@
                     'placeholder' => 'Beschreibung in der Facebook-Karte',
                 ],
             ],
-            'twitter'  => [
+            'twitter'   => [
                 'title'       => [
                     'label'       => 'Twitter-Kartentitel',
                     'placeholder' => 'Titel in der Twitter-Karte',
@@ -95,6 +95,10 @@
                     'placeholder' => 'Beschreibung in Twitter Card',
                 ],
             ],
+            'canonical' => [
+                'label'       => 'Kanonisch',
+                'placeholder' => 'Kanonische URL der Originalquelle',
+            ],
         ],
         'settings' => [
             'header'  => 'Allgemeine Einstellungen',

resources/lang/en/mail.php

@@ -5,17 +5,15 @@
     'general' => [
         'sent_by' => 'Sent by',
     ],
-
-    'digest' => [
+    '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' => [
+        'email'           => [
             'subject' => 'Stats for your posts',
         ],
     ],

resources/lang/en/posts.php

@@ -73,9 +73,9 @@
             ],
         ],
         'seo'      => [
-            'header'   => 'SEO & Social',
-            'meta'     => 'Meta Description',
-            'facebook' => [
+            'header'    => 'SEO & Social',
+            'meta'      => 'Meta Description',
+            'facebook'  => [
                 'title'       => [
                     'label'       => 'Facebook Card Title',
                     'placeholder' => 'Title in Facebook Card',
@@ -85,7 +85,7 @@
                     'placeholder' => 'Description in Facebook Card',
                 ],
             ],
-            'twitter'  => [
+            'twitter'   => [
                 'title'       => [
                     'label'       => 'Twitter Card Title',
                     'placeholder' => 'Title in Twitter Card',
@@ -95,6 +95,10 @@
                     'placeholder' => 'Description in Twitter Card',
                 ],
             ],
+            'canonical' => [
+                'label'       => 'Canonical',
+                'placeholder' => 'Canonical URL of original source',
+            ],
         ],
         'settings' => [
             'header'  => 'General settings',

resources/lang/es/mail.php

@@ -5,17 +5,15 @@
     'general' => [
         'sent_by' => 'Enviado por',
     ],
-
-    'digest' => [
+    'digest'  => [
         'summary'         => 'Su resumen semanal del escritor para',
         'details'         => 'Tus publicaciones en Canvas',
         'from'            => 'Desde',
         'to'              => 'a',
         'data'            => 'tus mensajes recibidos',
         'views'           => 'Puntos de vista',
         'views_this_week' => 'Ver(s) esta semana',
-
-        'email' => [
+        'email'           => [
             'subject' => 'Estadísticas para tus publicaciones.',
         ],
     ],

resources/lang/es/posts.php

@@ -73,9 +73,9 @@
             ],
         ],
         'seo'      => [
-            'header'   => 'SEO y Social',
-            'meta'     => 'Metadescripción',
-            'facebook' => [
+            'header'    => 'SEO y Social',
+            'meta'      => 'Metadescripción',
+            'facebook'  => [
                 'title'       => [
                     'label'       => 'Título de la tarjeta de Facebook',
                     'placeholder' => 'Título en la tarjeta de Facebook',
@@ -85,7 +85,7 @@
                     'placeholder' => 'Descripción en la tarjeta de Facebook',
                 ],
             ],
-            'twitter'  => [
+            'twitter'   => [
                 'title'       => [
                     'label'       => 'Titulo de la tarjeta de Twitter',
                     'placeholder' => 'Título en la tarjeta de Twitter',
@@ -95,6 +95,10 @@
                     'placeholder' => 'Descripción en la tarjeta de Twitter',
                 ],
             ],
+            'canonical' => [
+                'label'       => 'Canónico',
+                'placeholder' => 'URL canónica de fuente original',
+            ],
         ],
         'settings' => [
             'header'  => 'Configuración general',

resources/lang/fr/mail.php

@@ -5,17 +5,15 @@
     'general' => [
         'sent_by' => 'Envoyée par',
     ],
-
-    'digest' => [
+    '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' => [
+        'email'           => [
             'subject' => 'Statistiques pour vos messages',
         ],
     ],