Merge branch 'release/0.10.1'

pagekit · Jan 11, 2016 · 099e142 · 099e142
2 parents 5872147 + 622439f
commit 099e142
Show file tree

Hide file tree

Showing 16 changed files with 225 additions and 99 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.10.1 (January 11, 2016)
+
+### Added
+- Link to login page at comment section
+
+### Changed
+- Set comment ordering to DESC at admin panel
+- Updated Vue resource
+
+### Fixed
+- Comments permalink
+
 ## 0.10.0 (December 15, 2015)
 
 ### Changed

diff --git a/app/components/post-settings.vue b/app/components/post-settings.vue
@@ -11,9 +11,9 @@
                 <v-editor id="post-content" :value.sync="post.content" :options="{markdown : post.data.markdown}"></v-editor>
             </div>
             <div class="uk-form-row">
-                <label class="uk-form-label">{{ 'Excerpt' | trans }}</label>
+                <label for="form-post-excerpt" class="uk-form-label">{{ 'Excerpt' | trans }}</label>
                 <div class="uk-form-controls">
-                    <v-editor id="post-content" :value.sync="post.excerpt" :options="{markdown : post.data.markdown, height: 250}"></v-editor>
+                    <v-editor id="post-excerpt" :value.sync="post.excerpt" :options="{markdown : post.data.markdown, height: 250}"></v-editor>
                 </div>
             </div>
 

diff --git a/app/views/comments.js b/app/views/comments.js
@@ -94,7 +94,7 @@ module.exports = {
                 },
 
                 permalink: function () {
-                    return $pagekit.url + this.config.post.url + '#comment-' + this.comment.id;
+                    return '#comment-' + this.comment.id;
                 }
 
             },
@@ -127,6 +127,10 @@ module.exports = {
 
                 user: function () {
                     return this.config.user;
+                },
+
+                login: function () {
+                    return this.$url('user/login', {redirect: window.location.href});
                 }
 
             },

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "pagekit/blog",
     "type": "pagekit-extension",
-    "version": "0.10.0",
+    "version": "0.10.1",
     "title": "Blog",
     "description": "A blog extensions with a built-in comment system.",
     "license": "MIT",

diff --git a/languages/bg_BG/messages.php b/languages/bg_BG/messages.php
@@ -24,7 +24,7 @@
   'Default post settings' => '',
   '{1} %count% Post selected|]1,Inf[ %count% Posts selected' => '',
   'Read more' => '',
-  'Image' => '',
+  'Image' => 'Изображение',
   'Posts' => 'Публикации',
   'Pending' => 'Изчакващ',
   'Comment' => 'Коментар',

diff --git a/languages/de_DE/messages.php b/languages/de_DE/messages.php
@@ -90,7 +90,7 @@
   'Comments are closed.' => 'Kommentare sind geschlossen.',
   'Close comments on articles older than' => 'Kommentare von Artikeln schließen, die älter sind als',
   'Cancel' => 'Abbrechen',
-  'Written by %name% on %date%' => 'Geschrieben von %Name% am %Date%',
+  'Written by %name% on %date%' => 'Geschrieben von %name% am %date%',
   'Enable nested comments of' => 'Verschachtelte Kommentare aktivieren für',
   'Restrict Access' => 'Zugriff einschränken',
   'Comment cannot be blank.' => 'Kommentar darf nicht leer sein.',

diff --git a/languages/hu_HU/messages.php b/languages/hu_HU/messages.php
@@ -73,7 +73,7 @@
   'Day and name' => 'Nap és név',
   'Options' => 'Egyéb opciók',
   'Field must be a valid email address.' => 'Hibás email cím formátum',
-  'levels deep.' => '',
+  'levels deep.' => 'szintek mélysége.',
   'Comments on %title%' => 'Hozzászólások a %title% tartalmon',
   'Insufficient User Rights.' => 'Elégtelen felhasználói jogok',
   'Copy' => 'Másolás',

