From 07f32152d5fe95c97733a3064708f63d41f1f948 Mon Sep 17 00:00:00 2001 From: spirit Date: Fri, 15 Nov 2019 09:23:07 +0800 Subject: [PATCH 01/13] optimize --- functions.php | 6 ++++-- header.php | 2 +- inc/api.php | 2 +- js/sakura-app.js | 6 +++--- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/functions.php b/functions.php index d6bd51d..006ced5 100644 --- a/functions.php +++ b/functions.php @@ -203,7 +203,9 @@ function sakura_scripts() { 'ajaxurl' => admin_url('admin-ajax.php'), 'order' => get_option('comment_order'), // ajax comments 'formpostion' => 'bottom', // ajax comments 默认为bottom,如果你的表单在顶部则设置为top。 - 'reply_link_version' => $reply_link_version + 'reply_link_version' => $reply_link_version, + 'api' => esc_url_raw( rest_url() ), + 'nonce' => wp_create_nonce( 'wp_rest' ) )); } add_action( 'wp_enqueue_scripts', 'sakura_scripts' ); @@ -1640,4 +1642,4 @@ function sakura_comment_notify($comment_id){ } add_action('comment_post', 'sakura_comment_notify'); -//code end \ No newline at end of file +//code end diff --git a/header.php b/header.php index 8f05888..96109ef 100644 --- a/header.php +++ b/header.php @@ -77,7 +77,7 @@ window.dataLayer=window.dataLayer||[];function gtag(){dataLayer.push(arguments)} -> +> Plz rename the theme folder name as Sakura!
请将主题文件夹名改为 Sakura!'; ?> 主题需要 PHP 的 curl 支持!请在 `php.ini` 里开启或者联系你的主机商。
The theme requires PHP\'s curl support! Please turn on in `php.ini` or contact your hosting provider.'; ?>
diff --git a/inc/api.php b/inc/api.php index da10ac0..15c56c4 100644 --- a/inc/api.php +++ b/inc/api.php @@ -215,7 +215,7 @@ function SMMS_API($image) /* * 定制实时搜索 rest api - * @rest api接口路径:https://sakura.2heng.xin/wp-json/cache_search/v1/json/ + * @rest api接口路径:https://sakura.2heng.xin/wp-json/sakura/v1/cache_search/json * @可在cache_search_json()函数末尾通过设置 HTTP header 控制 json 缓存时间 */ function cache_search_json() diff --git a/js/sakura-app.js b/js/sakura-app.js index db66148..fb0754c 100644 --- a/js/sakura-app.js +++ b/js/sakura-app.js @@ -182,7 +182,7 @@ function attach_image() { var formData = new FormData(); formData.append('cmt_img_file', f); $.ajax({ - url: '/wp-json/sakura/v1/image/upload/?_wpnonce='+$('body').attr('nonce-data'), + url: Poi.api + 'sakura/v1/image/upload?_wpnonce=' + Poi.nonce, type: 'POST', processData: false, contentType: false, @@ -1376,7 +1376,7 @@ var home = location.href, $('html').css('overflow-y', 'hidden'); if (mashiro_option.live_search) { var QueryStorage = []; - search_a("https://" + document.domain + "/wp-json/sakura/v1/cache_search/json"); + search_a(Poi.api + "sakura/v1/cache_search/json"); var otxt = addComment.I("search-input"), list = addComment.I("PostlistBox"), @@ -1871,4 +1871,4 @@ if ((isWebkit || isOpera || isIe) && document.getElementById && window.addEventL element.focus(); } }, false); -} \ No newline at end of file +} From ae4d65abd54f8de97d79e9adf4e4fc0b5a493dfa Mon Sep 17 00:00:00 2001 From: spirit Date: Fri, 15 Nov 2019 09:37:23 +0800 Subject: [PATCH 02/13] translate --- functions.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/functions.php b/functions.php index 006ced5..04d429a 100644 --- a/functions.php +++ b/functions.php @@ -387,19 +387,19 @@ if(!function_exists('akina_comment_format')){
$depth, 'max_depth' => $args['max_depth']))); ?>
-
comment_agent); ?>comment_agent); ?> : +
comment_agent); ?>comment_agent); ?> : comment_ID; $i_private = get_comment_meta($comment_ID, '_private', true); - $flag .= ' '.__('Private', 'mashiro').': '; + $flag .= ' '.__("Private", "sakura").': '; if (!empty($i_private)) { - $flag .= __('Yes', 'mashiro').' '; + $flag .= __("Yes", "sakura").' '; } else { - $flag .= __('No', 'mashiro').' '; + $flag .= __("No", "sakura").' '; } $flag .= ''; $flag .= edit_comment_link(' '.__("Edit", "mashiro"), ' ', ''); From de636d1d0845cb60b6849f48a4e35c6ab3d3aa7f Mon Sep 17 00:00:00 2001 From: spirit Date: Fri, 15 Nov 2019 23:17:20 +0800 Subject: [PATCH 03/13] support sidebar widget --- footer.php | 9 +++++++++ functions.php | 25 +++++++++++++++++++------ js/sakura-app.js | 11 +++++++++++ options.php | 7 +++++++ sidebar.php | 3 ++- style.css | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 96 insertions(+), 7 deletions(-) diff --git a/footer.php b/footer.php index 8460cf6..4331a27 100644 --- a/footer.php +++ b/footer.php @@ -38,6 +38,15 @@
+
diff --git a/functions.php b/functions.php index 04d429a..9284a15 100644 --- a/functions.php +++ b/functions.php @@ -645,19 +645,19 @@ function wpjam_custom_upload_dir( $uploads ) { * 删除自带小工具 */ function unregister_default_widgets() { - unregister_widget("WP_Widget_Pages"); + //unregister_widget("WP_Widget_Pages"); unregister_widget("WP_Widget_Calendar"); - unregister_widget("WP_Widget_Archives"); + //unregister_widget("WP_Widget_Archives"); unregister_widget("WP_Widget_Links"); unregister_widget("WP_Widget_Meta"); - unregister_widget("WP_Widget_Search"); + //unregister_widget("WP_Widget_Search"); unregister_widget("WP_Widget_Text"); - unregister_widget("WP_Widget_Categories"); - unregister_widget("WP_Widget_Recent_Posts"); + //unregister_widget("WP_Widget_Categories"); + //unregister_widget("WP_Widget_Recent_Posts"); unregister_widget("WP_Widget_Recent_Comments"); unregister_widget("WP_Widget_RSS"); unregister_widget("WP_Widget_Tag_Cloud"); - unregister_widget("WP_Nav_Menu_Widget"); + //unregister_widget("WP_Nav_Menu_Widget"); } add_action("widgets_init", "unregister_default_widgets", 11); @@ -1642,4 +1642,17 @@ function sakura_comment_notify($comment_id){ } add_action('comment_post', 'sakura_comment_notify'); +//侧栏小工具 +if (akina_option('sakura_widget')) { + if (function_exists('register_sidebar')) { + register_sidebar(array( + 'name' => '侧栏', + 'id' => 'sakura_widget', + 'before_widget' => '
', + 'after_widget' => '
', + 'before_title' => '

', + 'after_title' => '

' + )); + } +} //code end diff --git a/js/sakura-app.js b/js/sakura-app.js index fb0754c..51bf1e8 100644 --- a/js/sakura-app.js +++ b/js/sakura-app.js @@ -976,6 +976,17 @@ function mail_me() { window.open(mail); } +function activate_widget(){ + if (document.body.clientWidth > 860) { + $('.show_hide').on('click', function() { + $("#secondary").toggleClass("active") + }); + }else{ + $("#secondary").remove(); + } +} +activate_widget(); + mashiro_global.ini.normalize(); loadCSS(mashiro_option.jsdelivr_css_src); loadCSS(mashiro_option.entry_content_theme_src); diff --git a/options.php b/options.php index 4cacb2b..8618063 100644 --- a/options.php +++ b/options.php @@ -954,6 +954,13 @@ function optionsframework_options() { 'id' => 'nprogress_on', 'std' => '0', 'type' => 'checkbox'); + + $options[] = array( + 'name' => __('Enable sidebar widget', 'sakura'),/*支持侧栏小部件*/ + 'desc' => __('Default off, check on', 'sakura'),/*默认不开启,勾选开启*/ + 'id' => 'sakura_widget', + 'std' => '0', + 'type' => 'checkbox'); $options[] = array( 'name' => __('Enable Announcement', 'sakura'), diff --git a/sidebar.php b/sidebar.php index 05e2185..103ff51 100644 --- a/sidebar.php +++ b/sidebar.php @@ -7,7 +7,8 @@ * @package Akina */ -if ( ! is_active_sidebar( 'sidebar-1' ) ) { +//disable get_sidebar() +if ( is_active_sidebar( 'sakura_widget' ) ) { return; } ?> diff --git a/style.css b/style.css index b10bb5e..30c1e58 100644 --- a/style.css +++ b/style.css @@ -8500,3 +8500,51 @@ h1[id*=toc-head]::before,h2[id*=toc-head]::before,h3[id*=toc-head]::before,h4[id visibility:hidden } +.widget-area { + position: fixed; + top: 88%; + bottom: 10%; + left: -400px; + z-index: 3; + width: 400px; + webkit-transition: .3s; + transition: all .3s; + background-color: rgba(255,255,255,0.8); + box-shadow: 0 1px 20px -8px rgba(0,0,0,.5); +} +.widget-area.active{ + top: 100px; + bottom: 80px; + left: -1px !important; +} + +.widget-area .sakura_widget{ + padding: 16px; + height: calc(100% - 30px); + overflow-y: auto; +} + +.widget-area .heading{ + color: #555; + font-size: 20px; + font-weight: 900; + text-align: center; + height: 30px; + background-color: #f5f5f5; + border-color: #ddd; +} + +.widget-area .show_hide{ + position: absolute; + right: -42px; + height: 30px; + background: #f5f5f5; + border-color: #ddd; + outline:none; + box-shadow: none; + border-left-width: 0; +} + +.widget-area .show_hide .fa{ + font-size: 20px; +} From 78c135ff30e7a2e179660ebc37cae7451979b154 Mon Sep 17 00:00:00 2001 From: spirit Date: Fri, 15 Nov 2019 23:51:46 +0800 Subject: [PATCH 04/13] translate --- footer.php | 6 +- functions.php | 8 +- languages/en_US.mo | Bin 1265 -> 1267 bytes languages/en_US.po | 201 ++++++++++++++++++++---------------------- languages/sakura.pot | 199 ++++++++++++++++++++---------------------- languages/zh_CN.mo | Bin 32447 -> 32480 bytes languages/zh_CN.po | 202 +++++++++++++++++++++---------------------- options.php | 2 +- 8 files changed, 297 insertions(+), 321 deletions(-) diff --git a/footer.php b/footer.php index 4331a27..560dd26 100644 --- a/footer.php +++ b/footer.php @@ -42,7 +42,7 @@ -
小工具
+
@@ -81,7 +81,7 @@
- +
@@ -89,7 +89,7 @@
-

+

diff --git a/functions.php b/functions.php index 9284a15..7f4978f 100644 --- a/functions.php +++ b/functions.php @@ -428,7 +428,7 @@ if(!function_exists('akina_comment_format')){ $author_count = count($wpdb->get_results( "SELECT comment_ID as author_count FROM $wpdb->comments WHERE comment_author_email = '$comment_author_email' ")); if($author_count>=1 && $author_count< 5 )//数字可自行修改,代表评论次数。 - echo ''; + echo ''; else if($author_count>=6 && $author_count< 10) echo ''; else if($author_count>=10 && $author_count< 20) @@ -436,7 +436,7 @@ if(!function_exists('akina_comment_format')){ else if($author_count>=20 && $author_count< 40) echo ''; else if($author_count>=40 && $author_count< 80) - echo ''; + echo ''; else if($author_count>=80 && $author_count< 160) echo ''; else if($author_count>=160) @@ -1268,7 +1268,7 @@ function memory_archives_list() { if ($year != $year_tmp && $year > 0) $output .= ''; if ($year != $year_tmp) { $year = $year_tmp; - $output .= '

'. $year . __("","sakura"). /*年*/'

    '; //输出年份 + $output .= '

    '. $year . __(" ","year","sakura"). /*年*/'

      '; //输出年份 } if ($mon != $mon_tmp) { $mon = $mon_tmp; @@ -1646,7 +1646,7 @@ add_action('comment_post', 'sakura_comment_notify'); if (akina_option('sakura_widget')) { if (function_exists('register_sidebar')) { register_sidebar(array( - 'name' => '侧栏', + 'name' => __('Sidebar'),//侧栏 'id' => 'sakura_widget', 'before_widget' => '
      ', 'after_widget' => '
      ', diff --git a/languages/en_US.mo b/languages/en_US.mo index b2bd4df73b653d13c1947cc8d7143c9143f0199b..152f1015de6491df4668527ff76add190c546ef4 100644 GIT binary patch delta 123 zcmey!`I&Pkrqfix$OZiCVjfHX+m zEFdimq?ZF}aUi`LNDBh#%RrhJNI%_pQ3s%>ksVfix$OZh_K$KpLcO v29Op8(o2D~IFQ~6qy>TWMIg-!q#tj*Da*)aqF`ugWjy&0WP-Statistics" msgstr "" -#: functions.php:537 +#: functions.php:539 msgid "This guy is so lazy ╮(╯▽╰)╭" msgstr "" -#: functions.php:1258 +#: functions.php:1260 msgid "All expand/collapse" msgstr "" -#: functions.php:1273 +#: functions.php:1271 options.php:840 +msgid " " +msgstr "" + +#: functions.php:1275 msgid " post(s)" msgstr "" -#: functions.php:1295 functions.php:1298 inc/theme_plus.php:479 +#: functions.php:1297 functions.php:1300 inc/theme_plus.php:479 msgid "Dashboard" msgstr "" -#: functions.php:1511 +#: functions.php:1513 msgid "ERROR: This email domain (@" msgstr "" -#: functions.php:1591 +#: functions.php:1593 msgid "QQ" msgstr "" +#: functions.php:1649 +msgid "Sidebar" +msgstr "" + #: header.php:35 #, php-format msgid "page %s " msgstr "" -#: inc/api.php:241 inc/theme_plus.php:728 +#: inc/api.php:253 inc/theme_plus.php:728 msgid "The comment is private" msgstr "" @@ -894,7 +906,7 @@ msgstr "" msgid "Whether to turn on the top-feature" msgstr "" -#: options.php:443 options.php:1084 +#: options.php:443 options.php:1091 msgid "Default on" msgstr "" @@ -980,7 +992,6 @@ msgstr "" msgid "Post style" msgstr "" -#. Theme Name of the plugin/theme #: options.php:562 msgid "Sakura" msgstr "" @@ -1383,136 +1394,140 @@ msgstr "" msgid "Enable NProgress progress bar" msgstr "" -#: options.php:953 options.php:960 +#: options.php:953 options.php:960 options.php:967 msgid "Default off, check on" msgstr "" #: options.php:959 -msgid "Enable Announcement" +msgid "Enable sidebar widget" msgstr "" #: options.php:966 +msgid "Enable Announcement" +msgstr "" + +#: options.php:973 msgid "Announcement content" msgstr "" -#: options.php:967 +#: options.php:974 msgid "" "Announcement content, the text exceeds 142 bytes will be scrolled display " "(mobile device is invalid)" msgstr "" -#: options.php:973 +#: options.php:980 msgid "The categories of articles that don\\t not show on homepage" msgstr "" -#: options.php:974 options.php:981 +#: options.php:981 options.php:988 msgid "Fill in category ID, multiple IDs are divided by a comma \",\"" msgstr "" -#: options.php:980 +#: options.php:987 msgid "Images category" msgstr "" -#: options.php:987 +#: options.php:994 msgid "Statistics Interface" msgstr "" -#: options.php:992 +#: options.php:999 msgid "" "WP-Statistics plugin (Professional statistics, can exclude invalid access)" msgstr "" -#: options.php:993 +#: options.php:1000 msgid "Theme built-in (simple statistics, calculate each page access request)" msgstr "" -#: options.php:997 +#: options.php:1004 msgid "Statistical data display format" msgstr "" -#: options.php:1002 +#: options.php:1009 msgid "23333 Views (default)" msgstr "" -#: options.php:1003 +#: options.php:1010 msgid "23,333 Views (britain)" msgstr "" -#: options.php:1004 +#: options.php:1011 msgid "23 333 Views (french)" msgstr "" -#: options.php:1005 +#: options.php:1012 msgid "23k Views (chinese)" msgstr "" -#: options.php:1009 +#: options.php:1016 msgid "Comment image upload API" msgstr "" -#: options.php:1014 +#: options.php:1021 msgid "Imgur (https://imgur.com)" msgstr "" -#: options.php:1015 +#: options.php:1022 msgid "SM.MS (https://sm.ms)" msgstr "" -#: options.php:1016 +#: options.php:1023 msgid "Chevereto (https://chevereto.com)" msgstr "" -#: options.php:1020 +#: options.php:1027 msgid "Imgur Client ID" msgstr "" -#: options.php:1021 +#: options.php:1028 msgid "" "Register your application here, note we only need the Client ID here." msgstr "" -#: options.php:1027 +#: options.php:1034 msgid "SM.MS Secret Token" msgstr "" -#: options.php:1028 +#: options.php:1035 msgid "" "Register your application here." msgstr "" -#: options.php:1034 +#: options.php:1041 msgid "Chevereto API v1 key" msgstr "" -#: options.php:1035 +#: options.php:1042 msgid "Get your API key here " msgstr "" -#: options.php:1041 +#: options.php:1048 msgid "Chevereto URL" msgstr "" -#: options.php:1042 +#: options.php:1049 msgid "" "Your Chevereto homepage url, no slash in the end, eg. https://your.cherverto." "com" msgstr "" -#: options.php:1048 +#: options.php:1055 msgid "Comment images proxy" msgstr "" -#: options.php:1049 +#: options.php:1056 msgid "" "A front-ed proxy for the uploaded images. Leave it blank if you do not need." msgstr "" -#: options.php:1055 +#: options.php:1062 msgid "Imgur upload proxy" msgstr "" -#: options.php:1056 +#: options.php:1063 msgid "" "A back-ed proxy to upload images. You may set a self hosted proxy with " "Nginx, following my 】" msgstr "" -#: options.php:1062 +#: options.php:1069 msgid "Enable live search" msgstr "" -#: options.php:1063 +#: options.php:1070 msgid "" "Real-time search in the foreground, call the Rest API to update the cache " "every hour, you can manually set the cache time in functions.php" msgstr "" -#: options.php:1069 +#: options.php:1076 msgid "Include comments in live search" msgstr "" -#: options.php:1070 +#: options.php:1077 msgid "" "Search for comments in real-time search (not recommended if there are too " "many comments on the site)" msgstr "" -#: options.php:1076 +#: options.php:1083 msgid "Enable baguetteBox" msgstr "" -#: options.php:1077 +#: options.php:1084 msgid "" "Default off,please read wiki" msgstr "" -#: options.php:1083 +#: options.php:1090 msgid "Enable lazyload in posts" msgstr "" -#: options.php:1090 +#: options.php:1097 msgid "lazyload spinner" msgstr "" -#: options.php:1091 +#: options.php:1098 msgid "The placeholder to display when the image loads, fill in the image url" msgstr "" -#: options.php:1097 +#: options.php:1104 msgid "Whether to enable the clipboard copyright" msgstr "" -#: options.php:1098 +#: options.php:1105 msgid "" "Automatically add a copyright to the clipboard when copying more than 30 " "bytes, which is enabled by default." msgstr "" -#: options.php:1104 +#: options.php:1111 msgid "Email address prefix" msgstr "" -#: options.php:1105 +#: options.php:1112 msgid "" "For sending system mail, the sender address displayed in the user's mailbox, " "do not use Chinese, the default system email address is bibi@your_domain_name" msgstr "" -#: options.php:1111 +#: options.php:1118 msgid "Comments reply notification" msgstr "" -#: options.php:1112 +#: options.php:1119 msgid "" "WordPress will use email to notify users when their comments receive a reply " "by default. Tick this item allows users to set their own comments reply " "notification" msgstr "" -#: options.php:1118 +#: options.php:1125 msgid "Administrator comment notification" msgstr "" -#: options.php:1119 +#: options.php:1126 msgid "" "Whether to use email notification when the administrator's comments receive " "a reply" msgstr "" -#: options.php:1125 +#: options.php:1132 msgid "Enable private comment" msgstr "" -#: options.php:1126 +#: options.php:1133 msgid "Allow users to set their own comments to be invisible to others" msgstr "" -#: options.php:1132 +#: options.php:1139 msgid "Human verification" msgstr "" -#: options.php:1133 +#: options.php:1140 msgid "Enable human verification" msgstr "" -#: options.php:1139 +#: options.php:1146 msgid "Comment UA infomation" msgstr "" -#: options.php:1140 +#: options.php:1147 msgid "" "Check to enable, display the user's browser, operating system information" msgstr "" -#: options.php:1146 +#: options.php:1153 msgid "Enable disqus" msgstr "" -#: options.php:1147 +#: options.php:1154 msgid "Enable disqus for comment" msgstr "" -#: options.php:1153 +#: options.php:1160 msgid "Time Zone adjustment" msgstr "" -#: options.php:1154 +#: options.php:1161 msgid "" "If the comment has a time difference problem adjust here, fill in an " "integer, the calculation method: actual_time = display_error_time - " @@ -1769,30 +1784,6 @@ msgstr "" msgid "Registration is not open yet" msgstr "" -#. Theme URI of the plugin/theme -msgid "https://2heng.xin/theme-sakura/" -msgstr "" - -#. Description of the plugin/theme -msgid "A branch of theme Akina" -msgstr "" - -#. Author of the plugin/theme -msgid "Mashiro, Louie, Fuzzz" -msgstr "" - -#. Author URI of the plugin/theme -msgid "http://2heng.xin" -msgstr "" - -#. Template Name of the plugin/theme -msgid "archive" -msgstr "" - -#. Template Name of the plugin/theme -msgid "links" -msgstr "" - #, php-format #~ msgid "第 %s 页" #~ msgstr "Page %s" diff --git a/languages/sakura.pot b/languages/sakura.pot index fd94044..c38eb47 100644 --- a/languages/sakura.pot +++ b/languages/sakura.pot @@ -3,14 +3,14 @@ msgid "" msgstr "" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" "Project-Id-Version: Sakura\n" -"POT-Creation-Date: 2019-11-14 19:18+0800\n" +"POT-Creation-Date: 2019-11-15 23:51+0800\n" "PO-Revision-Date: 2019-11-01 14:27+0800\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.2\n" +"X-Generator: Poedit 2.2.4\n" "X-Poedit-Basepath: ..\n" "X-Poedit-Flags-xgettext: --add-comments=translators:\n" "X-Poedit-WPHeader: style.css\n" @@ -38,7 +38,7 @@ msgstr "" msgid "Don't worry, search in site?" msgstr "" -#: 404.php:53 footer.php:62 search.php:42 +#: 404.php:53 footer.php:71 search.php:42 msgid "Search..." msgstr "" @@ -130,11 +130,15 @@ msgstr "" msgid "Site" msgstr "" -#: footer.php:75 footer.php:83 -msgid "Want to find something?" +#: footer.php:45 +msgid "Widget" msgstr "" -#: footer.php:85 +#: footer.php:84 footer.php:92 +msgid "Want to find something?" +msgstr "" + +#: footer.php:94 msgid "Search" msgstr "" @@ -142,70 +146,78 @@ msgstr "" msgid "Nav Menus" msgstr "" -#: functions.php:388 inc/theme_plus.php:187 layouts/authorprofile.php:11 options.php:123 +#: functions.php:390 inc/theme_plus.php:187 layouts/authorprofile.php:11 options.php:123 msgid "Author" msgstr "" -#: functions.php:388 +#: functions.php:390 msgid "Blogger" msgstr "" -#: functions.php:392 +#: functions.php:394 msgid "Location" msgstr "" -#: functions.php:396 +#: functions.php:398 msgid "Private" msgstr "" -#: functions.php:398 +#: functions.php:400 msgid "Yes" msgstr "" -#: functions.php:400 +#: functions.php:402 msgid "No" msgstr "" -#: functions.php:403 +#: functions.php:405 msgid "Edit" msgstr "" -#: functions.php:484 +#: functions.php:486 msgid "" "Please install pulgin WP-Statistics" msgstr "" -#: functions.php:537 +#: functions.php:539 msgid "This guy is so lazy ╮(╯▽╰)╭" msgstr "" -#: functions.php:1258 +#: functions.php:1260 msgid "All expand/collapse" msgstr "" -#: functions.php:1273 +#: functions.php:1271 options.php:840 +msgid " " +msgstr "" + +#: functions.php:1275 msgid " post(s)" msgstr "" -#: functions.php:1295 functions.php:1298 inc/theme_plus.php:479 +#: functions.php:1297 functions.php:1300 inc/theme_plus.php:479 msgid "Dashboard" msgstr "" -#: functions.php:1511 +#: functions.php:1513 msgid "ERROR: This email domain (@" msgstr "" -#: functions.php:1591 +#: functions.php:1593 msgid "QQ" msgstr "" +#: functions.php:1649 +msgid "Sidebar" +msgstr "" + #: header.php:35 #, php-format msgid "page %s " msgstr "" -#: inc/api.php:241 inc/theme_plus.php:728 +#: inc/api.php:253 inc/theme_plus.php:728 msgid "The comment is private" msgstr "" @@ -885,7 +897,7 @@ msgstr "" msgid "Whether to turn on the top-feature" msgstr "" -#: options.php:443 options.php:1084 +#: options.php:443 options.php:1091 msgid "Default on" msgstr "" @@ -971,7 +983,6 @@ msgstr "" msgid "Post style" msgstr "" -#. Theme Name of the plugin/theme #: options.php:562 msgid "Sakura" msgstr "" @@ -1362,131 +1373,135 @@ msgstr "" msgid "Enable NProgress progress bar" msgstr "" -#: options.php:953 options.php:960 +#: options.php:953 options.php:960 options.php:967 msgid "Default off, check on" msgstr "" #: options.php:959 -msgid "Enable Announcement" +msgid "Enable sidebar widget" msgstr "" #: options.php:966 +msgid "Enable Announcement" +msgstr "" + +#: options.php:973 msgid "Announcement content" msgstr "" -#: options.php:967 +#: options.php:974 msgid "" "Announcement content, the text exceeds 142 bytes will be scrolled display (mobile device is " "invalid)" msgstr "" -#: options.php:973 +#: options.php:980 msgid "The categories of articles that don\\t not show on homepage" msgstr "" -#: options.php:974 options.php:981 +#: options.php:981 options.php:988 msgid "Fill in category ID, multiple IDs are divided by a comma \",\"" msgstr "" -#: options.php:980 +#: options.php:987 msgid "Images category" msgstr "" -#: options.php:987 +#: options.php:994 msgid "Statistics Interface" msgstr "" -#: options.php:992 +#: options.php:999 msgid "WP-Statistics plugin (Professional statistics, can exclude invalid access)" msgstr "" -#: options.php:993 +#: options.php:1000 msgid "Theme built-in (simple statistics, calculate each page access request)" msgstr "" -#: options.php:997 +#: options.php:1004 msgid "Statistical data display format" msgstr "" -#: options.php:1002 +#: options.php:1009 msgid "23333 Views (default)" msgstr "" -#: options.php:1003 +#: options.php:1010 msgid "23,333 Views (britain)" msgstr "" -#: options.php:1004 +#: options.php:1011 msgid "23 333 Views (french)" msgstr "" -#: options.php:1005 +#: options.php:1012 msgid "23k Views (chinese)" msgstr "" -#: options.php:1009 +#: options.php:1016 msgid "Comment image upload API" msgstr "" -#: options.php:1014 +#: options.php:1021 msgid "Imgur (https://imgur.com)" msgstr "" -#: options.php:1015 +#: options.php:1022 msgid "SM.MS (https://sm.ms)" msgstr "" -#: options.php:1016 +#: options.php:1023 msgid "Chevereto (https://chevereto.com)" msgstr "" -#: options.php:1020 +#: options.php:1027 msgid "Imgur Client ID" msgstr "" -#: options.php:1021 +#: options.php:1028 msgid "" "Register your application here, note we " "only need the Client ID here." msgstr "" -#: options.php:1027 +#: options.php:1034 msgid "SM.MS Secret Token" msgstr "" -#: options.php:1028 +#: options.php:1035 msgid "Register your application here." msgstr "" -#: options.php:1034 +#: options.php:1041 msgid "Chevereto API v1 key" msgstr "" -#: options.php:1035 +#: options.php:1042 msgid "Get your API key here " msgstr "" -#: options.php:1041 +#: options.php:1048 msgid "Chevereto URL" msgstr "" -#: options.php:1042 +#: options.php:1049 msgid "Your Chevereto homepage url, no slash in the end, eg. https://your.cherverto.com" msgstr "" -#: options.php:1048 +#: options.php:1055 msgid "Comment images proxy" msgstr "" -#: options.php:1049 +#: options.php:1056 msgid "A front-ed proxy for the uploaded images. Leave it blank if you do not need." msgstr "" -#: options.php:1055 +#: options.php:1062 msgid "Imgur upload proxy" msgstr "" -#: options.php:1056 +#: options.php:1063 msgid "" "A back-ed proxy to upload images. You may set a self hosted proxy with Nginx, following my turtal. " @@ -1495,122 +1510,122 @@ msgid "" "】" msgstr "" -#: options.php:1062 +#: options.php:1069 msgid "Enable live search" msgstr "" -#: options.php:1063 +#: options.php:1070 msgid "" "Real-time search in the foreground, call the Rest API to update the cache every hour, you can " "manually set the cache time in functions.php" msgstr "" -#: options.php:1069 +#: options.php:1076 msgid "Include comments in live search" msgstr "" -#: options.php:1070 +#: options.php:1077 msgid "" "Search for comments in real-time search (not recommended if there are too many comments on the " "site)" msgstr "" -#: options.php:1076 +#: options.php:1083 msgid "Enable baguetteBox" msgstr "" -#: options.php:1077 +#: options.php:1084 msgid "" "Default off,please read wiki" msgstr "" -#: options.php:1083 +#: options.php:1090 msgid "Enable lazyload in posts" msgstr "" -#: options.php:1090 +#: options.php:1097 msgid "lazyload spinner" msgstr "" -#: options.php:1091 +#: options.php:1098 msgid "The placeholder to display when the image loads, fill in the image url" msgstr "" -#: options.php:1097 +#: options.php:1104 msgid "Whether to enable the clipboard copyright" msgstr "" -#: options.php:1098 +#: options.php:1105 msgid "" "Automatically add a copyright to the clipboard when copying more than 30 bytes, which is " "enabled by default." msgstr "" -#: options.php:1104 +#: options.php:1111 msgid "Email address prefix" msgstr "" -#: options.php:1105 +#: options.php:1112 msgid "" "For sending system mail, the sender address displayed in the user's mailbox, do not use " "Chinese, the default system email address is bibi@your_domain_name" msgstr "" -#: options.php:1111 +#: options.php:1118 msgid "Comments reply notification" msgstr "" -#: options.php:1112 +#: options.php:1119 msgid "" "WordPress will use email to notify users when their comments receive a reply by default. Tick " "this item allows users to set their own comments reply notification" msgstr "" -#: options.php:1118 +#: options.php:1125 msgid "Administrator comment notification" msgstr "" -#: options.php:1119 +#: options.php:1126 msgid "Whether to use email notification when the administrator's comments receive a reply" msgstr "" -#: options.php:1125 +#: options.php:1132 msgid "Enable private comment" msgstr "" -#: options.php:1126 +#: options.php:1133 msgid "Allow users to set their own comments to be invisible to others" msgstr "" -#: options.php:1132 +#: options.php:1139 msgid "Human verification" msgstr "" -#: options.php:1133 +#: options.php:1140 msgid "Enable human verification" msgstr "" -#: options.php:1139 +#: options.php:1146 msgid "Comment UA infomation" msgstr "" -#: options.php:1140 +#: options.php:1147 msgid "Check to enable, display the user's browser, operating system information" msgstr "" -#: options.php:1146 +#: options.php:1153 msgid "Enable disqus" msgstr "" -#: options.php:1147 +#: options.php:1154 msgid "Enable disqus for comment" msgstr "" -#: options.php:1153 +#: options.php:1160 msgid "Time Zone adjustment" msgstr "" -#: options.php:1154 +#: options.php:1161 msgid "" "If the comment has a time difference problem adjust here, fill in an integer, the calculation " "method: actual_time = display_error_time - the_integer_you_entered (unit: hour)" @@ -1730,27 +1745,3 @@ msgstr "" #: user/page-register.php:92 msgid "Registration is not open yet" msgstr "" - -#. Theme URI of the plugin/theme -msgid "https://2heng.xin/theme-sakura/" -msgstr "" - -#. Description of the plugin/theme -msgid "A branch of theme Akina" -msgstr "" - -#. Author of the plugin/theme -msgid "Mashiro, Louie, Fuzzz" -msgstr "" - -#. Author URI of the plugin/theme -msgid "http://2heng.xin" -msgstr "" - -#. Template Name of the plugin/theme -msgid "archive" -msgstr "" - -#. Template Name of the plugin/theme -msgid "links" -msgstr "" diff --git a/languages/zh_CN.mo b/languages/zh_CN.mo index bdebb1db15c9626ae865d08b8b8272150585f93b..8f8aaea75148211f1d2a7083427120aba2fbb11d 100644 GIT binary patch delta 8048 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 delta 8012 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 H)>ry3`@pU^ diff --git a/languages/zh_CN.po b/languages/zh_CN.po index 2c4de4f..263c731 100644 --- a/languages/zh_CN.po +++ b/languages/zh_CN.po @@ -1,15 +1,15 @@ msgid "" msgstr "" "Project-Id-Version: Sakura\n" -"POT-Creation-Date: 2019-11-14 19:18+0800\n" -"PO-Revision-Date: 2019-11-14 19:31+0800\n" +"POT-Creation-Date: 2019-11-15 23:50+0800\n" +"PO-Revision-Date: 2019-11-15 23:50+0800\n" "Last-Translator: \n" "Language-Team: \n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.2\n" +"X-Generator: Poedit 2.2.4\n" "X-Poedit-Basepath: ..\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Poedit-Flags-xgettext: --add-comments=translators:\n" @@ -38,7 +38,7 @@ msgstr "返回首页" msgid "Don't worry, search in site?" msgstr "别着急,试试站内检索?" -#: 404.php:53 footer.php:62 search.php:42 +#: 404.php:53 footer.php:71 search.php:42 msgid "Search..." msgstr "搜索..." @@ -130,11 +130,15 @@ msgstr "禁止小广告😀" msgid "Site" msgstr "网站" -#: footer.php:75 footer.php:83 -msgid "Want to find something?" +#: footer.php:45 +msgid "Widget" +msgstr "小工具" + +#: footer.php:84 footer.php:92 +msgid "Want to find something?" msgstr "想要找点什么呢?" -#: footer.php:85 +#: footer.php:94 msgid "Search" msgstr "搜索" @@ -142,36 +146,36 @@ msgstr "搜索" msgid "Nav Menus" msgstr "导航菜单" -#: functions.php:388 inc/theme_plus.php:187 layouts/authorprofile.php:11 +#: functions.php:390 inc/theme_plus.php:187 layouts/authorprofile.php:11 #: options.php:123 msgid "Author" msgstr "作者" -#: functions.php:388 +#: functions.php:390 msgid "Blogger" msgstr "博主" -#: functions.php:392 +#: functions.php:394 msgid "Location" msgstr "来自" -#: functions.php:396 +#: functions.php:398 msgid "Private" msgstr "私密" -#: functions.php:398 +#: functions.php:400 msgid "Yes" msgstr "是" -#: functions.php:400 +#: functions.php:402 msgid "No" msgstr "否" -#: functions.php:403 +#: functions.php:405 msgid "Edit" msgstr "编辑" -#: functions.php:484 +#: functions.php:486 msgid "" "Please install pulgin WP-Statistics" @@ -179,36 +183,44 @@ msgstr "" "请安装插件 WP-Statistics" -#: functions.php:537 +#: functions.php:539 msgid "This guy is so lazy ╮(╯▽╰)╭" msgstr "这家伙好懒╮(╯▽╰)╭" -#: functions.php:1258 +#: functions.php:1260 msgid "All expand/collapse" msgstr "全部展开/收缩" -#: functions.php:1273 +#: functions.php:1271 options.php:840 +msgid " " +msgstr "" + +#: functions.php:1275 msgid " post(s)" msgstr " 篇文章" -#: functions.php:1295 functions.php:1298 inc/theme_plus.php:479 +#: functions.php:1297 functions.php:1300 inc/theme_plus.php:479 msgid "Dashboard" msgstr "管理中心" -#: functions.php:1511 +#: functions.php:1513 msgid "ERROR: This email domain (@" msgstr "" -#: functions.php:1591 +#: functions.php:1593 msgid "QQ" msgstr "" +#: functions.php:1649 +msgid "Sidebar" +msgstr "侧栏" + #: header.php:35 #, php-format msgid "page %s " msgstr "第 %s 页 " -#: inc/api.php:241 inc/theme_plus.php:728 +#: inc/api.php:253 inc/theme_plus.php:728 msgid "The comment is private" msgstr "该评论为私密评论" @@ -905,7 +917,7 @@ msgstr "点点" msgid "Whether to turn on the top-feature" msgstr "是否开启聚焦" -#: options.php:443 options.php:1084 +#: options.php:443 options.php:1091 msgid "Default on" msgstr "默认开启" @@ -991,7 +1003,6 @@ msgstr "文章页" msgid "Post style" msgstr "文章样式" -#. Theme Name of the plugin/theme #: options.php:562 msgid "Sakura" msgstr "默认样式" @@ -1408,19 +1419,23 @@ msgstr "原理与Ajax相同" msgid "Enable NProgress progress bar" msgstr "开启NProgress加载进度条" -#: options.php:953 options.php:960 +#: options.php:953 options.php:960 options.php:967 msgid "Default off, check on" msgstr "默认不开启,勾选开启" #: options.php:959 +msgid "Enable sidebar widget" +msgstr "支持侧栏小部件" + +#: options.php:966 msgid "Enable Announcement" msgstr "开启公告" -#: options.php:966 +#: options.php:973 msgid "Announcement content" msgstr "公告内容" -#: options.php:967 +#: options.php:974 msgid "" "Announcement content, the text exceeds 142 bytes will be scrolled display " "(mobile device is invalid)" @@ -1428,72 +1443,72 @@ msgstr "" "公告内容,文字超出142个字节将会被滚动显示(移动端无效),一个汉字 = 3字节,一" "个字母 = 1字节,自己计算吧" -#: options.php:973 +#: options.php:980 msgid "The categories of articles that don\\t not show on homepage" msgstr "首页不显示的分类文章" -#: options.php:974 options.php:981 +#: options.php:981 options.php:988 msgid "Fill in category ID, multiple IDs are divided by a comma \",\"" msgstr "填写分类ID,多个用英文“ , ”分开" -#: options.php:980 +#: options.php:987 msgid "Images category" msgstr "图片展示分类" -#: options.php:987 +#: options.php:994 msgid "Statistics Interface" msgstr "统计接口" -#: options.php:992 +#: options.php:999 msgid "" "WP-Statistics plugin (Professional statistics, can exclude invalid access)" msgstr "WP-Statistics 插件(专业性统计,可排除无效访问)" -#: options.php:993 +#: options.php:1000 msgid "Theme built-in (simple statistics, calculate each page access request)" msgstr "主题内建(简单的统计,计算每一次页面访问请求)" -#: options.php:997 +#: options.php:1004 msgid "Statistical data display format" msgstr "统计数据显示格式" -#: options.php:1002 +#: options.php:1009 msgid "23333 Views (default)" msgstr "23333 次访问(默认)" -#: options.php:1003 +#: options.php:1010 msgid "23,333 Views (britain)" msgstr "23,333 次访问(英式)" -#: options.php:1004 +#: options.php:1011 msgid "23 333 Views (french)" msgstr "23 333 次访问(法式)" -#: options.php:1005 +#: options.php:1012 msgid "23k Views (chinese)" msgstr "23k 次访问(中式)" -#: options.php:1009 +#: options.php:1016 msgid "Comment image upload API" msgstr "评论上传图片接口" -#: options.php:1014 +#: options.php:1021 msgid "Imgur (https://imgur.com)" msgstr "" -#: options.php:1015 +#: options.php:1022 msgid "SM.MS (https://sm.ms)" msgstr "" -#: options.php:1016 +#: options.php:1023 msgid "Chevereto (https://chevereto.com)" msgstr "" -#: options.php:1020 +#: options.php:1027 msgid "Imgur Client ID" msgstr "" -#: options.php:1021 +#: options.php:1028 msgid "" "Register your application here, note we only need the Client ID here." @@ -1501,48 +1516,48 @@ msgstr "" "在这里注册你的 " "application , 注意此处只需要填写 Client ID." -#: options.php:1027 +#: options.php:1034 msgid "SM.MS Secret Token" msgstr "" -#: options.php:1028 +#: options.php:1035 msgid "" "Register your application here." msgstr "在这里获取 key." -#: options.php:1034 +#: options.php:1041 msgid "Chevereto API v1 key" msgstr "" -#: options.php:1035 +#: options.php:1042 msgid "Get your API key here " msgstr "在这里获取你的 API key:" -#: options.php:1041 +#: options.php:1048 msgid "Chevereto URL" msgstr "" -#: options.php:1042 +#: options.php:1049 msgid "" "Your Chevereto homepage url, no slash in the end, eg. https://your.cherverto." "com" msgstr "" "你的 Chevereto 首页 url, 注意结尾没有 /, 例如:https://your.cherverto.com" -#: options.php:1048 +#: options.php:1055 msgid "Comment images proxy" msgstr "评论图片代理" -#: options.php:1049 +#: options.php:1056 msgid "" "A front-ed proxy for the uploaded images. Leave it blank if you do not need." msgstr "前端显示的图片的代理" -#: options.php:1055 +#: options.php:1062 msgid "Imgur upload proxy" msgstr "Imgur 上传代理" -#: options.php:1056 +#: options.php:1063 msgid "" "A back-ed proxy to upload images. You may set a self hosted proxy with " "Nginx, following my https://api.imgur.com/3/image/】" -#: options.php:1062 +#: options.php:1069 msgid "Enable live search" msgstr "启用实时搜索" -#: options.php:1063 +#: options.php:1070 msgid "" "Real-time search in the foreground, call the Rest API to update the cache " "every hour, you can manually set the cache time in functions.php" @@ -1569,21 +1584,21 @@ msgstr "" "前台实现实时搜索,调用 Rest API 每小时更新一次缓存,可在 functions.php 里手动" "设置缓存时间" -#: options.php:1069 +#: options.php:1076 msgid "Include comments in live search" msgstr "实时搜索包含评论" -#: options.php:1070 +#: options.php:1077 msgid "" "Search for comments in real-time search (not recommended if there are too " "many comments on the site)" msgstr "在实时搜索中搜索评论(如果网站评论数量太多不建议开启)" -#: options.php:1076 +#: options.php:1083 msgid "Enable baguetteBox" msgstr "启用 baguetteBox" -#: options.php:1077 +#: options.php:1084 msgid "" "Default off,please read wiki" @@ -1591,33 +1606,33 @@ msgstr "" "默认禁用,请阅" "读说明" -#: options.php:1083 +#: options.php:1090 msgid "Enable lazyload in posts" msgstr "文章内图片启用 lazyload" -#: options.php:1090 +#: options.php:1097 msgid "lazyload spinner" msgstr "lazyload 占位图" -#: options.php:1091 +#: options.php:1098 msgid "The placeholder to display when the image loads, fill in the image url" msgstr "图片加载时要显示的占位图,填写图片 url" -#: options.php:1097 +#: options.php:1104 msgid "Whether to enable the clipboard copyright" msgstr "是否开启剪贴板版权标识" -#: options.php:1098 +#: options.php:1105 msgid "" "Automatically add a copyright to the clipboard when copying more than 30 " "bytes, which is enabled by default." msgstr "复制超过30个字节时自动向剪贴板添加版权标识,默认开启。" -#: options.php:1104 +#: options.php:1111 msgid "Email address prefix" msgstr "发件地址前缀" -#: options.php:1105 +#: options.php:1112 msgid "" "For sending system mail, the sender address displayed in the user's mailbox, " "do not use Chinese, the default system email address is bibi@your_domain_name" @@ -1625,11 +1640,11 @@ msgstr "" "用于发送系统邮件,在用户的邮箱中显示的发件人地址,不要使用中文,默认系统邮件" "地址为 bibi@你的域名" -#: options.php:1111 +#: options.php:1118 msgid "Comments reply notification" msgstr "邮件回复通知" -#: options.php:1112 +#: options.php:1119 msgid "" "WordPress will use email to notify users when their comments receive a reply " "by default. Tick this item allows users to set their own comments reply " @@ -1638,54 +1653,54 @@ msgstr "" "WordPress默认会使用邮件通知用户评论收到回复,开启此项允许用户设置自己的评论收" "到回复时是否使用邮件通知" -#: options.php:1118 +#: options.php:1125 msgid "Administrator comment notification" msgstr "邮件回复通知管理员" -#: options.php:1119 +#: options.php:1126 msgid "" "Whether to use email notification when the administrator's comments receive " "a reply" msgstr "当管理员评论收到回复时是否使用邮件通知" -#: options.php:1125 +#: options.php:1132 msgid "Enable private comment" msgstr "允许私密评论" -#: options.php:1126 +#: options.php:1133 msgid "Allow users to set their own comments to be invisible to others" msgstr "允许用户设置自己的评论对其他人不可见" -#: options.php:1132 +#: options.php:1139 msgid "Human verification" msgstr "机器人验证" -#: options.php:1133 +#: options.php:1140 msgid "Enable human verification" msgstr "开启机器人验证" -#: options.php:1139 +#: options.php:1146 msgid "Comment UA infomation" msgstr "评论UA信息" -#: options.php:1140 +#: options.php:1147 msgid "" "Check to enable, display the user's browser, operating system information" msgstr "勾选开启,显示用户的浏览器,操作系统信息" -#: options.php:1146 +#: options.php:1153 msgid "Enable disqus" msgstr "开启多说插件支持" -#: options.php:1147 +#: options.php:1154 msgid "Enable disqus for comment" msgstr "多说已经凉了~~" -#: options.php:1153 +#: options.php:1160 msgid "Time Zone adjustment" msgstr "时区调整" -#: options.php:1154 +#: options.php:1161 msgid "" "If the comment has a time difference problem adjust here, fill in an " "integer, the calculation method: actual_time = display_error_time - " @@ -1813,29 +1828,8 @@ msgstr "注 册" msgid "Registration is not open yet" msgstr "暂未开放注册。 " -#. Theme URI of the plugin/theme -msgid "https://2heng.xin/theme-sakura/" -msgstr "" - -#. Description of the plugin/theme -msgid "A branch of theme Akina" -msgstr "Akina主题分支(原版地址 http://www.akina.pw/themeakina)" - -#. Author of the plugin/theme -msgid "Mashiro, Louie, Fuzzz" -msgstr "" - -#. Author URI of the plugin/theme -msgid "http://2heng.xin" -msgstr "" - -#. Template Name of the plugin/theme -msgid "archive" -msgstr "" - -#. Template Name of the plugin/theme -msgid "links" -msgstr "" +#~ msgid "A branch of theme Akina" +#~ msgstr "Akina主题分支(原版地址 http://www.akina.pw/themeakina)" #, php-format #~ msgid "第 %s 页" diff --git a/options.php b/options.php index 8618063..ea44fe9 100644 --- a/options.php +++ b/options.php @@ -837,7 +837,7 @@ function optionsframework_options() { $options[] = array( 'name' => __('Login/registration related settings', 'sakura'),/*登陆/注册相关设定*/ - 'desc' => __('', 'sakura'), + 'desc' => __(' ', 'space' , 'sakura'), 'id' => 'login_tip', 'std' => '', 'type' => 'typography '); From 4212feeccd7e0d288915bbb2c34de30a9962cb23 Mon Sep 17 00:00:00 2001 From: spirit Date: Sat, 16 Nov 2019 10:13:37 +0800 Subject: [PATCH 05/13] fix --- footer.php | 4 +++- functions.php | 26 +++++++++++++------------- languages/en_US.mo | Bin 1267 -> 1267 bytes languages/en_US.po | 14 +++++++------- languages/sakura.pot | 12 ++++++------ languages/zh_CN.mo | Bin 32480 -> 32534 bytes languages/zh_CN.po | 18 ++++++++---------- style.css | 11 +++++++++++ 8 files changed, 48 insertions(+), 37 deletions(-) diff --git a/footer.php b/footer.php index 560dd26..f0f3191 100644 --- a/footer.php +++ b/footer.php @@ -38,15 +38,17 @@
+ +
diff --git a/functions.php b/functions.php index 7f4978f..7c7ef87 100644 --- a/functions.php +++ b/functions.php @@ -645,19 +645,19 @@ function wpjam_custom_upload_dir( $uploads ) { * 删除自带小工具 */ function unregister_default_widgets() { - //unregister_widget("WP_Widget_Pages"); - unregister_widget("WP_Widget_Calendar"); - //unregister_widget("WP_Widget_Archives"); - unregister_widget("WP_Widget_Links"); - unregister_widget("WP_Widget_Meta"); - //unregister_widget("WP_Widget_Search"); - unregister_widget("WP_Widget_Text"); - //unregister_widget("WP_Widget_Categories"); - //unregister_widget("WP_Widget_Recent_Posts"); - unregister_widget("WP_Widget_Recent_Comments"); - unregister_widget("WP_Widget_RSS"); - unregister_widget("WP_Widget_Tag_Cloud"); - //unregister_widget("WP_Nav_Menu_Widget"); + unregister_widget("WP_Widget_Pages"); + unregister_widget("WP_Widget_Calendar"); + unregister_widget("WP_Widget_Archives"); + unregister_widget("WP_Widget_Links"); + unregister_widget("WP_Widget_Meta"); + unregister_widget("WP_Widget_Search"); + //unregister_widget("WP_Widget_Text"); + unregister_widget("WP_Widget_Categories"); + unregister_widget("WP_Widget_Recent_Posts"); + //unregister_widget("WP_Widget_Recent_Comments"); + //unregister_widget("WP_Widget_RSS"); + //unregister_widget("WP_Widget_Tag_Cloud"); + unregister_widget("WP_Nav_Menu_Widget"); } add_action("widgets_init", "unregister_default_widgets", 11); diff --git a/languages/en_US.mo b/languages/en_US.mo index 152f1015de6491df4668527ff76add190c546ef4..d3ca127ad7d120640c9949f670a7ca2e55516c58 100644 GIT binary patch delta 19 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 diff --git a/languages/zh_CN.po b/languages/zh_CN.po index 263c731..7d5c135 100644 --- a/languages/zh_CN.po +++ b/languages/zh_CN.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: Sakura\n" -"POT-Creation-Date: 2019-11-15 23:50+0800\n" -"PO-Revision-Date: 2019-11-15 23:50+0800\n" +"POT-Creation-Date: 2019-11-16 10:08+0800\n" +"PO-Revision-Date: 2019-11-16 10:11+0800\n" "Last-Translator: \n" "Language-Team: \n" "Language: zh_CN\n" @@ -38,7 +38,7 @@ msgstr "返回首页" msgid "Don't worry, search in site?" msgstr "别着急,试试站内检索?" -#: 404.php:53 footer.php:71 search.php:42 +#: 404.php:53 footer.php:73 search.php:42 msgid "Search..." msgstr "搜索..." @@ -130,15 +130,15 @@ msgstr "禁止小广告😀" msgid "Site" msgstr "网站" -#: footer.php:45 -msgid "Widget" +#: footer.php:46 +msgid "Widgets" msgstr "小工具" -#: footer.php:84 footer.php:92 +#: footer.php:86 footer.php:94 msgid "Want to find something?" msgstr "想要找点什么呢?" -#: footer.php:94 +#: footer.php:96 msgid "Search" msgstr "搜索" @@ -1020,10 +1020,8 @@ msgid "Post share" msgstr "文章分享" #: options.php:587 -#, fuzzy -#| msgid "Previous" msgid "Previous and Next" -msgstr "上一页" +msgstr "上一篇下一篇" #: options.php:597 msgid "Author profile" diff --git a/style.css b/style.css index 30c1e58..9882d7e 100644 --- a/style.css +++ b/style.css @@ -8524,6 +8524,16 @@ h1[id*=toc-head]::before,h2[id*=toc-head]::before,h3[id*=toc-head]::before,h4[id overflow-y: auto; } +.widget-area .sakura_widget h2 { + border-bottom: 1px solid #000; +} + +.widget-area .sakura_widget ol,.widget-area .sakura_widget ul { + margin: 0; + padding: 0; + list-style: none; +} + .widget-area .heading{ color: #555; font-size: 20px; @@ -8542,6 +8552,7 @@ h1[id*=toc-head]::before,h2[id*=toc-head]::before,h3[id*=toc-head]::before,h4[id border-color: #ddd; outline:none; box-shadow: none; + border: none; border-left-width: 0; } From e4f38f958a4f6866a1d6e944dc886989a62fcda5 Mon Sep 17 00:00:00 2001 From: spirit Date: Sat, 16 Nov 2019 15:07:31 +0800 Subject: [PATCH 06/13] fix style --- style.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/style.css b/style.css index 9882d7e..dcc3e5e 100644 --- a/style.css +++ b/style.css @@ -8507,10 +8507,11 @@ h1[id*=toc-head]::before,h2[id*=toc-head]::before,h3[id*=toc-head]::before,h4[id left: -400px; z-index: 3; width: 400px; - webkit-transition: .3s; + -webkit-transition: .3s; transition: all .3s; background-color: rgba(255,255,255,0.8); box-shadow: 0 1px 20px -8px rgba(0,0,0,.5); + z-index: 50; } .widget-area.active{ top: 100px; From f02fd4e6c120f0ef26136da07dd9ac40d7aa4572 Mon Sep 17 00:00:00 2001 From: spirit Date: Sat, 16 Nov 2019 18:55:23 +0800 Subject: [PATCH 07/13] fix style --- footer.php | 4 ++-- style.css | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/footer.php b/footer.php index f0f3191..383c2a5 100644 --- a/footer.php +++ b/footer.php @@ -40,8 +40,8 @@
- - -
@@ -150,16 +139,25 @@
+ + + -
-
- +
+
+ diff --git a/js/sakura-app.js b/js/sakura-app.js index 51bf1e8..c96d6b6 100644 --- a/js/sakura-app.js +++ b/js/sakura-app.js @@ -798,12 +798,14 @@ if (mashiro_option.float_player_on) { maxHeight: '250px' }); $(".aplayer.aplayer-fixed .aplayer-body").removeClass("ap-hover"); + $("#secondary").addClass("active"); apSwitchTag = 1; } else { aplayerlist.css({ maxHeight: '0px' }); $(".aplayer.aplayer-fixed .aplayer-body").addClass("ap-hover"); + $("#secondary").removeClass("active"); apSwitchTag = 0; } }); @@ -978,7 +980,7 @@ function mail_me() { function activate_widget(){ if (document.body.clientWidth > 860) { - $('.show_hide').on('click', function() { + $('.show-hide').on('click', function() { $("#secondary").toggleClass("active") }); }else{ diff --git a/languages/en_US.po b/languages/en_US.po index d17da4b..8cf2e3c 100644 --- a/languages/en_US.po +++ b/languages/en_US.po @@ -130,7 +130,7 @@ msgstr "" msgid "Site" msgstr "" -#: footer.php:46 +#: footer.php:144 msgid "Widgets" msgstr "" diff --git a/languages/sakura.pot b/languages/sakura.pot index 2a78768..4c51f51 100644 --- a/languages/sakura.pot +++ b/languages/sakura.pot @@ -130,7 +130,7 @@ msgstr "" msgid "Site" msgstr "" -#: footer.php:46 +#: footer.php:144 msgid "Widgets" msgstr "" diff --git a/languages/zh_CN.po b/languages/zh_CN.po index 7d5c135..b9cd753 100644 --- a/languages/zh_CN.po +++ b/languages/zh_CN.po @@ -130,7 +130,7 @@ msgstr "禁止小广告😀" msgid "Site" msgstr "网站" -#: footer.php:46 +#: footer.php:144 msgid "Widgets" msgstr "小工具" diff --git a/style.css b/style.css index edb07d8..d73ba44 100644 --- a/style.css +++ b/style.css @@ -8502,8 +8502,8 @@ h1[id*=toc-head]::before,h2[id*=toc-head]::before,h3[id*=toc-head]::before,h4[id .widget-area { position: fixed; - top: calc(100% - 132px); - bottom: 10%; + top: 100px; + bottom: 66px; left: -400px; z-index: 3; width: 400px; @@ -8513,9 +8513,8 @@ h1[id*=toc-head]::before,h2[id*=toc-head]::before,h3[id*=toc-head]::before,h4[id box-shadow: 0 1px 20px -8px rgba(0,0,0,.5); z-index: 50; } + .widget-area.active{ - top: 100px; - bottom: 80px; left: -1px !important; } @@ -8545,18 +8544,47 @@ h1[id*=toc-head]::before,h2[id*=toc-head]::before,h3[id*=toc-head]::before,h4[id border-color: #ddd; } -.widget-area .show_hide{ +.widget-area .show-hide-wrap{ position: absolute; - right: -42px; - height: 30px; - background: #f5f5f5; - border-color: #ddd; + background: #e6e6e6; + right: -18px; + width: 18px; + height: 66px; + border-radius: 0 6px 6px 0; + z-index: 50; +} + +.active .show-hide-wrap { + width: 100%; + right: 0; + transition: all .3s ease; +} + +.widget-area .show-hide{ + display: inline-block; + width: 100%; + height: 100%; + font-size: 12px; outline:none; box-shadow: none; border: none; - border-left-width: 0; + opacity: .8; + vertical-align: middle; + padding: 0; + margin: 0; + -webkit-transform: rotateY(0); + transform: rotateY(0); + cursor: pointer; + border-radius: 0 6px 6px 0; + transition: all .3s ease; } -.widget-area .show_hide .fa{ - font-size: 20px; +.widget-area.active .show-hide{ + -webkit-transform: rotateY(180deg); + transform: rotateY(180deg); +} + +.widget-area .show-hide svg{ + width: 100%; + height: 100%; } From c025d6b6ff0a9537d430e75042f074385f590fba Mon Sep 17 00:00:00 2001 From: spirit Date: Sun, 17 Nov 2019 12:02:50 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=99=BB=E9=99=86?= =?UTF-8?q?=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- inc/login.css | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/inc/login.css b/inc/login.css index 0d02126..4412e1c 100644 --- a/inc/login.css +++ b/inc/login.css @@ -66,9 +66,10 @@ color: #676767 !important} background: none; box-shadow: none; margin-top: 10px; + border: none; } -#login form p { +#login form p,#login form .user-pass-wrap { font-family:"Microsoft Yahei"; position:relative; padding:0px 35px; @@ -116,6 +117,18 @@ color: #676767 !important} border: 1px solid #FF5656; } +.login .button.wp-hide-pw{ + height: 46px; + outline: none; + box-shadow: none; + border: none; + opacity: .8; +} + +.login .button.wp-hide-pw .dashicons{ + right: 1rem; +} + #login .form-send .bot { width:100%; border-bottom:1px solid #ccc; From 8f648d6819eb27596f09d8e41d12935094424383 Mon Sep 17 00:00:00 2001 From: spirit Date: Sun, 17 Nov 2019 17:00:40 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E8=AF=84=E8=AE=BAMarkdown=E8=A7=A3?= =?UTF-8?q?=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- functions.php | 49 +++++++++++++++++++++++++++++++++++++++++++++++ inc/Parsedown.php | 18 +++++++++++++++-- 2 files changed, 65 insertions(+), 2 deletions(-) diff --git a/functions.php b/functions.php index 7c7ef87..4de01d5 100644 --- a/functions.php +++ b/functions.php @@ -1655,4 +1655,53 @@ if (akina_option('sakura_widget')) { )); } } + +// 评论Markdown解析 +function markdown_parser($incoming_comment) { + global $wpdb,$comment_markdown_content; + $myCustomer = $wpdb->get_row("SELECT * FROM wp_comments"); + //Add column if not present. + if (!isset($myCustomer->say_state)) { + $wpdb->query("ALTER TABLE wp_comments ADD comment_markdown text"); + } + $comment_markdown_content = $incoming_comment['comment_content']; + include 'inc/Parsedown.php'; + $Parsedown = new Parsedown(); + $incoming_comment['comment_content'] = $Parsedown->text($incoming_comment['comment_content']); + return $incoming_comment; +} +add_filter('preprocess_comment' , 'markdown_parser'); + +//保存Markdown评论 +function save_markdown_comment($comment_ID, $comment_approved) { + global $wpdb,$comment_markdown_content; + $comment = get_comment($comment_ID); + $comment_content = $comment_markdown_content; + //store markdow content + $wpdb->query("UPDATE wp_comments SET comment_markdown='".$comment_content."' WHERE comment_ID='".$comment_ID."';"); +} +add_action('comment_post', 'save_markdown_comment', 10, 2); + +//打开评论HTML标签限制 +function allow_more_tag_in_comment() { + global $allowedtags; + $allowedtags['pre'] = array('class'=>array()); + $allowedtags['code'] = array('class'=>array()); + $allowedtags['h1'] = array('class'=>array()); + $allowedtags['h2'] = array('class'=>array()); + $allowedtags['h3'] = array('class'=>array()); + $allowedtags['h4'] = array('class'=>array()); + $allowedtags['h5'] = array('class'=>array()); + $allowedtags['ul'] = array('class'=>array()); + $allowedtags['ol'] = array('class'=>array()); + $allowedtags['li'] = array('class'=>array()); + $allowedtags['td'] = array('class'=>array()); + $allowedtags['th'] = array('class'=>array()); + $allowedtags['tr'] = array('class'=>array()); + $allowedtags['table'] = array('class'=>array()); + $allowedtags['thead'] = array('class'=>array()); + $allowedtags['tbody'] = array('class'=>array()); + $allowedtags['span'] = array('class'=>array()); +} +add_action('pre_comment_on_post', 'allow_more_tag_in_comment'); //code end diff --git a/inc/Parsedown.php b/inc/Parsedown.php index 87d612a..a34b44f 100644 --- a/inc/Parsedown.php +++ b/inc/Parsedown.php @@ -17,7 +17,7 @@ class Parsedown { # ~ - const version = '1.7.1'; + const version = '1.7.3'; # ~ @@ -429,7 +429,21 @@ class Parsedown if (isset($matches[1])) { - $class = 'language-'.$matches[1]; + /** + * https://www.w3.org/TR/2011/WD-html5-20110525/elements.html#classes + * Every HTML element may have a class attribute specified. + * The attribute, if specified, must have a value that is a set + * of space-separated tokens representing the various classes + * that the element belongs to. + * [...] + * The space characters, for the purposes of this specification, + * are U+0020 SPACE, U+0009 CHARACTER TABULATION (tab), + * U+000A LINE FEED (LF), U+000C FORM FEED (FF), and + * U+000D CARRIAGE RETURN (CR). + */ + $language = substr($matches[1], 0, strcspn($matches[1], " \t\n\f\r")); + + $class = 'language-'.$language; $Element['attributes'] = array( 'class' => $class, From 6c6aab900b7ade92d62c1cc04f2bbe100b985316 Mon Sep 17 00:00:00 2001 From: spirit Date: Sun, 17 Nov 2019 17:05:24 +0800 Subject: [PATCH 11/13] Markdown Supported while Forbidden --- functions.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/functions.php b/functions.php index 4de01d5..76c5290 100644 --- a/functions.php +++ b/functions.php @@ -1659,6 +1659,11 @@ if (akina_option('sakura_widget')) { // 评论Markdown解析 function markdown_parser($incoming_comment) { global $wpdb,$comment_markdown_content; + $re = '/```([\s\S]*?)```[\s]*|`{1,2}[^`](.*?)`{1,2}|\[.*?\]\([\s\S]*?\)/m'; + if(preg_replace($re,'temp',$incoming_comment['comment_content']) != strip_tags(preg_replace($re,'temp',$incoming_comment['comment_content']))){ + siren_ajax_comment_err('评论只支持Markdown啦,见谅╮( ̄▽ ̄)╭
Markdown Supported while Forbidden'); + return( $incoming_comment ); + } $myCustomer = $wpdb->get_row("SELECT * FROM wp_comments"); //Add column if not present. if (!isset($myCustomer->say_state)) { From 199cd2918821caeb47bb40453e1efd3ec264868f Mon Sep 17 00:00:00 2001 From: spirit Date: Sun, 17 Nov 2019 18:43:38 +0800 Subject: [PATCH 12/13] update to v3.3.2 --- functions.php | 14 +------------- style.css | 2 +- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/functions.php b/functions.php index 76c5290..bc3190a 100644 --- a/functions.php +++ b/functions.php @@ -7,9 +7,8 @@ * @package Sakura */ -define( 'SAKURA_VERSION', '3.3.1' ); +define( 'SAKURA_VERSION', '3.3.2' ); define( 'BUILD_VERSION', '3' ); -define( 'JSDELIVR_VERSION', '3.6.7' ); //ini_set('display_errors', true); //error_reporting(E_ALL); @@ -1190,17 +1189,6 @@ add_filter('the_content', 'toc_support'); add_filter('the_excerpt_rss', 'toc_support'); add_filter('the_content_feed', 'toc_support'); -// Markdown parser -/* 处理超时?? -function markdown_parser($content) { - include 'inc/Parsedown.php'; - $Parsedown = new Parsedown(); - $content = $Parsedown->text($content); - return $content; -} -add_filter( 'comment_text', 'markdown_parser' ); -*/ - // 显示访客当前 IP function get_the_user_ip() { if ( ! empty( $_SERVER['HTTP_CLIENT_IP'] ) ) { diff --git a/style.css b/style.css index d73ba44..af83394 100644 --- a/style.css +++ b/style.css @@ -5,7 +5,7 @@ Theme URI: https://2heng.xin/theme-sakura/ Author: Mashiro, Louie, Fuzzz Author URI: http://2heng.xin Description: A branch of theme Akina -Version: 3.3.1 +Version: 3.3.2 License: GNU General Public License v2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html Text Domain: sakura From ee31581644f0e3a0df117bea7fb0b33b2f013cd3 Mon Sep 17 00:00:00 2001 From: spirit Date: Sun, 17 Nov 2019 18:52:21 +0800 Subject: [PATCH 13/13] fix --- functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions.php b/functions.php index bc3190a..eb95859 100644 --- a/functions.php +++ b/functions.php @@ -738,7 +738,7 @@ function bolo_QTnextpage_arg1() { //Login Page style function custom_login() { //echo ''."\n"; - echo ''."\n"; + echo ''."\n"; //echo ''."\n"; echo ''."\n"; }