diff --git a/archive.php b/archive.php index dcea781..d0a6b7e 100644 --- a/archive.php +++ b/archive.php @@ -7,7 +7,6 @@ * @package zillah */ -global $wp_customize; $zillah_sidebar_show = get_theme_mod( 'zillah_sidebar_show', false ); get_header(); ?> diff --git a/functions.php b/functions.php index bcbd541..8b531e8 100644 --- a/functions.php +++ b/functions.php @@ -345,7 +345,7 @@ function zillah_brand(){ } else { $zillah_logo_old = get_theme_mod( 'zillah_logo_old', false ); echo ''; } @@ -378,8 +378,6 @@ function zillah_brand(){ function zillah_slider(){ - global $post; - $zillah_home_slider_show = get_theme_mod( 'zillah_home_slider_show', false ); if ( ! is_paged() && is_front_page() && ( $zillah_home_slider_show === true || $zillah_home_slider_show === false && is_customize_preview() ) ): @@ -398,7 +396,7 @@ function zillah_slider(){ $slider_posts = new WP_Query( $args ); - $size = intval( round( $slider_posts->post_count / 2, 0, PHP_ROUND_HALF_DOWN) ); + $size = (int)( round( $slider_posts->post_count / 2, 0, PHP_ROUND_HALF_DOWN) ); echo "
"; @@ -425,11 +423,11 @@ function zillah_slider(){
- + @@ -505,12 +503,11 @@ function zillah_php_style() { $zillah_c1 = $zillah_picker->color1; $zillah_c2 = $zillah_picker->color2; $zillah_c3 = $zillah_picker->color3; - $zillah_c4 = $zillah_picker->color4; $zillah_c5 = $zillah_picker->color5; - } - $header_text_color = get_header_textcolor(); + } + $header_text_color = get_theme_mod('header_textcolor','7fcaad'); $zillah_first_font_one = get_theme_mod( 'zillah_google_fonts_one' ); $zillah_first_font_two = get_theme_mod( 'zillah_google_fonts_two' ); @@ -523,12 +520,17 @@ function zillah_php_style() { $zillah_font_size = get_theme_mod( 'zillah_select_box_font_size', '16px' ); - if( isset( $zillah_c5 ) ) { - $rgb = zillah_get_rgb( $zillah_c5 ); - } echo ''; } -/** - * Converts a HEX value to RGB. - */ -function zillah_get_rgb( $color ) { - - preg_match_all('!\d+!', $color, $matches); - - return array( 'red' => $matches[0][0], 'green' => $matches[0][1], 'blue' => $matches[0][2] ); -} - function zillah_custom_excerpt_length( $length ) { - global $wp_customize; $zillah_sidebar_show = get_theme_mod( 'zillah_sidebar_show', false ); if( $zillah_sidebar_show ) { @@ -814,12 +804,14 @@ function zillah_post_image() { /* Get the first image from post */ function zillah_catch_that_image() { - global $post, $posts; + global $post; $first_img = false; ob_start(); ob_end_clean(); - $output = preg_match_all('//i', $post->post_content, $matches); - $first_img = ! empty( $matches[1][0] ) ? $matches[1][0] : false; + preg_match_all('//i', $post->post_content, $matches); + if( !empty( $matches[1][0] ) ){ + $first_img = $matches[1][0]; + } return $first_img; } diff --git a/inc/class/zillah-google-fonts.php b/inc/class/zillah-google-fonts.php index bb7ccdc..4cbe5b6 100644 --- a/inc/class/zillah-google-fonts.php +++ b/inc/class/zillah-google-fonts.php @@ -21,18 +21,19 @@ public function render_content() { $control_id = $this->control_id; $ti_google_fonts = ''; - foreach( $options['ti_google_fonts'] as $zilla_font ) { - $ti_input_value = implode( '|', $zilla_font); - $ti_google_fonts .= ''; + if(!empty($options['ti_google_fonts'])){ + foreach( $options['ti_google_fonts'] as $zilla_font ) { + $ti_input_value = implode( '|', $zilla_font); + $ti_google_fonts .= ''; + } + + // Hackily add in the data link parameter. + $ti_google_fonts = str_replace( 'get_link(), $ti_google_fonts ); } - - // Hackily add in the data link parameter. - $ti_google_fonts = str_replace( 'get_link(), $ti_google_fonts ); - printf( '
%s
%s
', $this->label, - $ti_google_fonts + ( !empty($ti_google_fonts) ? $ti_google_fonts : __('No fonts to show', 'zillah') ) ); } diff --git a/inc/class/zillah-palette-picker.php b/inc/class/zillah-palette-picker.php index 41cd11e..dfa0f59 100644 --- a/inc/class/zillah-palette-picker.php +++ b/inc/class/zillah-palette-picker.php @@ -13,10 +13,9 @@ public function render_content() { $values = $this->value(); $json = json_decode($values); - $zillah_pallete = array( array( - 'pallete_name'=>'p1', + 'palette_name'=>'p1', 'color1'=>'#be624d', 'color2'=>'#f5876e', 'color3'=>'#be624d', @@ -24,7 +23,7 @@ public function render_content() { 'color5'=>'#6f6e6b' ), array( - 'pallete_name'=>'p1', + 'palette_name'=>'p1', 'color1'=>'#b0606d', 'color2'=>'#f59f4c', 'color3'=>'#ffc154', @@ -32,7 +31,7 @@ public function render_content() { 'color5'=>'#6f6e6b' ), array( - 'pallete_name'=>'p1', + 'palette_name'=>'p1', 'color1'=>'#333331', 'color2'=>'#c2a26f', 'color3'=>'#E2C9A1', @@ -40,16 +39,22 @@ public function render_content() { 'color5'=>'#6f6e6b' ), ); - ?> - + + if(!empty($this->label)) { ?> + + +
'; + foreach($json as $key => $value){ + if($key !== 'palette_name' && $key !== 'color5'){ + echo ''; + } } } else { esc_html_e('Default','zillah'); @@ -59,24 +64,22 @@ public function render_content() {
    +
  • + +
  • '; - esc_html_e('Default','zillah'); - echo ''; - foreach($zillah_pallete as $pallete){ - echo '
  • '; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; + foreach($zillah_pallete as $palette){ + echo '
  • '; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; echo '
  • '; - } - ?> + } ?>
link(); ?> /> \ No newline at end of file +} ?> \ No newline at end of file diff --git a/inc/class/zillah_category-selector-control.php b/inc/class/zillah_category-selector-control.php index 7e441f7..4a98a22 100644 --- a/inc/class/zillah_category-selector-control.php +++ b/inc/class/zillah_category-selector-control.php @@ -25,5 +25,4 @@ public function render_content() { ); } } -} -?> \ No newline at end of file +} ?> \ No newline at end of file diff --git a/inc/custom-header.php b/inc/custom-header.php index f26c360..82e548b 100644 --- a/inc/custom-header.php +++ b/inc/custom-header.php @@ -23,7 +23,6 @@ function zillah_custom_header_setup() { add_theme_support( 'custom-header', apply_filters( 'zillah_custom_header_args', array( 'default-image' => '', - 'default-text-color' => '7fcaad', 'width' => 1000, 'height' => 250, 'flex-height' => true, diff --git a/inc/customizer.php b/inc/customizer.php index f2070fd..1346da9 100644 --- a/inc/customizer.php +++ b/inc/customizer.php @@ -14,7 +14,7 @@ function zillah_customize_register( $wp_customize ) { $wp_customize->get_setting( 'blogname' )->transport = 'postMessage'; $wp_customize->get_setting( 'blogdescription' )->transport = 'postMessage'; $wp_customize->get_setting( 'header_textcolor' )->transport = 'postMessage'; - $wp_customize->get_setting( 'header_textcolor' )->default = '#7fcaad'; + $wp_customize->get_setting( 'header_textcolor' )->default = '7fcaad'; $wp_customize->get_setting( 'header_image' )->transport = 'postMessage'; $wp_customize->get_setting( 'header_image_data' )->transport = 'postMessage'; @@ -100,8 +100,7 @@ function zillah_customize_register( $wp_customize ) { $wp_customize->add_setting('zillah_home_slider_show', array( 'default' => 0, - 'sanitize_callback' => 'zillah_sanitize_checkbox', - 'transport' => 'postMessage', + 'sanitize_callback' => 'zillah_sanitize_checkbox' )); $wp_customize->add_control('zillah_home_slider_show', array( @@ -125,15 +124,14 @@ function zillah_customize_register( $wp_customize ) { /* Colors */ require_once ( 'class/zillah-palette-picker.php'); - $wp_customize->add_setting( 'zillah_palette_picker',array('sanitize_callback' => 'sanitize_text_field')); + $wp_customize->add_setting( 'zillah_palette_picker',array( + 'sanitize_callback' => 'zillah_sanitize_palette' + ) ); + $wp_customize->add_control( new Zillah_Palette( $wp_customize, 'zillah_palette_picker', array( 'label' => esc_html__('Change the color scheme','zillah'), 'section' => 'colors', 'priority' => 1, - 'metro_customizr_image_control' => true, - 'metro_customizr_icon_control' => true, - 'metro_customizr_text_control' => false, - 'metro_customizr_link_control' => true ) ) ); /* Google fonts */ @@ -256,26 +254,6 @@ function zillah_sanitize_checkbox( $input ){ return ( isset( $input ) && true == $input ? true : false ); } -function zillah_sanitize_repeater( $input ) { - $input_decoded = json_decode( $input, true ); - if( !empty( $input_decoded ) ) { - $icons_array = array('none' => 'none','500px' => 'fa-500px','amazon' => 'fa-amazon','android' => 'fa-android','behance' => 'fa-behance','behance-square' => 'fa-behance-square','bitbucket' => 'fa-bitbucket','bitbucket-square' => 'fa-bitbucket-square','american-express' => 'fa-cc-amex','diners-club' => 'fa-cc-diners-club','discover' => 'fa-cc-discover','jcb' => 'fa-cc-jcb','mastercard' => 'fa-cc-mastercard','paypal' => 'fa-cc-paypal','stripe' => 'fa-cc-stripe','visa' => 'fa-cc-visa','codepen' => 'fa-codepen','css3' => 'fa-css3','delicious' => 'fa-delicious','deviantart' => 'fa-deviantart','digg' => 'fa-digg','dribble' => 'fa-dribbble','dropbox' => 'fa-dropbox','drupal' => 'fa-drupal','facebook' => 'fa-facebook','facebook-official' => 'fa-facebook-official','facebook-square' => 'fa-facebook-square','flickr' => 'fa-flickr','foursquare' => 'fa-foursquare','git' => 'fa-git','git-square' => 'fa-git-square','github' => 'fa-github','github-alt' => 'fa-github-alt','github-square' => 'fa-github-square','google' => 'fa-google','google-plus' => 'fa-google-plus','google-plus-square' => 'fa-google-plus-square','html5' => 'fa-html5','instagram' => 'fa-instagram','joomla' => 'fa-joomla','jsfiddle' => 'fa-jsfiddle','linkedin' => 'fa-linkedin','linkedin-square' => 'fa-linkedin-square','opencart' => 'fa-opencart','openid' => 'fa-openid','paypal' => 'fa-paypal','pinterest' => 'fa-pinterest','pinterest-p' => 'fa-pinterest-p','pinterest-square' => 'fa-pinterest-square','rebel' => 'fa-rebel','reddit' => 'fa-reddit','reddit-square' => 'fa-reddit-square','share' => 'fa-share-alt','share-square' => 'fa-share-alt-square','skype' => 'fa-skype','slack' => 'fa-slack','soundcloud' => 'fa-soundcloud','spotify' => 'fa-spotify','stack-overflow' => 'fa-stack-overflow','steam' => 'fa-steam','steam-square' => 'fa-steam-square','tripadvisor' => 'fa-tripadvisor','tumblr' => 'fa-tumblr','tumblr-square' => 'fa-tumblr-square','twitch' => 'fa-twitch','twitter' => 'fa-twitter','twitter-square' => 'fa-twitter-square','vimeo' => 'fa-vimeo','vimeo-square' => 'fa-vimeo-square','vine' => 'fa-vine','whatsapp' => 'fa-whatsapp','wordpress' => 'fa-wordpress','yahoo' => 'fa-yahoo','youtube' => 'fa-youtube','youtube-play' => 'fa-youtube-play','youtube-squar' => 'fa-youtube-square'); - - foreach ($input_decoded as $iconk => $iconv) { - foreach ($iconv as $key => $value) { - if ( $key == 'icon_value' && !in_array( $value, $icons_array ) ){ - $input_decoded [$iconk][$key] = 'none'; - } - if( $key == 'link' ){ - $input_decoded [$iconk][$key] = esc_url( $value );; - } - } - } - $result = json_encode( $input_decoded ); - return $result; - } - return $input; -} function zillah_sanitize_select( $input, $setting ) { @@ -302,6 +280,40 @@ function zillah_sanitize_category_dropdown($input){ * Binds JS handlers to make Theme Customizer preview reload changes asynchronously. */ function zillah_customize_preview_js() { - wp_enqueue_script( 'zillah_customizer', get_template_directory_uri() . '/js/customizer.js', array( 'customize-preview' ), '1.0.0', true ); + wp_enqueue_script( 'zillah_customizer', get_template_directory_uri() . '/js/customizer.js', array( 'customize-preview' ), '1.0.1', true ); } add_action( 'customize_preview_init', 'zillah_customize_preview_js' ); + + +function zillah_sanitize_palette($input){ + if( !empty($input) ) { + $json = json_decode($input, true); + $palette_name = array('p1','p2','p3'); + $red = $green = $blue = ''; + + foreach($json as $key => $value){ + switch ($key){ + case 'palette_name': + if( !in_array( $value, $palette_name, true) ){ + return ''; + } + break; + default: + $value = str_replace( ' ', '', $value ); + sscanf( $value, 'rgb(%d,%d,%d)', $red, $green, $blue ); + $value = 'rgb('.$red.','.$green.','.$blue.')'; + if( !zillah_is_color($red) || !zillah_is_color($green) || !zillah_is_color($blue) ){ + return ''; + } else { + $json[$key] = $value; + } + } + } + return json_encode($json); + } + return ''; +} + +function zillah_is_color($value){ + return $value >= 0 && $value <= 255; +} \ No newline at end of file diff --git a/inc/plugin-enhancements.php b/inc/plugin-enhancements.php index 1b2faa2..576b853 100644 --- a/inc/plugin-enhancements.php +++ b/inc/plugin-enhancements.php @@ -79,7 +79,7 @@ function __construct() { 'slug' => 'jetpack', 'name' => 'Jetpack by WordPress.com', 'message' => sprintf( - esc_html__( 'The %1$s is required to use some of this theme’s features, including: ', 'zillah' ), + esc_html__( 'The %1$s is recommended to use some of this theme’s features, including: ', 'zillah' ), '' . esc_html__( 'Jetpack plugin', 'zillah' ) . '' ), 'modules' => rtrim( $dependency_list, ', ' ) . '.', ), @@ -87,7 +87,7 @@ function __construct() { 'slug' => 'pirate-forms', 'name' => 'Free & Simple Contact Form Plugin - PirateForms', 'message' => sprintf( - esc_html__( 'The %1$s is required to use some of this theme’s features.', 'zillah' ), + esc_html__( 'The %1$s is recommended to use some of this theme’s features.', 'zillah' ), '' . esc_html__( 'Simple Contact Form Plugin - PirateForms plugin', 'zillah' ) . '' ), ), ); @@ -383,4 +383,4 @@ function plugin_install_url( $slug ) { } } } -add_action( 'admin_head', array( 'zillah_Theme_Plugin_Enhancements', 'init' ) ); \ No newline at end of file +add_action( 'admin_head', array( 'zillah_Theme_Plugin_Enhancements', 'init' ) ); diff --git a/inc/template-tags.php b/inc/template-tags.php index 765d229..9afc438 100644 --- a/inc/template-tags.php +++ b/inc/template-tags.php @@ -47,7 +47,6 @@ function zillah_entry_footer() { // Hide category and tag text for pages. if ( 'post' === get_post_type() ) { - global $wp_customize; $zillah_tags_show = get_theme_mod( 'zillah_tags_show', false ); if( $zillah_tags_show === true || is_customize_preview() ) { diff --git a/inc/widgets/about-me.php b/inc/widgets/about-me.php index 89bc486..bc817b1 100644 --- a/inc/widgets/about-me.php +++ b/inc/widgets/about-me.php @@ -15,17 +15,24 @@ public function widget( $args, $instance ) { $text = apply_filters( 'widget_text', empty( $instance['text'] ) ? '' : $instance['text'], $instance ); echo $args['before_widget']; - if ( $title ) { - echo $args['before_title'] . $title . $args['after_title']; + if ( !empty($title) ) { + echo $args['before_title'] . wp_kses_post($title) . $args['after_title']; } - if ( $image_url ) { - echo '
'; + if ( !empty($image_url) ) { ?> +
+ /> +
+ +
+ +
+ -
- -

-

+

+ +

- + diff --git a/js/customizer.js b/js/customizer.js index be3d696..704e303 100644 --- a/js/customizer.js +++ b/js/customizer.js @@ -24,20 +24,27 @@ // Header text color. wp.customize( 'header_textcolor', function( value ) { value.bind( function( to ) { - if ( 'blank' === to ) { - $( '.site-title a, .site-description' ).css( { - 'clip': 'rect(1px, 1px, 1px, 1px)', - 'position': 'absolute' - } ); + var color = ''; + if ( '' !== to ) { + color = to; + } else { - $( '.site-title a, .site-description' ).css( { - 'clip': 'auto', - 'position': 'relative' - } ); - $( '.site-title a' ).css( { - 'color': to - } ); - } + var palette = wp.customize._value.zillah_palette_picker(); + if(typeof palette !== 'undefined' && palette !== ''){ + var obj = JSON.parse(palette); + if(typeof obj.color2 !== 'undefined'){ + color = obj.color2; + } + } else { + color = '#6ca790'; + } + } + + if(color !== ''){ + $( '.site-title a' ).css( { + 'color': color + } ); + } } ); } ); diff --git a/js/zillah-customizer.js b/js/zillah-customizer.js index 1422014..62fd378 100644 --- a/js/zillah-customizer.js +++ b/js/zillah-customizer.js @@ -2,8 +2,9 @@ /******************************************** *** Palette Control *** *********************************************/ - +/*global jQuery*/ jQuery(document).ready(function () { + 'use strict'; jQuery('.zillah_dropdown').on('click', function () { jQuery('.zillah_palette_picker').slideToggle('medium'); }); @@ -14,19 +15,19 @@ jQuery(document).ready(function () { jQuery('.zillah_palette_picker').on('click', 'li', function () { var th = jQuery(this); - if (!jQuery(this).hasClass('zillah_pallete_default')) { + var palette = jQuery(this).html(); + var palette_name = jQuery(this).attr('class'); + if (!th.hasClass('zillah_pallete_default')) { var values = {}; var it = 0; - var metro_palette = jQuery(this).html(); - - jQuery('.zillah_palette_input').html(metro_palette); + values.palette_name = palette_name; + jQuery('.zillah_palette_input').html(palette); jQuery('.zillah_palette_input span').each(function () { it++; - var colval = jQuery(this).css('background-color'); - values['color' + it] = colval; + values['color' + it] = jQuery(this).css('background-color'); }); th.parent().parent().find('.zillah_palette_colector').val(JSON.stringify(values)); th.parent().parent().find('.zillah_palette_colector').trigger('change'); @@ -42,7 +43,7 @@ jQuery(document).ready(function () { jQuery( document ).ready( function() { - + 'use strict'; jQuery( '.ti-google-fonts input:radio:checked' ).parent( 'label' ).addClass( 'ti-google-fonts-active' ); jQuery( '.ti-google-fonts input' ).click( function() { jQuery( this ).parent().parent().find( '.ti-google-fonts-active' ).removeClass( 'ti-google-fonts-active' ); diff --git a/languages/pt_BR.mo b/languages/pt_BR.mo index d9abd16..2c994df 100644 Binary files a/languages/pt_BR.mo and b/languages/pt_BR.mo differ diff --git a/languages/pt_BR.po b/languages/pt_BR.po index e7ec05b..addfe27 100644 --- a/languages/pt_BR.po +++ b/languages/pt_BR.po @@ -2,19 +2,15 @@ msgid "" msgstr "" "Project-Id-Version: Zillah\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-25 18:00-0300\n" -"PO-Revision-Date: 2016-08-26 08:33-0300\n" -"Language-Team: Themeisle \n" +"POT-Creation-Date: 2016-10-05 18:01+0200\n" +"PO-Revision-Date: 2016-10-05 18:02+0200\n" +"Last-Translator: rodica \n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-KeywordsList: _;gettext;gettext_noop;__;_e;esc_html__;esc_html_e;" -"esc_attr_x;esc_attr__\n" -"X-Poedit-Basepath: ..\n" -"X-Generator: Poedit 1.8.4\n" -"Last-Translator: \n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -"Language: pt_BR\n" +"X-Poedit-KeywordsList: _;gettext;gettext_noop;__;_e;esc_html__;esc_html_e;esc_attr__;esc_attr_x;_x:1,2c;_ex:1,2c\n" +"X-Poedit-Basepath: ../\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SearchPath-1: inc\n" "X-Poedit-SearchPath-2: template-parts\n" @@ -24,48 +20,47 @@ msgid "Oops! That page can’t be found." msgstr "Oops! Esta página não pode ser encontrada." #: 404.php:23 -msgid "" -"It looks like nothing was found at this location. Maybe try one of the links " -"below or a search?" -msgstr "" -"It looks like nothing was found at this location. Maybe try one of the links " -"below or a search?" +msgid "It looks like nothing was found at this location. Maybe try one of the links below or a search?" +msgstr "It looks like nothing was found at this location. Maybe try one of the links below or a search?" -#: comments.php:39 comments.php:61 +#: comments.php:41 +#: comments.php:63 msgid "Comment navigation" msgstr "Comentar navegação" -#: comments.php:42 comments.php:64 +#: comments.php:44 +#: comments.php:66 msgid "Older Comments" msgstr "Comentários mais antigos" -#: comments.php:43 comments.php:65 +#: comments.php:45 +#: comments.php:67 msgid "Newer Comments" msgstr "Comentários mais recentes" -#: comments.php:78 +#: comments.php:80 msgid "Comments are closed." msgstr "Comentários estão fechados." -#: footer.php:56 +#: footer.php:60 #, php-format msgid "Proudly powered by %1$s" msgstr "Proudly powered by %s" -#: footer.php:57 +#: footer.php:61 msgid "WordPress" msgstr "WordPress" -#: footer.php:61 +#: footer.php:65 #, php-format msgid "Theme Zillah by %1$s" msgstr "Tema por %s." -#: footer.php:62 +#: footer.php:66 msgid "Themeisle" msgstr "..." -#: footer.php:66 +#: footer.php:70 msgid "Back to top" msgstr "Voltar ao topo" @@ -77,41 +72,64 @@ msgstr "Primeiro" msgid "Social Links Menu" msgstr "Menu de Links Sociais" -#: functions.php:114 +#: functions.php:118 msgid "Sidebar" msgstr "Barra lateral" -#: functions.php:116 functions.php:127 +#: functions.php:120 +#: functions.php:131 msgid "Add widgets here." msgstr "Adicione widgets aqui." -#: functions.php:124 +#: functions.php:128 #, php-format msgid "Footer Widget Area %d" msgstr "Área de widgets do rodapé %d." -#: functions.php:215 +#: functions.php:168 +msgctxt "Cabin font: on or off" +msgid "on" +msgstr "" + +#: functions.php:174 +msgctxt "Lato font: on or off" +msgid "on" +msgstr "" + +#: functions.php:180 +msgctxt "Merriweather font: on or off" +msgid "on" +msgstr "" + +#: functions.php:219 msgid "expand child menu" msgstr "expandir sub-menu" -#: functions.php:216 +#: functions.php:220 msgid "collapse child menu" msgstr "fechar sub-menu" -#: functions.php:270 +#: functions.php:296 +#: functions.php:302 #, php-format msgid "Continue Reading %s" msgstr "Continue a ler %s" -#: header.php:25 +#: header.php:28 msgid "Skip to content" msgstr "Pular para o conteúdo principal" -#: search.php:17 +#: search.php:18 #, php-format msgid "Search Results for: %s" msgstr "Resultados da pesquisa para:%s" +#: searchform.php:9 +#, fuzzy +msgctxt "label" +msgid "Search for:" +msgstr "Pesquisa" + #: searchform.php:10 msgid "Search …" msgstr "Pesquisar" @@ -124,57 +142,78 @@ msgstr "Pesquisa" msgid "Search" msgstr "Pesquisar" -#: inc/customizer.php:37 +#: single.php:25 +msgctxt "previous post" +msgid "%title" +msgstr "" + +#: single.php:26 +msgctxt "next post" +msgid "%title" +msgstr "" + +#: inc/customizer.php:40 +msgid "Hide Site Title" +msgstr "" + +#: inc/customizer.php:48 msgid "Theme options" msgstr "Opções do Tema" -#: inc/customizer.php:49 +#: inc/customizer.php:60 msgid "Show sidebar" msgstr "Exibir sidebar" -#: inc/customizer.php:50 -msgid "If you check this box, the sidebar will appear." -msgstr "Se você marcar essa caixa, a barra lateral irá aparecer." +#: inc/customizer.php:61 +#, fuzzy +msgid "If you check this box, the sidebar will appear on homepage and archive page." +msgstr "Marque esta caixa para ativar a opção inscreva-se na página inicial." -#: inc/customizer.php:64 +#: inc/customizer.php:75 msgid "Show tags" msgstr "Exibir Tags" -#: inc/customizer.php:65 +#: inc/customizer.php:76 msgid "If you check this box, the tags will appear in posts." msgstr "Se você marcar essa caixa, as etiquetas aparecerão em posts." -#: inc/customizer.php:73 +#: inc/customizer.php:89 +msgid "Get 1st image in the post as featured." +msgstr "" + +#: inc/customizer.php:97 msgid "Featured content slider" msgstr "Slides conteúdo destaque" -#: inc/customizer.php:84 +#: inc/customizer.php:108 msgid "Show slider" msgstr "Mostrar Slider" -#: inc/customizer.php:85 +#: inc/customizer.php:109 msgid "If you check this box, the slider area will appear on the homepage." msgstr "Marque esta caixa para ativar a opção inscreva-se na página inicial." -#: inc/customizer.php:106 +#: inc/customizer.php:133 msgid "Change the color scheme" msgstr "Alterar o esquema de cores" +#: inc/customizer.php:240 +#, fuzzy +msgid "Logo" +msgstr "Logo do Site" + #: inc/plugin-enhancements.php:82 -#, php-format -msgid "" -"The %1$s is required to use some of this theme’s features, including: " -msgstr "" -"O %1$s é necessário para usar alguns dos recursos do presente tema, " -"incluindo:" +#, fuzzy, php-format +msgid "The %1$s is recommended to use some of this theme’s features, including: " +msgstr "O %1$s é necessário para usar alguns dos recursos do presente tema, incluindo:" #: inc/plugin-enhancements.php:83 msgid "Jetpack plugin" msgstr "Plugin jetpack" #: inc/plugin-enhancements.php:90 -#, php-format -msgid "The %1$s is required to use some of this theme’s features." +#, fuzzy, php-format +msgid "The %1$s is recommended to use some of this theme’s features." msgstr "O %1$s é necessário para usar alguns dos recursos deste tema." #: inc/plugin-enhancements.php:91 @@ -248,22 +287,37 @@ msgstr "Instalar" msgid "To use %1$s, please activate the Jetpack plugin’s %2$s." msgstr "Para usar%1$s, por favor ativar o plugin Jetpack%2$s." -#: inc/template-tags.php:55 +#: inc/template-tags.php:54 msgid ", " msgstr "," -#: inc/template-tags.php:57 +#: inc/template-tags.php:56 #, php-format msgid "Tagged %1$s" msgstr "Marcado em %1$s" -#: inc/template-tags.php:66 +#: inc/template-tags.php:65 #, php-format msgid " Edit %s" msgstr "Editar %s" -#: inc/class/zillah-palette-picker.php:55 -#: inc/class/zillah-palette-picker.php:64 +#: inc/template-tags.php:151 +#, fuzzy +msgctxt "Used between list items, there is a space after the comma." +msgid ", " +msgstr "," + +#: inc/template-tags.php:154 +msgctxt "Used before category names." +msgid "Categories" +msgstr "" + +#: inc/class/zillah-google-fonts.php:36 +msgid "No fonts to show" +msgstr "" + +#: inc/class/zillah-palette-picker.php:60 +#: inc/class/zillah-palette-picker.php:69 msgid "Default" msgstr "Padrão" @@ -279,15 +333,15 @@ msgstr "Sobre mim widget." msgid "Zillah: About me" msgstr "Zillah: Sobre mim" -#: inc/widgets/about-me.php:49 +#: inc/widgets/about-me.php:57 msgid "Title:" msgstr "Título:" -#: inc/widgets/about-me.php:52 +#: inc/widgets/about-me.php:60 msgid "Enter the URL for your photo" msgstr "Digite a URL para sua foto" -#: inc/widgets/about-me.php:55 +#: inc/widgets/about-me.php:63 msgid "Add your text:" msgstr "Adicione seu texto:" @@ -297,38 +351,36 @@ msgstr "Nenhuma postagem encontrada" #: template-parts/content-none.php:23 #, php-format -msgid "" -"Ready to publish your first post? Get started here." -msgstr "" -"Pronto para publicar o seu primeiro post? Comece aqui." +msgid "Ready to publish your first post? Get started here." +msgstr "Pronto para publicar o seu primeiro post? Comece aqui." #: template-parts/content-none.php:27 -msgid "" -"Sorry, but nothing matched your search terms. Please try again with some " -"different keywords." -msgstr "" -"Desculpe, mas nada combina com seus termos de pesquisa. Por favor, tente " -"novamente com algumas palavras-chave diferentes." +msgid "Sorry, but nothing matched your search terms. Please try again with some different keywords." +msgstr "Desculpe, mas nada combina com seus termos de pesquisa. Por favor, tente novamente com algumas palavras-chave diferentes." #: template-parts/content-none.php:33 -msgid "" -"It seems we can’t find what you’re looking for. Perhaps " -"searching can help." -msgstr "" -"Parece que podemos encontrar o que você está procurando. Talvez a pesquisa " -"pode ajudar." +msgid "It seems we can’t find what you’re looking for. Perhaps searching can help." +msgstr "Parece que podemos encontrar o que você está procurando. Talvez a pesquisa pode ajudar." -#: template-parts/content-page.php:20 template-parts/content-single.php:43 -#: template-parts/content.php:48 +#: template-parts/content-page.php:22 +#: template-parts/content-single.php:45 +#: template-parts/content.php:58 msgid "Pages:" msgstr "Páginas:" -#: template-parts/content-page.php:31 +#: template-parts/content-page.php:35 #, php-format msgid "Edit %s" msgstr "Editar %s" -#: template-parts/content-single.php:38 template-parts/content.php:42 +#: template-parts/content-single.php:40 #, php-format msgid "Continue reading %s " msgstr "Continuar lendo %s " + +#, fuzzy +#~ msgid "%title" +#~ msgstr "Título:" + +#~ msgid "If you check this box, the sidebar will appear." +#~ msgstr "Se você marcar essa caixa, a barra lateral irá aparecer." diff --git a/languages/zillah.pot b/languages/zillah.pot index 7764a93..1f565fa 100644 --- a/languages/zillah.pot +++ b/languages/zillah.pot @@ -2,14 +2,14 @@ msgid "" msgstr "" "Project-Id-Version: Zillah\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-07 12:29+0200\n" -"PO-Revision-Date: 2016-06-07 12:29+0200\n" -"Last-Translator: \n" -"Language-Team: Themeisle \n" +"POT-Creation-Date: 2016-10-05 18:01+0200\n" +"PO-Revision-Date: 2016-10-05 18:01+0200\n" +"Last-Translator: rodica \n" +"Language-Team: ThemeIsle \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-KeywordsList: _;gettext;gettext_noop;__;_e;esc_html__;esc_html_e;esc_attr_x;esc_attr__\n" +"X-Poedit-KeywordsList: _;gettext;gettext_noop;__;_e;esc_html__;esc_html_e;esc_attr__;esc_attr_x;_x:1,2c;_ex:1,2c\n" "X-Poedit-Basepath: ../\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SearchPath-1: inc\n" @@ -23,44 +23,44 @@ msgstr "" msgid "It looks like nothing was found at this location. Maybe try one of the links below or a search?" msgstr "" -#: comments.php:39 -#: comments.php:61 +#: comments.php:41 +#: comments.php:63 msgid "Comment navigation" msgstr "" -#: comments.php:42 -#: comments.php:64 +#: comments.php:44 +#: comments.php:66 msgid "Older Comments" msgstr "" -#: comments.php:43 -#: comments.php:65 +#: comments.php:45 +#: comments.php:67 msgid "Newer Comments" msgstr "" -#: comments.php:78 +#: comments.php:80 msgid "Comments are closed." msgstr "" -#: footer.php:56 +#: footer.php:60 #, php-format msgid "Proudly powered by %1$s" msgstr "" -#: footer.php:57 +#: footer.php:61 msgid "WordPress" msgstr "" -#: footer.php:61 +#: footer.php:65 #, php-format msgid "Theme Zillah by %1$s" msgstr "" -#: footer.php:62 +#: footer.php:66 msgid "Themeisle" msgstr "" -#: footer.php:66 +#: footer.php:70 msgid "Back to top" msgstr "" @@ -72,42 +72,63 @@ msgstr "" msgid "Social Links Menu" msgstr "" -#: functions.php:114 +#: functions.php:118 msgid "Sidebar" msgstr "" -#: functions.php:116 -#: functions.php:127 +#: functions.php:120 +#: functions.php:131 msgid "Add widgets here." msgstr "" -#: functions.php:124 +#: functions.php:128 #, php-format msgid "Footer Widget Area %d" msgstr "" -#: functions.php:215 +#: functions.php:168 +msgctxt "Cabin font: on or off" +msgid "on" +msgstr "" + +#: functions.php:174 +msgctxt "Lato font: on or off" +msgid "on" +msgstr "" + +#: functions.php:180 +msgctxt "Merriweather font: on or off" +msgid "on" +msgstr "" + +#: functions.php:219 msgid "expand child menu" msgstr "" -#: functions.php:216 +#: functions.php:220 msgid "collapse child menu" msgstr "" -#: functions.php:270 +#: functions.php:296 +#: functions.php:302 #, php-format msgid "Continue Reading %s" msgstr "" -#: header.php:25 +#: header.php:28 msgid "Skip to content" msgstr "" -#: search.php:17 +#: search.php:18 #, php-format msgid "Search Results for: %s" msgstr "" +#: searchform.php:9 +msgctxt "label" +msgid "Search for:" +msgstr "" + #: searchform.php:10 msgid "Search …" msgstr "" @@ -120,45 +141,67 @@ msgstr "" msgid "Search" msgstr "" -#: inc/customizer.php:37 +#: single.php:25 +msgctxt "previous post" +msgid "%title" +msgstr "" + +#: single.php:26 +msgctxt "next post" +msgid "%title" +msgstr "" + +#: inc/customizer.php:40 +msgid "Hide Site Title" +msgstr "" + +#: inc/customizer.php:48 msgid "Theme options" msgstr "" -#: inc/customizer.php:49 +#: inc/customizer.php:60 msgid "Show sidebar" msgstr "" -#: inc/customizer.php:50 -msgid "If you check this box, the sidebar will appear." +#: inc/customizer.php:61 +msgid "If you check this box, the sidebar will appear on homepage and archive page." msgstr "" -#: inc/customizer.php:64 +#: inc/customizer.php:75 msgid "Show tags" msgstr "" -#: inc/customizer.php:65 +#: inc/customizer.php:76 msgid "If you check this box, the tags will appear in posts." msgstr "" -#: inc/customizer.php:73 +#: inc/customizer.php:89 +msgid "Get 1st image in the post as featured." +msgstr "" + +#: inc/customizer.php:97 msgid "Featured content slider" msgstr "" -#: inc/customizer.php:84 +#: inc/customizer.php:108 msgid "Show slider" msgstr "" -#: inc/customizer.php:85 +#: inc/customizer.php:109 msgid "If you check this box, the slider area will appear on the homepage." msgstr "" -#: inc/customizer.php:106 +#: inc/customizer.php:133 msgid "Change the color scheme" msgstr "" +#: inc/customizer.php:240 +msgid "Logo" +msgstr "" + #: inc/plugin-enhancements.php:82 #, php-format -msgid "The %1$s is required to use some of this theme’s features, including: " +msgid "The %1$s is recommended to use some of this theme’s features, including: " msgstr "" #: inc/plugin-enhancements.php:83 @@ -167,7 +210,7 @@ msgstr "" #: inc/plugin-enhancements.php:90 #, php-format -msgid "The %1$s is required to use some of this theme’s features." +msgid "The %1$s is recommended to use some of this theme’s features." msgstr "" #: inc/plugin-enhancements.php:91 @@ -241,22 +284,36 @@ msgstr "" msgid "To use %1$s, please activate the Jetpack plugin’s %2$s." msgstr "" -#: inc/template-tags.php:55 +#: inc/template-tags.php:54 msgid ", " msgstr "" -#: inc/template-tags.php:57 +#: inc/template-tags.php:56 #, php-format msgid "Tagged %1$s" msgstr "" -#: inc/template-tags.php:66 +#: inc/template-tags.php:65 #, php-format msgid " Edit %s" msgstr "" -#: inc/class/zillah-palette-picker.php:55 -#: inc/class/zillah-palette-picker.php:64 +#: inc/template-tags.php:151 +msgctxt "Used between list items, there is a space after the comma." +msgid ", " +msgstr "" + +#: inc/template-tags.php:154 +msgctxt "Used before category names." +msgid "Categories" +msgstr "" + +#: inc/class/zillah-google-fonts.php:36 +msgid "No fonts to show" +msgstr "" + +#: inc/class/zillah-palette-picker.php:60 +#: inc/class/zillah-palette-picker.php:69 msgid "Default" msgstr "" @@ -272,15 +329,15 @@ msgstr "" msgid "Zillah: About me" msgstr "" -#: inc/widgets/about-me.php:49 +#: inc/widgets/about-me.php:57 msgid "Title:" msgstr "" -#: inc/widgets/about-me.php:52 +#: inc/widgets/about-me.php:60 msgid "Enter the URL for your photo" msgstr "" -#: inc/widgets/about-me.php:55 +#: inc/widgets/about-me.php:63 msgid "Add your text:" msgstr "" @@ -301,19 +358,18 @@ msgstr "" msgid "It seems we can’t find what you’re looking for. Perhaps searching can help." msgstr "" -#: template-parts/content-page.php:20 -#: template-parts/content-single.php:43 -#: template-parts/content.php:48 +#: template-parts/content-page.php:22 +#: template-parts/content-single.php:45 +#: template-parts/content.php:58 msgid "Pages:" msgstr "" -#: template-parts/content-page.php:31 +#: template-parts/content-page.php:35 #, php-format msgid "Edit %s" msgstr "" -#: template-parts/content-single.php:38 -#: template-parts/content.php:42 +#: template-parts/content-single.php:40 #, php-format msgid "Continue reading %s " msgstr "" diff --git a/readme.txt b/readme.txt index a2af36b..d0b8ee7 100644 --- a/readme.txt +++ b/readme.txt @@ -1,7 +1,7 @@ === Zillah === Contributors: themeisle, codeinwp -Tags: gray, green, responsive-layout, right-sidebar, one-column, custom-background, custom-colors, featured-image-header, featured-images, sticky-post, photoblogging, translation-ready, threaded-comments, rtl-language-support, theme-options +Tags: right-sidebar, one-column, custom-background, custom-colors, featured-image-header, featured-images, sticky-post, translation-ready, threaded-comments, rtl-language-support, theme-options Requires at least: 4.0 Tested up to: 4.4.2 diff --git a/sidebar.php b/sidebar.php index be1ab95..221aeaa 100644 --- a/sidebar.php +++ b/sidebar.php @@ -7,7 +7,6 @@ * @package zillah */ -global $wp_customize; $zillah_sidebar_show = get_theme_mod( 'zillah_sidebar_show', false ); if ( ! is_active_sidebar( 'zillah-sidebar-1' ) ) { diff --git a/single.php b/single.php index 60b17b4..55aa35f 100644 --- a/single.php +++ b/single.php @@ -19,11 +19,9 @@ get_template_part( 'template-parts/content', 'single' ); - //the_post_navigation(); - the_post_navigation( array( - 'prev_text' => _x( '%title', 'zillah' ), - 'next_text' => _x( '%title', 'zillah' ), + 'prev_text' => _x( '%title', 'previous post', 'zillah' ), + 'next_text' => _x( '%title', 'next post', 'zillah' ), ) ); // If comments are open or we have at least one comment, load up the comment template. @@ -42,4 +40,4 @@