diff --git a/languages/id_ID/messages.php b/languages/id_ID/messages.php
@@ -1,9 +1,9 @@
 <?php return array (
-  'Require e-mail.' => '',
+  'Require e-mail.' => 'E-mail diperlukan',
   'General' => 'Umum',
   'Show Avatars from Gravatar.' => 'Tampilan Avatar dari Gravatar.',
-  'Unable to comment. Please try again later.' => '',
-  'Submit' => '',
+  'Unable to comment. Please try again later.' => 'Tidak dapat berkomentar. Silakan coba lagi nanti.',
+  'Submit' => 'Submit',
   '{0} No pending|{1} One pending|]1,Inf[ %comments% pending' => '{0} Tidak ada yang tertunda|{1} Satu tertunda|]1,Inf[ %comments% tertunda',
   'Enable Comments' => 'Ijinkan Komentar',
   'Appearance' => 'Tampilan',
@@ -14,23 +14,23 @@
   'Slug' => 'Slug',
   'Email invalid.' => 'Email tidak valid',
   'Comment not found.' => 'Halaman tidak ditemukan.',
-  'Filter by' => '',
+  'Filter by' => 'Filter dengan',
   'Comments (%count%)' => '(%count%) Komentar',
   'Author' => 'Penulis',
   'Unapprove' => 'Jangan terima',
   '{1} %count% Comment selected|]1,Inf[ %count% Comments selected' => '{1} %count% komentar yang dipilih|]1,Inf[ %count% Komentar yang dipilih',
   'Insufficient user rights.' => 'Hak pengguna tidak cukup .',
-  'Posts View' => '',
+  'Posts View' => 'Lihat Post',
   'Default post settings' => 'Standar pengaturan post',
   '{1} %count% Post selected|]1,Inf[ %count% Posts selected' => '{1} %count% Posting yang dipilih|]1,Inf[ %count% Posting yang dipilih',
-  'Read more' => '',
+  'Read more' => 'Baca selengkapnya',
   'Image' => 'Gambar',
   'Posts' => 'Post',
   'Pending' => 'Tertunda',
   'Comment' => 'Komentar',
   'Approved' => 'Diterima',
   'Edit Post' => 'Edit Post',
-  'Thank you! Your comment needs approval before showing up.' => '',
+  'Thank you! Your comment needs approval before showing up.' => 'Terima kasih! Komentar anda memerlukan persetujuan sebelum ditayangkan.',
   'Pending Review' => 'Review tertunda',
   'Excerpt' => 'Ringkasan',
   'Edit' => 'Edit',
@@ -48,7 +48,7 @@
   'Please login to leave a comment.' => 'Silahkan masuk untuk meninggalkan komentar.',
   'Posts per page' => 'Post per halaman',
   'E-mail' => 'E-mail',
-  'latest last' => '',
+  'latest last' => 'terbaru terakhir',
   'Please wait another %seconds% seconds before commenting again.' => 'Silahkan tunggu %seconds% detik lagi sebelum berkomentar kembali.',
   'Delete' => 'Hapus',
   'Post not found.' => 'Post tidak ditemukan.',
@@ -59,7 +59,7 @@
   'Please provide valid name and email.' => 'Harap berikan nama dan email yang valid.',
   'You are not allowed to post comments.' => 'Anda tidak diperbolehkan untuk mengirimkan komentar.',
   'Author cannot be blank.' => 'Penulis tidak boleh kosong.',
-  'latest first' => '',
+  'latest first' => 'terbaru pertama',
   'Unpublished' => 'Tidak diterbitkan',
   'Mark as spam' => 'Tandai sebagai spam',
   'Custom' => 'Kustom',
@@ -99,7 +99,7 @@
   'Leave a comment' => 'Tinggalkan komentar',
   '{0} No comments|{1} %num% Comment|]1,Inf[ %num% Comments' => '{0} Tidak ada komentar|{1} %num% Komentar|]1,Inf[ %num% Komentar',
   'Post' => 'Post',
-  'View' => '',
+  'View' => 'Lihat',
   'Numeric' => 'Numerik',
   'Name' => 'Nama',
 );
