From 7437bfa456e85fe593e879d0e8c7d788e487c002 Mon Sep 17 00:00:00 2001 From: Spirit Date: Sun, 29 Mar 2020 01:06:02 +0800 Subject: [PATCH] Issue 205 (#206) * fix: fix pagination and alignment fix pagination and post list thumb alignment fix #205 --- functions.php | 10 ++++++---- languages/en_US.mo | Bin 1568 -> 1568 bytes languages/en_US.po | 40 ++++++++++++++++++++-------------------- languages/sakura.pot | 38 +++++++++++++++++++------------------- languages/zh_CN.mo | Bin 34267 -> 34267 bytes languages/zh_CN.po | 40 ++++++++++++++++++++-------------------- 6 files changed, 65 insertions(+), 63 deletions(-) diff --git a/functions.php b/functions.php index 450e8ec..80f17a2 100644 --- a/functions.php +++ b/functions.php @@ -1758,11 +1758,13 @@ function DEFAULT_FEATURE_IMAGE() } //防止设置置顶文章造成的图片同侧bug -add_action('pre_get_posts', function ($q) { - if ($q->is_home() && $q->is_main_query() && $q->get('paged') > 1) { - $q->set('post__not_in', get_option('sticky_posts')); +add_action( 'pre_get_posts', function( $q ){ + if ( $q->is_home() && $q->is_main_query() ){ + $q->set( 'posts_per_page', 10 - sizeof(get_option( 'sticky_posts' )) ); + if ( $q->get( 'paged' ) > 1 ) + $q->set( 'post__not_in', get_option( 'sticky_posts' ) ); } - + }); //评论回复 diff --git a/languages/en_US.mo b/languages/en_US.mo index 0da25d88c14c52f7c8a1346343331e002a7a392f..311d0d81806072fca98721694155880e40509cbc 100644 GIT binary patch delta 22 dcmZ3$vw&yAD<)23T_Z~c0|P7L&7YZcnE_FY295v# delta 22 dcmZ3$vw&yAD<)1OT|;99BV#Mm&7YZcnE_E{28{p! diff --git a/languages/en_US.po b/languages/en_US.po index 7f47aa0..bdb2b5f 100644 --- a/languages/en_US.po +++ b/languages/en_US.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: Sakura\n" -"POT-Creation-Date: 2020-02-13 23:59+0800\n" -"PO-Revision-Date: 2020-02-13 23:59+0800\n" +"POT-Creation-Date: 2020-03-29 00:39+0800\n" +"PO-Revision-Date: 2020-03-29 00:39+0800\n" "Last-Translator: \n" "Language-Team: \n" "Language: en_US\n" @@ -142,74 +142,74 @@ msgstr "" msgid "Nav Menus" msgstr "" -#: functions.php:420 inc/theme_plus.php:186 layouts/authorprofile.php:11 +#: functions.php:421 inc/theme_plus.php:186 layouts/authorprofile.php:11 #: options.php:121 msgid "Author" msgstr "" -#: functions.php:420 +#: functions.php:421 msgid "Blogger" msgstr "" -#: functions.php:424 +#: functions.php:425 msgid "Location" msgstr "" -#: functions.php:428 +#: functions.php:429 msgid "Private" msgstr "" -#: functions.php:430 +#: functions.php:431 msgid "Yes" msgstr "" -#: functions.php:432 +#: functions.php:433 msgid "No" msgstr "" -#: functions.php:435 +#: functions.php:436 msgid "Edit" msgstr "" -#: functions.php:524 +#: functions.php:525 msgid "" "Please install pulgin WP-Statistics" msgstr "" -#: functions.php:574 +#: functions.php:575 msgid "This guy is so lazy ╮(╯▽╰)╭" msgstr "" -#: functions.php:1329 +#: functions.php:1330 msgid "All expand/collapse" msgstr "" -#: functions.php:1350 options.php:834 +#: functions.php:1351 options.php:834 msgid " " msgstr "" -#: functions.php:1354 +#: functions.php:1355 msgid " post(s)" msgstr "" -#: functions.php:1377 functions.php:1380 inc/theme_plus.php:478 +#: functions.php:1378 functions.php:1381 inc/theme_plus.php:478 msgid "Dashboard" msgstr "" -#: functions.php:1606 +#: functions.php:1607 msgid "ERROR: This email domain (@" msgstr "" -#: functions.php:1711 +#: functions.php:1712 msgid "QQ" msgstr "" -#: functions.php:1781 +#: functions.php:1784 msgid "Sidebar" msgstr "" -#: functions.php:1893 +#: functions.php:1896 msgid "" " For a better experience, please do not set permalink as plain. To do this, you may need to " @@ -222,7 +222,7 @@ msgstr "" msgid "page %s " msgstr "" -#: inc/api.php:301 inc/theme_plus.php:727 +#: inc/api.php:304 inc/theme_plus.php:727 msgid "The comment is private" msgstr "" diff --git a/languages/sakura.pot b/languages/sakura.pot index 146179a..4e28a2d 100644 --- a/languages/sakura.pot +++ b/languages/sakura.pot @@ -3,7 +3,7 @@ msgid "" msgstr "" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" "Project-Id-Version: Sakura\n" -"POT-Creation-Date: 2020-02-13 23:59+0800\n" +"POT-Creation-Date: 2020-03-29 00:38+0800\n" "PO-Revision-Date: 2019-11-01 14:27+0800\n" "Last-Translator: \n" "Language-Team: \n" @@ -142,73 +142,73 @@ msgstr "" msgid "Nav Menus" msgstr "" -#: functions.php:420 inc/theme_plus.php:186 layouts/authorprofile.php:11 options.php:121 +#: functions.php:421 inc/theme_plus.php:186 layouts/authorprofile.php:11 options.php:121 msgid "Author" msgstr "" -#: functions.php:420 +#: functions.php:421 msgid "Blogger" msgstr "" -#: functions.php:424 +#: functions.php:425 msgid "Location" msgstr "" -#: functions.php:428 +#: functions.php:429 msgid "Private" msgstr "" -#: functions.php:430 +#: functions.php:431 msgid "Yes" msgstr "" -#: functions.php:432 +#: functions.php:433 msgid "No" msgstr "" -#: functions.php:435 +#: functions.php:436 msgid "Edit" msgstr "" -#: functions.php:524 +#: functions.php:525 msgid "" "Please install pulgin WP-Statistics" msgstr "" -#: functions.php:574 +#: functions.php:575 msgid "This guy is so lazy ╮(╯▽╰)╭" msgstr "" -#: functions.php:1329 +#: functions.php:1330 msgid "All expand/collapse" msgstr "" -#: functions.php:1350 options.php:834 +#: functions.php:1351 options.php:834 msgid " " msgstr "" -#: functions.php:1354 +#: functions.php:1355 msgid " post(s)" msgstr "" -#: functions.php:1377 functions.php:1380 inc/theme_plus.php:478 +#: functions.php:1378 functions.php:1381 inc/theme_plus.php:478 msgid "Dashboard" msgstr "" -#: functions.php:1606 +#: functions.php:1607 msgid "ERROR: This email domain (@" msgstr "" -#: functions.php:1711 +#: functions.php:1712 msgid "QQ" msgstr "" -#: functions.php:1781 +#: functions.php:1784 msgid "Sidebar" msgstr "" -#: functions.php:1893 +#: functions.php:1896 msgid "" " For a better experience, please do not set " "permalink as plain. To do this, you may need to configure WP-Statistics" @@ -179,39 +179,39 @@ msgstr "" "请安装插件 WP-Statistics" -#: functions.php:574 +#: functions.php:575 msgid "This guy is so lazy ╮(╯▽╰)╭" msgstr "这家伙好懒╮(╯▽╰)╭" -#: functions.php:1329 +#: functions.php:1330 msgid "All expand/collapse" msgstr "全部展开/收缩" -#: functions.php:1350 options.php:834 +#: functions.php:1351 options.php:834 msgid " " msgstr "" -#: functions.php:1354 +#: functions.php:1355 msgid " post(s)" msgstr " 篇文章" -#: functions.php:1377 functions.php:1380 inc/theme_plus.php:478 +#: functions.php:1378 functions.php:1381 inc/theme_plus.php:478 msgid "Dashboard" msgstr "管理中心" -#: functions.php:1606 +#: functions.php:1607 msgid "ERROR: This email domain (@" msgstr "" -#: functions.php:1711 +#: functions.php:1712 msgid "QQ" msgstr "" -#: functions.php:1781 +#: functions.php:1784 msgid "Sidebar" msgstr "侧栏" -#: functions.php:1893 +#: functions.php:1896 msgid "" " For a better experience, please do not set permalink as plain. To do this, you may need to " @@ -227,7 +227,7 @@ msgstr "" msgid "page %s " msgstr "第 %s 页 " -#: inc/api.php:301 inc/theme_plus.php:727 +#: inc/api.php:304 inc/theme_plus.php:727 msgid "The comment is private" msgstr "该评论为私密评论"