From ec918b43cfa8c23a562a64a050e277267fa2da9c Mon Sep 17 00:00:00 2001 From: Jus de Patate_ Date: Wed, 3 Jun 2020 14:16:24 +0200 Subject: [PATCH 1/8] add french translation --- lang/fr.ini | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 lang/fr.ini diff --git a/lang/fr.ini b/lang/fr.ini new file mode 100644 index 0000000..bcc4f9a --- /dev/null +++ b/lang/fr.ini @@ -0,0 +1,86 @@ +About = "A propos" +Add_category = "Ajouter une catégorie" +Add_content = "Ajouter du contenu" +Add_sub = "Ajouter une sous-page" +Admin = "Administrateur" +All_blog_posts = "Tous les billets de blog" +Archives = "Archives" +Are_you_sure_you_want_to_delete_ = "Êtes-vous sûr que de vouloir supprimer %s?" +Audio_post = "Billet audio" +Audio_post_comment = "Créer un billet de blog avec un fichier audio" +Author = "Auteur" +Backup = "Sauvegarde" +Cancel = "Annuler" +Categories = "Catégories" +Category = "Catégorie" +Clear_cache = "Nettoyer le cache" +Config = "Configuration" +Contents = "Contenus" +Created = "Créé" +Delete = "Supprimer" +Description = "Description" +Draft = "Brouillon" +Edit = "Éditer" +Edit_profile = "Éditer le profil" +Filename = "Nom du fichier" +Follow = "Suivre" +Image_post = "Billet avec une image" +Image_post_comment = "Créer un billet de blog avec une image" +Import = "Importer" +Link_post = "Billet avec un lien" +Link_post_comment = "Créer un billet de blog avec un lien" +Login = "Connexion" +Login_page = "Page de connexion" +Logout = "Déconnexion" +Meta_description = "Meta-description" +Mine = "Mes billets" +More = "Plus" +My_draft = "Mes brouillons" +My_posts = "Mes billets" +Newer = "Plus récent" +Next = "Suivant" +Next_post = "Billet suivant" +No_draft_found = "Aucun brouillon trouvé" +No_posts_found = "Aucun billet trouvé" +No_related_post_found = "Aucun billet en rapport trouvé" +Older = "Plus vieux" +Operations = "Opérations" +Popular_posts = "Billets populaires" +Popular_tags = "Tags populaires" +Posted_in = "Posté en" +Posted_on = "Posté le" +Posts = "Billets" +Prev = "Ancien" +Prev_post = "Billet précédent" +Publish = "Publier" +Publish_draft = "Publier le brouillon" +Published = "Publié" +Quote_post = "Billet avec une citation" +Quote_post_comment = "Créer un billet avec un citation" +Recent_posts = "Billets récents" +Regular_post = "Billet simple" +Regular_post_comment = "Créer un billet de blog simple" +Related_posts = "Billets en rapport" +Revert_to_draft = "Retourner en brouillon" +Save = "Enregistrer" +Save_as_draft = "Enregistrer en brouillon" +Search = "Recherche" +Search_for = "Rechercher pour" +Static_page = "Page statique" +Static_page_comment = "Créer une page statique" +Static_pages = "Pages statiques" +Tag = "Tag" +Tags = "Tags" +Title = "Titre" +Uncategorized = "Sans catégorie" +Uncategorized_comment = "Sujets qui n'ont pas besoin de catégorie, ou qui ne conviennent a aucun catégorie existante" +Update = "Mise à jour" +Update_draft = "Mettre à jour le brouillon" +Update_post = "Mettre à jour le billet" +Video_post = "Mettre à jour la vidéo" +Video_post_comment = "Créer un billet de blog avec une vidéo" +View = "Voir" +Views = "Vues" +Your_recent_posts = "Vos billets récents" +by = "par" +read_more = "lire plus" From d98058d6c84d8907b72b5b43f1190b496799695f Mon Sep 17 00:00:00 2001 From: Jus de Patate_ Date: Wed, 3 Jun 2020 14:20:52 +0200 Subject: [PATCH 2/8] ignore config files to ease `git pull`s in prod --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 3ddc1e9..0401add 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ /cache/* /content/* +/config/config.ini +/config/users/*.ini From 79baa2eb15697e6be57e9c83b2a9ab2094cbde67 Mon Sep 17 00:00:00 2001 From: Jus de Patate_ Date: Wed, 3 Jun 2020 14:24:27 +0200 Subject: [PATCH 3/8] correct field for encyption is `password_hash` not `bcrypt` --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e4121f4..c1deada 100644 --- a/README.md +++ b/README.md @@ -137,7 +137,7 @@ Passwords can be stored in `username.ini` (where "username" is the user's userna $ php -a > echo password_hash('desiredpassword', PASSWORD_BCRYPT); ```` -This will produce a hash which is to be placed in the `password` field in `username.ini`. Ensure that the `encryption` field is set to `bcrypt`. +This will produce a hash which is to be placed in the `password` field in `username.ini`. Ensure that the `encryption` field is set to `password_hash`. Both Online or Offline From 88daac7a4a8a32e0c95829ced38b74fb52b8f7ac Mon Sep 17 00:00:00 2001 From: Hasan CAN Date: Sat, 20 Jun 2020 21:40:12 +0300 Subject: [PATCH 4/8] Create tr.ini --- lang/tr.ini | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 lang/tr.ini diff --git a/lang/tr.ini b/lang/tr.ini new file mode 100644 index 0000000..24b3ea8 --- /dev/null +++ b/lang/tr.ini @@ -0,0 +1,86 @@ +About = "About" +Add_category = "Add category" +Add_content = "Add content" +Add_sub = "Add sub" +Admin = "Admin" +All_blog_posts = "All blog posts" +Archives = "Archives" +Are_you_sure_you_want_to_delete_ = "Are you sure you want to delete %s?" +Audio_post = "Audio post" +Audio_post_comment = "Creating blog post with featured audio" +Author = "Author" +Backup = "Backup" +Cancel = "Cancel" +Categories = "Categories" +Category = "Category" +Clear_cache = "Clear cache" +Config = "Config" +Contents = "Contents" +Created = "Created" +Delete = "Delete" +Description = "Description" +Draft = "Draft" +Edit = "Edit" +Edit_profile = "Edit profile" +Filename = "Filename" +Follow = "Follow" +Image_post = "Image post" +Image_post_comment = "Creating blog post with featured image" +Import = "Import" +Link_post = "Link post" +Link_post_comment = "Creating blog post with featured link" +Login = "Login" +Login_page = "Login page" +Logout = "Logout" +Meta_description = "Meta description" +Mine = "Mine" +More = "More" +My_draft = "My draft" +My_posts = "My posts" +Newer = "Newer" +Next = "Next" +Next_post = "Next post" +No_draft_found = "No draft found" +No_posts_found = "No posts found" +No_related_post_found = "No related post found" +Older = "Older" +Operations = "Operations" +Popular_posts = "Popular posts" +Popular_tags = "Popular tags" +Posted_in = "Posted in" +Posted_on = "Posted on" +Posts = "Posts" +Prev = "Old" +Prev_post = "Previous Post" +Publish = "Publish" +Publish_draft = "Publish draft" +Published = "Published" +Quote_post = "Quote post" +Quote_post_comment = "Creating blog post with featured quote" +Recent_posts = "Recent posts" +Regular_post = "Regular post" +Regular_post_comment = "Creating regular blog post" +Related_posts = "Related posts" +Revert_to_draft = "Revert to draft" +Save = "Save" +Save_as_draft = "Save as draft" +Search = "Search" +Search_for = "Search for" +Static_page = "Static page" +Static_page_comment = "Creating static page" +Static_pages = "Static pages" +Tag = "Tag" +Tags = "Tags" +Title = "Title" +Uncategorized = "Uncategorized" +Uncategorized_comment = "Topics that don't need a category, or don't fit into any other existing category" +Update = "Update" +Update_draft = "Update draft" +Update_post = "Update post" +Video_post = "Video post" +Video_post_comment = "Creating blog post with featured video" +View = "View" +Views = "Views" +Your_recent_posts = "Your recent posts" +by = "by" +read_more = "read more" From 2b95fcd70d4e0c17e38b3373420372edd3406d36 Mon Sep 17 00:00:00 2001 From: Hasan CAN Date: Sun, 21 Jun 2020 00:13:41 +0300 Subject: [PATCH 5/8] Update tr.ini --- lang/tr.ini | 170 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 85 insertions(+), 85 deletions(-) diff --git a/lang/tr.ini b/lang/tr.ini index 24b3ea8..90af6c3 100644 --- a/lang/tr.ini +++ b/lang/tr.ini @@ -1,86 +1,86 @@ -About = "About" -Add_category = "Add category" -Add_content = "Add content" +About = "Hakkında" +Add_category = "Kategori ekle" +Add_content = "İçerik ekle" Add_sub = "Add sub" -Admin = "Admin" -All_blog_posts = "All blog posts" -Archives = "Archives" -Are_you_sure_you_want_to_delete_ = "Are you sure you want to delete %s?" -Audio_post = "Audio post" -Audio_post_comment = "Creating blog post with featured audio" -Author = "Author" -Backup = "Backup" -Cancel = "Cancel" -Categories = "Categories" -Category = "Category" -Clear_cache = "Clear cache" -Config = "Config" -Contents = "Contents" -Created = "Created" -Delete = "Delete" -Description = "Description" -Draft = "Draft" -Edit = "Edit" -Edit_profile = "Edit profile" -Filename = "Filename" -Follow = "Follow" -Image_post = "Image post" -Image_post_comment = "Creating blog post with featured image" -Import = "Import" -Link_post = "Link post" -Link_post_comment = "Creating blog post with featured link" -Login = "Login" -Login_page = "Login page" -Logout = "Logout" -Meta_description = "Meta description" -Mine = "Mine" -More = "More" -My_draft = "My draft" -My_posts = "My posts" -Newer = "Newer" -Next = "Next" -Next_post = "Next post" -No_draft_found = "No draft found" -No_posts_found = "No posts found" -No_related_post_found = "No related post found" -Older = "Older" -Operations = "Operations" -Popular_posts = "Popular posts" -Popular_tags = "Popular tags" -Posted_in = "Posted in" -Posted_on = "Posted on" -Posts = "Posts" -Prev = "Old" -Prev_post = "Previous Post" -Publish = "Publish" -Publish_draft = "Publish draft" -Published = "Published" -Quote_post = "Quote post" -Quote_post_comment = "Creating blog post with featured quote" -Recent_posts = "Recent posts" -Regular_post = "Regular post" -Regular_post_comment = "Creating regular blog post" -Related_posts = "Related posts" -Revert_to_draft = "Revert to draft" -Save = "Save" -Save_as_draft = "Save as draft" -Search = "Search" -Search_for = "Search for" -Static_page = "Static page" -Static_page_comment = "Creating static page" -Static_pages = "Static pages" -Tag = "Tag" -Tags = "Tags" -Title = "Title" -Uncategorized = "Uncategorized" -Uncategorized_comment = "Topics that don't need a category, or don't fit into any other existing category" -Update = "Update" -Update_draft = "Update draft" -Update_post = "Update post" -Video_post = "Video post" -Video_post_comment = "Creating blog post with featured video" -View = "View" -Views = "Views" -Your_recent_posts = "Your recent posts" -by = "by" -read_more = "read more" +Admin = "Yönetici" +All_blog_posts = "Tüm blog yazıları" +Archives = "Arşivler" +Are_you_sure_you_want_to_delete_ = "%s silmek istediğinize emin misiniz?" +Audio_post = "Sesli gönderi" +Audio_post_comment = "Ses içeren bir blog gönderisi oluşturuluyor" +Author = "Yazar" +Backup = "Yedekleme" +Cancel = "İptal" +Categories = "Kategoriler" +Category = "Kategori" +Clear_cache = "Önbelleği temizle" +Config = "Ayarlar" +Contents = "İçerikler" +Created = "Oluşturuldu" +Delete = "Sil" +Description = "Açıklama" +Draft = "Taslak" +Edit = "Düzenle" +Edit_profile = "Profili düzenle" +Filename = "Dosya Adı" +Follow = "Takip Et" +Image_post = "Görsel gönderi" +Image_post_comment = "Öne çıkan görsel içeren bir blog gönderisi oluşturuluyor" +Import = "İçe Aktar" +Link_post = "Bağlantı gönderisi" +Link_post_comment = "Link içerikli bir blog gönderisi oluşturuluyor." +Login = "Giriş Yap" +Login_page = "Giriş sayfası" +Logout = "Çıkış Yap" +Meta_description = "Meta Açıklaması" +Mine = "Benim" +More = "Daha fazla" +My_draft = "Taslaklarım" +My_posts = "Gönderilerim" +Newer = "Daha Yeni" +Next = "Sonraki" +Next_post = "Sonraki yönderi" +No_draft_found = "Taslak bulunamadı" +No_posts_found = "Gönderi bulunamadı" +No_related_post_found = "Benzer gönderi bulunamadı" +Older = "Daha Eski" +Operations = "Operasyonlar" +Popular_posts = "Popüler gönderiler" +Popular_tags = "Popüler etiketler" +Posted_in = "Gönderildi" +Posted_on = "Gönderildi" +Posts = "Gönderiler" +Prev = "Eski" +Prev_post = "Eski Gönderi" +Publish = "Yayınla" +Publish_draft = "Taslak yayınla" +Published = "Yayınlandı" +Quote_post = "Alıntı gönderi" +Quote_post_comment = "Alıntı içeren blog gönderisi oluşturuluyor" +Recent_posts = "Son gönderiler" +Regular_post = "Düzenli gönderi" +Regular_post_comment = "Düzenli gönderi oluşturuluyor" +Related_posts = "Benzer gönderiler" +Revert_to_draft = "Taslağa dönüştür" +Save = "Kaydet" +Save_as_draft = "Taslak olarak kaydet" +Search = "Ara" +Search_for = "Arama:" +Static_page = "Statik sayfa" +Static_page_comment = "Statik sayfa oluşturuluyor" +Static_pages = "Statik sayfalar" +Tag = "Etiket" +Tags = "Etiketler" +Title = "Başlık" +Uncategorized = "Kategorilenmemiş" +Uncategorized_comment = "Bir kategoriye ihtiyaç duymayan veya mevcut herhangi bir kategoriye uymayan konular" +Update = "Güncelle" +Update_draft = "Taslağı güncelle" +Update_post = "Gönderiyi güncelle" +Video_post = "Video gönderi" +Video_post_comment = "Video içeren blog gönderisi oluşturuluyor" +View = "Okunma" +Views = "Okunma" +Your_recent_posts = "Son gönderilerin" +by = "tarafından" +read_more = "daha fazla oku" From f3049946d7c9b81088560a600f05dbfc485ec3cd Mon Sep 17 00:00:00 2001 From: Eric Roller Date: Sun, 21 Jun 2020 18:51:58 +0200 Subject: [PATCH 6/8] Corrected config variable name. --- config/config.ini.example | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/config.ini.example b/config/config.ini.example index 0161ec6..e4abce3 100644 --- a/config/config.ini.example +++ b/config/config.ini.example @@ -4,8 +4,8 @@ site.url = "" ; Your timezone timezone = "Asia/Jakarta" -; Time format. See: https://www.php.net/manual/en/function.date.php -time.format = "d F Y" +; Date format. See: https://www.php.net/manual/en/function.strftime +date.format = "%d %B %Y" ; Your language (currently only "en" for English or "de" for German) language = "en" From 61a75ee945c7f9bba34fe0270556963738b871e7 Mon Sep 17 00:00:00 2001 From: Dan Date: Sun, 28 Jun 2020 08:28:52 +0700 Subject: [PATCH 7/8] Fix draft listing --- system/htmly.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/system/htmly.php b/system/htmly.php index 764b7a7..0781afa 100644 --- a/system/htmly.php +++ b/system/htmly.php @@ -1088,6 +1088,7 @@ get('/admin/draft', function () { 'is_admin' => true, 'bodyclass' => 'admin-draft', 'breadcrumb' => '' . config('breadcrumb.home') . ' » Draft for: ' . $author->name, + 'pagination' => has_pagination($total, $perpage, $page) )); die; } @@ -1105,6 +1106,7 @@ get('/admin/draft', function () { 'is_admin' => true, 'bodyclass' => 'admin-draft', 'breadcrumb' => '' . config('breadcrumb.home') . ' » Draft for: ' . $author->name, + 'pagination' => has_pagination($total, $perpage, $page) )); } else { $login = site_url() . 'login'; From 925e2d6d0e53302cb138eb1fd7566a66e6b346bb Mon Sep 17 00:00:00 2001 From: Dan Date: Sun, 28 Jun 2020 08:31:45 +0700 Subject: [PATCH 8/8] Update user-draft.html.php --- system/admin/views/user-draft.html.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/system/admin/views/user-draft.html.php b/system/admin/views/user-draft.html.php index e24d2b5..57d401f 100644 --- a/system/admin/views/user-draft.html.php +++ b/system/admin/views/user-draft.html.php @@ -28,6 +28,16 @@ + +
+ + + + + + +
+ \ No newline at end of file +} ?>