diff --git a/languages/th/messages.php b/languages/th/messages.php
@@ -0,0 +1,105 @@
+<?php return array (
+  'Require e-mail.' => 'จำเป็นต้องใช้อีเมล์',
+  'General' => 'ทั่วไป',
+  'Show Avatars from Gravatar.' => 'แสดงรูปประจำตัวจาก Gravatar',
+  'Unable to comment. Please try again later.' => 'ไม่สามารถแสดงความเห็นได้ โปรดลองอีกครั้งภายหลัง',
+  'Submit' => 'ตกลง',
+  '{0} No pending|{1} One pending|]1,Inf[ %comments% pending' => '{0} ไม่มีการรอดำเนินการ|{1} หนึ่งความเห็นที่รอดำเนินการ|]1,Inf[ %comments% ดำเนินการ',
+  'Enable Comments' => 'เปิดใช้งานความคิดเห็น',
+  'Appearance' => 'ลักษณะ',
+  'Draft' => 'ฉบับร่าง',
+  'Approve' => 'อนุมัติ',
+  'Title' => 'หัวเรื่อง',
+  'Permalink' => 'ลิงก์ถาวร',
+  'Slug' => 'Slug',
+  'Email invalid.' => 'อีเมลไม่ถูกต้อง',
+  'Comment not found.' => 'ไม่พบความเห็น',
+  'Filter by' => 'คัดกรองโดย',
+  'Comments (%count%)' => 'ความเห็น (%count%)',
+  'Author' => 'ผู้เขียน',
+  'Unapprove' => 'ไม่อนุมัติ',
+  '{1} %count% Comment selected|]1,Inf[ %count% Comments selected' => '{1} %count% ความเห็นที่เลือก|]1,Inf[ %count% ความเห็นที่เลือก',
+  'Insufficient user rights.' => 'สิทธิ์ของผู้ใช้ไม่เพียงพอ',
+  'Posts View' => 'เข้าชมเรื่อง',
+  'Default post settings' => 'ค่าเริ่มต้นการตั้งค่าเรื่อง',
+  '{1} %count% Post selected|]1,Inf[ %count% Posts selected' => '{1} %count% เรื่องที่เลือก|]1,Inf[ %count% เรื่องที่เลือก',
+  'Read more' => 'อ่านต่อ',
+  'Image' => 'รูปภาพ',
+  'Posts' => 'เรื่อง',
+  'Pending' => 'รอดำเนินการ',
+  'Comment' => 'ความคิดเห็น',
+  'Approved' => 'ได้รับการอนุมัติ',
+  'Edit Post' => 'แก้ไขเรื่อง',
+  'Thank you! Your comment needs approval before showing up.' => 'ขอบคุณ! ความเห็นของคุณต้องอนุมัติก่อนขึ้นโชว์',
+  'Pending Review' => 'รอคอยการตรวจสอบ',
+  'Excerpt' => 'คำตัดทอน',
+  'Edit' => 'แก้ไข',
+  '{0} No pending|{1} One pending|]1,Inf[ %comments_pending% pending' => '{0} ไม่มีการรอดำเนินการ|{1} หนึ่งความเห็นที่รอดำเนินการ|]1,Inf[ %comments_pending% ดำเนินการ',
+  'Invalid post id.' => 'ไอดีเรื่องไม่ถูกต้อง',
+  'Blog' => 'บล็อก',
+  'Enter Title' => 'ระบุหัวเรื่อง',
+  'Logged in as %name%' => 'เข้าสู่ระบบในชื่อ %name%',
+  'Order comments by' => 'เรียงความเห็นโดย',
+  'Title cannot be blank.' => 'หัวเรื่องไม่สามารถเว้นว่างได้',
+  'Save' => 'บันทึก',
+  'Status' => 'สถานะ',
+  '{0} No post copied.|{1} Post copied.|]1,Inf[ Posts copied.' => '{0} ไม่มีการคัดลอกเรื่อง|{1} เรื่องถูกคัดลอก|]1,Inf[ เรื่องถูกคัดลอก.',
+  '{0} %count% Comments|{1} %count% Comment|]1,Inf[ %count% Comments' => '{0} %count% ความเห็น|{1} %count% ความเห็น|]1,Inf[ %count% ความเห็น',
+  'Please login to leave a comment.' => 'กรุณาเข้าสู่ระบบก่อนแสดงความคิดเห็น',
+  'Posts per page' => 'เรื่องต่อหน้า',
+  'E-mail' => 'อีเมล์',
+  'latest last' => 'รายการแรกสุดท้าย',
+  'Please wait another %seconds% seconds before commenting again.' => 'โปรดรอ %seconds% วินาที จึงจะแสดงความเห็นได้อีกครั้ง',
+  'Delete' => 'ลบ',
+  'Post not found.' => 'ไม่พบเรื่อง',
+  'No comments found.' => 'ไม่พบความคิดเห็น',
+  'Publish on' => 'เผยแพร่บน',
+  'Name cannot be blank.' => 'ชื่อไม่สามารถเว้นว่างได้',
+  'Invalid slug.' => 'slug ไม่ถูกต้อง',
+  'Please provide valid name and email.' => 'โปรดระบุชื่อที่ถูกต้องและอีเมล',
+  'You are not allowed to post comments.' => 'คุณยังไม่ได้รับอนุญาตให้แสดงความคิดเห็น',
+  'Author cannot be blank.' => 'ผู้เขียนไม่สามารถเว้นว่างได้',
+  'latest first' => 'รายการแรกล่าสุด',
+  'Unpublished' => 'ไม่ได้เผยแพร่แล้ว',
+  'Mark as spam' => 'ระบุว่าเป็นสแปม',
+  'Custom' => 'ปรับแต่ง',
+  'Published' => 'เผยแพร่แล้ว',
+  '{0} %count% Posts|{1} %count% Post|]1,Inf[ %count% Posts' => '{0} %count% เรื่อง|{1} %count% เรื่อง|]1,Inf[ %count% เรื่อง',
+  'Add Post' => 'เพิ่มเรื่อง',
+  'Date' => 'วันที่',
+  'Reply' => 'ตอบกลับ',
+  'Parent not found.' => 'ไม่พบหัวข้อหลัก',
+  'URL' => 'URL',
+  'Day and name' => 'วันที่และชื่อ',
+  'Options' => 'ตัวเลือก',
+  'Field must be a valid email address.' => 'ต้องระบุอีเมลที่ถูกต้อง',
+  'levels deep.' => 'ระดับความลึก',
+  'Comments on %title%' => 'ความเห็น %title%',
+  'Insufficient User Rights.' => 'สิทธิ์ของผู้ใช้ไม่เพียงพอ',
+  'Copy' => 'คัดลอก',
+  'Post not found!' => 'ไม่พบเรื่อง!',
+  'Blog Settings' => 'การตั้งค่าบล็อก',
+  'days.' => 'วัน',
+  'Email' => 'อีเมล',
+  'No posts found.' => 'ไม่พบเรื่อง',
+  'Enable Markdown' => 'เปิดใช้งาน Markdown',
+  'Comments' => 'ความเห็น',
+  'Content cannot be blank.' => 'เนื้อหาไม่สามารถเว้นว่างได้',
+  'Unknown' => 'ไม่ระบุ',
+  'Month and name' => 'เดือนและชื่อ',
+  'Comments are closed.' => 'ความคิดเห็นถูกปิด',
+  'Close comments on articles older than' => 'ปิดความเห็นบนบทความที่เก่ากว่า',
+  'Cancel' => 'ยกเลิก',
+  'Written by %name% on %date%' => 'เขียนโดย %name% ใน %date%',
+  'Enable nested comments of' => 'เปิดใช้งานความเห็นที่ซ้อนกันของ',
+  'Restrict Access' => 'จำกัดการเข้าถึง',
+  'Comment cannot be blank.' => 'ความเห็นไม่สามารถเว้นว่างได้',
+  'Access denied.' => 'ปฏิเสธการเข้าใช้',
+  'Spam' => 'สแปม',
+  'Leave a comment' => 'แสดงความคิดเห็น',
+  '{0} No comments|{1} %num% Comment|]1,Inf[ %num% Comments' => '{0} ไม่มีความเห็น|{1} %num% ความเห็น|]1,Inf[ %num% ความเห็น',
+  'Post' => 'เรื่อง',
+  'View' => 'เข้าชม',
+  'Numeric' => 'ตัวเลข',
+  'Name' => 'ชื่อ',
+);
diff --git a/languages/tr_TR/messages.php b/languages/tr_TR/messages.php
@@ -1,9 +1,9 @@
 <?php return array (
-  'Require e-mail.' => '',
+  'Require e-mail.' => 'Zorunlu e-posta.',
   'General' => 'Genel',
   'Show Avatars from Gravatar.' => 'Avatarlar Gravatar Üzerinden Görüntülensin',
-  'Unable to comment. Please try again later.' => '',
-  'Submit' => '',
+  'Unable to comment. Please try again later.' => 'Yorum yapılamaz. Lütfen daha sonra tekrar deneyiniz.',
+  'Submit' => 'Gönder',
   '{0} No pending|{1} One pending|]1,Inf[ %comments% pending' => '{0} Bekleyen yorum yok|{1} Bir yorum bekliyor|]1,Inf[ %comments% yorum bekliyor',
   'Enable Comments' => 'Yorumlar Kullanılsın',
   'Appearance' => 'Görünüm',
@@ -14,27 +14,27 @@
   'Slug' => 'Kısaltma',
   'Email invalid.' => 'E-posta geçersiz.',
   'Comment not found.' => 'Yorum bulunamadı.',
-  'Filter by' => '',
+  'Filter by' => 'Filtrele',
   'Comments (%count%)' => 'Yorumlar (%count%)',
   'Author' => 'Yazar',
   'Unapprove' => 'Onaylama',
-  '{1} %count% Comment selected|]1,Inf[ %count% Comments selected' => '',
+  '{1} %count% Comment selected|]1,Inf[ %count% Comments selected' => '{1} %count% Yorum seçildi|]1,Inf[ %count% Yorum seçildi',
   'Insufficient user rights.' => 'Yetersiz kullanıcı yetkisi',
-  'Posts View' => '',
-  'Default post settings' => '',
-  '{1} %count% Post selected|]1,Inf[ %count% Posts selected' => '',
-  'Read more' => '',
+  'Posts View' => 'Yazılar Görünümü',
+  'Default post settings' => 'Varsayılan yazı ayarları',
+  '{1} %count% Post selected|]1,Inf[ %count% Posts selected' => '{1} %count% Yazı seçildi|]1,Inf[ %count% Yazı seçildi',
+  'Read more' => 'Devamını oku',
   'Image' => 'Görsel',
   'Posts' => 'Yazılar',
   'Pending' => 'Bekleyen',
   'Comment' => 'Yorum',
   'Approved' => 'Onaylanmış',
   'Edit Post' => 'Yazıyı Düzenle',
-  'Thank you! Your comment needs approval before showing up.' => '',
+  'Thank you! Your comment needs approval before showing up.' => 'Teşekkürler. Yorumunuz yayınlanmak için onay bekliyor.',
   'Pending Review' => 'İncelenmeyi Bekliyor',
   'Excerpt' => 'Alıntı',
   'Edit' => 'Düzenle',
-  '{0} No pending|{1} One pending|]1,Inf[ %comments_pending% pending' => '',
+  '{0} No pending|{1} One pending|]1,Inf[ %comments_pending% pending' => '{0} Bekleyen yok|{1} Bir bekleyen|]1,Inf[ %comments_pending% bekleyen',
   'Invalid post id.' => 'Geçersiz yazı kodu.',
   'Blog' => 'Blog',
   'Enter Title' => 'Başlık Yazın',
@@ -44,35 +44,35 @@
   'Save' => 'Kaydet',
   'Status' => 'Durum',
   '{0} No post copied.|{1} Post copied.|]1,Inf[ Posts copied.' => '{0} Hiç bir yazı kopyalanmadı.|{1} yazı kopyalandı.|]1,Inf[ yazı kopyalandı.',
-  '{0} %count% Comments|{1} %count% Comment|]1,Inf[ %count% Comments' => '',
+  '{0} %count% Comments|{1} %count% Comment|]1,Inf[ %count% Comments' => '{0} %count% Yorumlar|{1} %count% Yorum|]1,Inf[ %count% Yorumlar',
   'Please login to leave a comment.' => 'Yorum yapmak için lütfen oturum açın.',
-  'Posts per page' => '',
+  'Posts per page' => 'Sayfa da görüntülenecek yazı ',
   'E-mail' => 'E-posta',
-  'latest last' => '',
+  'latest last' => 'yeniden eskiye',
   'Please wait another %seconds% seconds before commenting again.' => 'Lütfen yeniden yorum yazabilmek için %seconds% saniye bekleyin.',
   'Delete' => 'Sil',
-  'Post not found.' => '',
+  'Post not found.' => 'Yazı bulunamadı!',
   'No comments found.' => 'Henüz bir yorum yok.',
   'Publish on' => 'Yayınlanma',
-  'Name cannot be blank.' => '',
-  'Invalid slug.' => '',
+  'Name cannot be blank.' => 'İsim boş bırakılamaz.',
+  'Invalid slug.' => 'Geçersiz kısaltma',
   'Please provide valid name and email.' => 'Geçerli bir ad ve e-posta yazın.',
   'You are not allowed to post comments.' => 'Yorum gönderme izniniz yok.',
   'Author cannot be blank.' => 'Yazar boş bırakılamaz.',
-  'latest first' => '',
+  'latest first' => 'eskiden yeniye',
   'Unpublished' => 'Yayınlanmamış',
   'Mark as spam' => 'Istenmeyen olarak işaretle',
   'Custom' => 'İsteğe göre uyarlanmış',
   'Published' => 'Yayınlanmış',
-  '{0} %count% Posts|{1} %count% Post|]1,Inf[ %count% Posts' => '',
+  '{0} %count% Posts|{1} %count% Post|]1,Inf[ %count% Posts' => '{0} %count% Yazılar|{1} %count% Yazı]1,Inf[ %count% Yazılar',
   'Add Post' => 'Yazı Ekle',
   'Date' => 'Tarih',
   'Reply' => 'Yanıt',
-  'Parent not found.' => '',
+  'Parent not found.' => 'Yol bulunamadı.',
   'URL' => 'URL',
   'Day and name' => 'Gün ve ad',
   'Options' => 'Seçenekler',
-  'Field must be a valid email address.' => '',
+  'Field must be a valid email address.' => 'Alanda geçerli bir e-posta adresi olmalıdır.',
   'levels deep.' => 'derinlik düzeyi.',
   'Comments on %title%' => '%title% yorumları',
   'Insufficient User Rights.' => 'Yetersiz Kullanıcı Yetkisi.',
@@ -87,7 +87,7 @@
   'Content cannot be blank.' => 'İçerik boş bırakılamaz',
   'Unknown' => 'Bilinmeyen',
   'Month and name' => 'Ay ve ad',
-  'Comments are closed.' => '',
+  'Comments are closed.' => 'Yorumlar kapatıldı.',
   'Close comments on articles older than' => 'Şu tarihten önceki yazılar yoruma kapatılsın:',
   'Cancel' => 'İptal',
   'Written by %name% on %date%' => '%date% tarihinde %name% tarafından yazılmıştır.',
@@ -99,7 +99,7 @@
   'Leave a comment' => 'Bir yorum yapın',
   '{0} No comments|{1} %num% Comment|]1,Inf[ %num% Comments' => '{0} Yorum Yok|{1} %num% Yorum|]1,Inf[ %num% Yorum',
   'Post' => 'Yazı',
-  'View' => '',
+  'View' => 'Görünüm',
   'Numeric' => 'Sayısal',
   'Name' => 'Ad',
 );