diff --git a/footer.php b/footer.php index 8460cf6..4303f6f 100644 --- a/footer.php +++ b/footer.php @@ -72,7 +72,7 @@
- +
@@ -80,7 +80,7 @@
-

+

@@ -139,16 +139,25 @@ + + + -
-
- +
+
+ diff --git a/functions.php b/functions.php index d6bd51d..eb95859 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); @@ -203,7 +202,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' ); @@ -385,19 +386,19 @@ if(!function_exists('akina_comment_format')){
-

comment_author_email, '24', '', get_comment_author() ); ?> comment_author_email,$comment->user_id); ?>

+

comment_author_email, '24', '', get_comment_author() ); ?> comment_author_email,$comment->user_id); ?>

$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"), ' ', ''); @@ -426,7 +427,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) @@ -434,7 +435,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) @@ -643,19 +644,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); @@ -737,7 +738,7 @@ function bolo_QTnextpage_arg1() { //Login Page style function custom_login() { //echo ''."\n"; - echo ''."\n"; + echo ''."\n"; //echo ''."\n"; echo ''."\n"; } @@ -1188,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'] ) ) { @@ -1266,7 +1256,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; @@ -1640,4 +1630,71 @@ function sakura_comment_notify($comment_id){ } add_action('comment_post', 'sakura_comment_notify'); -//code end \ No newline at end of file +//侧栏小工具 +if (akina_option('sakura_widget')) { + if (function_exists('register_sidebar')) { + register_sidebar(array( + 'name' => __('Sidebar'),//侧栏 + 'id' => 'sakura_widget', + 'before_widget' => '
      ', + 'after_widget' => '
      ', + 'before_title' => '

      ', + 'after_title' => '

      ' + )); + } +} + +// 评论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)) { + $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/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/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, 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/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; diff --git a/js/sakura-app.js b/js/sakura-app.js index db66148..c96d6b6 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, @@ -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; } }); @@ -976,6 +978,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); @@ -1376,7 +1389,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 +1884,4 @@ if ((isWebkit || isOpera || isIe) && document.getElementById && window.addEventL element.focus(); } }, false); -} \ No newline at end of file +} diff --git a/languages/en_US.mo b/languages/en_US.mo index b2bd4df..d3ca127 100644 Binary files a/languages/en_US.mo and b/languages/en_US.mo differ diff --git a/languages/en_US.po b/languages/en_US.po index 360c122..8cf2e3c 100644 --- a/languages/en_US.po +++ b/languages/en_US.po @@ -1,15 +1,15 @@ msgid "" msgstr "" "Project-Id-Version: Sakura\n" -"POT-Creation-Date: 2019-11-14 19:31+0800\n" -"PO-Revision-Date: 2019-11-14 19:31+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: en_US\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=2; plural=(n != 1);\n" "X-Poedit-Flags-xgettext: --add-comments=translators:\n" @@ -38,7 +38,7 @@ msgstr "Return to home page" msgid "Don't worry, search in site?" msgstr "" -#: 404.php:53 footer.php:62 search.php:42 +#: 404.php:53 footer.php:73 search.php:42 msgid "Search..." msgstr "Search..." @@ -130,11 +130,15 @@ msgstr "" msgid "Site" msgstr "" -#: footer.php:75 footer.php:83 -msgid "Want to find something？" +#: footer.php:144 +msgid "Widgets" msgstr "" -#: footer.php:85 +#: footer.php:86 footer.php:94 +msgid "Want to find something?" +msgstr "" + +#: footer.php:96 msgid "Search" msgstr "" @@ -142,71 +146,79 @@ 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" 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..4c51f51 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-16 10:11+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:73 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:144 +msgid "Widgets" msgstr "" -#: footer.php:85 +#: footer.php:86 footer.php:94 +msgid "Want to find something?" +msgstr "" + +#: footer.php:96 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 bdebb1d..a83661d 100644 Binary files a/languages/zh_CN.mo and b/languages/zh_CN.mo differ diff --git a/languages/zh_CN.po b/languages/zh_CN.po index 2c4de4f..b9cd753 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-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" "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:73 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:144 +msgid "Widgets" +msgstr "小工具" + +#: footer.php:86 footer.php:94 +msgid "Want to find something?" msgstr "想要找点什么呢？" -#: footer.php:85 +#: footer.php:96 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 "默认样式" @@ -1009,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" @@ -1408,19 +1417,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 +1441,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 +1514,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 +1582,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 +1604,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 +1638,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 +1651,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 +1826,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 4cacb2b..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 '); @@ -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..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 @@ -8500,3 +8500,91 @@ h1[id*=toc-head]::before,h2[id*=toc-head]::before,h3[id*=toc-head]::before,h4[id visibility:hidden } +.widget-area { + position: fixed; + top: 100px; + bottom: 66px; + 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); + z-index: 50; +} + +.widget-area.active{ + left: -1px !important; +} + +.widget-area .sakura_widget{ + padding: 16px; + height: calc(100% - 30px); + 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; + font-weight: 900; + text-align: center; + height: 30px; + background-color: #f5f5f5; + border-color: #ddd; +} + +.widget-area .show-hide-wrap{ + position: absolute; + 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; + 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.active .show-hide{ + -webkit-transform: rotateY(180deg); + transform: rotateY(180deg); +} + +.widget-area .show-hide svg{ + width: 100%; + height: 100%; +}