Merge branch 'master' into pr-branch

pull/121/head
Mashiro 2019-10-30 20:39:10 +08:00 committed by GitHub
commit 32d2297128
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 3099 additions and 253 deletions

View File

@ -37,7 +37,7 @@ function akina_setup() {
* If you're building a theme based on Akina, use a find and replace
* to change 'akina' to the name of your theme in all the template files.
*/
load_theme_textdomain( 'akina', get_template_directory() . '/languages' );
load_theme_textdomain( 'sakura', get_template_directory() . '/languages' );
/*
@ -113,14 +113,14 @@ function akina_setup() {
* Disable the emoji's
*/
function disable_emojis() {
remove_action( 'wp_head', 'print_emoji_detection_script', 7 );
remove_action( 'admin_print_scripts', 'print_emoji_detection_script' );
remove_action( 'wp_print_styles', 'print_emoji_styles' );
remove_action( 'admin_print_styles', 'print_emoji_styles' );
remove_filter( 'the_content_feed', 'wp_staticize_emoji' );
remove_filter( 'comment_text_rss', 'wp_staticize_emoji' );
remove_filter( 'wp_mail', 'wp_staticize_emoji_for_email' );
add_filter( 'tiny_mce_plugins', 'disable_emojis_tinymce' );
remove_action( 'wp_head', 'print_emoji_detection_script', 7 );
remove_action( 'admin_print_scripts', 'print_emoji_detection_script' );
remove_action( 'wp_print_styles', 'print_emoji_styles' );
remove_action( 'admin_print_styles', 'print_emoji_styles' );
remove_filter( 'the_content_feed', 'wp_staticize_emoji' );
remove_filter( 'comment_text_rss', 'wp_staticize_emoji' );
remove_filter( 'wp_mail', 'wp_staticize_emoji_for_email' );
add_filter( 'tiny_mce_plugins', 'disable_emojis_tinymce' );
}
add_action( 'init', 'disable_emojis' );

BIN
languages/en_US.mo 100644

Binary file not shown.

1424
languages/en_US.po 100644

File diff suppressed because it is too large Load Diff

BIN
languages/zh_CN.mo 100644

Binary file not shown.

1422
languages/zh_CN.po 100644

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -8,7 +8,7 @@ Description: Akina主题分支原版地址 http://www.akina.pw/themeakina
Version: 3.2.7
License: GNU General Public License v2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Text Domain: Sakura
Text Domain: sakura
Tags:
*/