WordPress.org

Plugin Directory

Changeset 1780343


Ignore:
Timestamp:
12/03/17 18:05:25 (7 weeks ago)
Author:
bobbingwide
Message:

oik v3.2.2 - 2017/12/03 - Upgrade for improvements related to the bw_address shortcode. Translation ready. Tested with WordPress 4.9.1 and WordPress Multisite.

Location:
oik/trunk
Files:
21 edited

Legend:

Unmodified
Added
Removed
  • oik/trunk/admin/oik-admin.php

    r1775626 r1780343  
    425425 */ 
    426426function oik_address_info( $option, $options, $alt0_suffix ) {     
    427   BW_::bw_textfield_arr( $option, BW_::bwtnt( __( "Extended-address", "oik" ), " [bw_address$alt0_suffix]" ), $options, 'extended-address', 50 ); 
    428   BW_::bw_textfield_arr( $option, __( "Street-address", "oik" ), $options, 'street-address', 50 ); 
     427  BW_::bw_textfield_arr( $option, BW_::bwtnt( __( "Extended address", "oik" ), " [bw_address$alt0_suffix]" ), $options, 'extended-address', 50 ); 
     428  BW_::bw_textfield_arr( $option, __( "Street address", "oik" ), $options, 'street-address', 50 ); 
    429429  BW_::bw_textfield_arr( $option, __( "Locality", "oik" ), $options, 'locality', 50 ); 
    430430  BW_::bw_textfield_arr( $option, __( "Region", "oik" ), $options, 'region', 50 ); 
     
    564564  bw_invoke_shortcode( "bw_address", $alt0_suffix, __( "Display your address.", "oik" ) ); 
    565565  bw_invoke_shortcode( "bw_email", $alt0_suffix, __( "Display your email address.", "oik" ) ); 
    566   bw_invoke_shortcode( "bw_show_googlemap", $alt0_suffix, __( "Display a Googlemap for your primary address.", "oik" ) ); 
     566  bw_invoke_shortcode( "bw_show_googlemap", $alt0_suffix, __( "Display a Google Map for your primary address.", "oik" ) ); 
    567567  bw_invoke_shortcode( "bw_directions", $alt0_suffix, __( "Display a button for obtaining directions to your address.", "oik" ) ); 
    568568  bw_invoke_shortcode( "bw_follow_me", $alt0_suffix, __( "Show all your <b>Follow me</b> buttons.", "oik" ) ); 
     
    604604  oik_address_info( $option, $options, $alt1_suffix ); 
    605605 
    606      
    607     /* 
    608   BW_::bw_textfield_arr( $option, "Email [bw_email alt=1]", $options, 'email', 50 ); 
    609      
    610   BW_::bw_textfield_arr( $option, "Telephone [bw_telephone alt=1]", $options, 'telephone', 50 ); 
    611   BW_::bw_textfield_arr( $option, "Mobile [bw_mobile alt=1]", $options, 'mobile', 50 ); 
    612      
    613  
    614    
    615   BW_::bw_textfield_arr( $option, "Extended-address [bw_address alt=1]", $options, 'extended-address', 50 ); 
    616   BW_::bw_textfield_arr( $option, "Street-address", $options, 'street-address', 50 ); 
    617   BW_::bw_textfield_arr( $option, "Locality", $options, 'locality', 50 ); 
    618   BW_::bw_textfield_arr( $option, "Region", $options, 'region', 50 ); 
    619   BW_::bw_textfield_arr( $option, "Post Code", $options, 'postal-code', 50 ); 
    620   BW_::bw_textfield_arr( $option, "Country name", $options, 'country-name', 50 ); 
    621    
    622   BW_::bw_textarea_arr( $option, "Google Maps introductory text for [bw_show_googlemap alt=1]", $options, 'gmap_intro', 50 ); 
    623   BW_::bw_textfield_arr( $option, "Latitude [bw_geo alt=1] [bw_directions alt=1]", $options, 'lat', 50 ); 
    624   BW_::bw_textfield_arr( $option, "Longitude [bw_show_googlemap alt=1]", $options, 'long', 50 ); 
    625     */ 
    626606  etag( "table" );  
    627607  e( isubmit( "ok", __("Save changes", "oik" ), null, "button-primary" ) );  
     
    637617  BW_::p( __( "Use the shortcodes in your pages, widgets and titles. e.g.", "oik" ) ); 
    638618  bw_invoke_shortcode( "bw_contact", "alt=1",__( "Display your alternative contact name.", "oik" ) ); 
    639   bw_invoke_shortcode( "bw_email", "alt=1 prefix=e-mail", __( "Display your alternative email address, with a prefix of 'e-mail'.", "oik" ) ); 
     619  bw_invoke_shortcode( "bw_email", "alt=1 prefix=e-mail", sprintf( __( 'Display your alternative email address, with a prefix of \'%1$s\'.', "oik" ), "e-mail" ) ); 
    640620  bw_invoke_shortcode( "bw_telephone", "alt=1", __( "Display your alternative telephone number.", "oik" ) ); 
    641621  bw_invoke_shortcode( "bw_address", "alt=1", __( "Display your alternative address.", "oik" ) ); 
    642   bw_invoke_shortcode( "bw_show_googlemap", "alt=1", __("Display a Googlemap for your alternative address.", "oik" ) ); 
     622  bw_invoke_shortcode( "bw_show_googlemap", "alt=1", __("Display a Google Map for your alternative address.", "oik" ) ); 
    643623  bw_invoke_shortcode( "bw_directions", "alt=1", __( "Display directions to the alternative address.", "oik" ) ); 
    644624  bw_flush(); 
  • oik/trunk/bobbcomp.inc

    r1775626 r1780343  
    33    _deprecated_file( __FILE__, "3.2.1", "includes/bobbcomp.php", "Please use includes/bobbcomp.php" );  
    44} 
    5 //echo "<!-- " ; 
    6 //var_dump( debug_backtrace() ); 
    7 //echo " -->"; 
    85require_once( __DIR__ . '/includes/bobbcomp.php' ); 
  • oik/trunk/bobbfunc.inc

    r1393145 r1780343  
    162162} 
    163163 
    164 // Herb 2015/06/28   
    165 //oik_require( "bobbcomp.inc" ); 
    166 // Moved logic for art_button to bobbcomp.inc 
    167  
    168164/**  
    169165 * Return a $default value if the $value is not set 
  • oik/trunk/bw_metadata.inc

    r1775626 r1780343  
    33    _deprecated_file( __FILE__, "3.2.1", "includes/bw_metadata.php", "Please use includes/bw_metadata.php" );  
    44} 
    5 //echo "<!-- " ; 
    6 //var_dump( debug_backtrace() ); 
    7 //echo " -->"; 
    85require_once( __DIR__ . '/includes/bw_metadata.php' ); 
  • oik/trunk/includes/bw_fields.inc

    r1775626 r1780343  
    22_doing_it_wrong( __FILE__, '<br />Please use oik_require_lib( "bw_fields" );<br />', "oik v3.2.1" ); 
    33bw_backtrace(); 
    4 echo "<!-- "; 
    5 echo __FILE__; 
    6 var_dump( debug_backtrace() ); 
    7 echo "-->"; 
    84oik_require_lib( "bw_fields" ); 
  • oik/trunk/includes/bw_posts.inc

    r1775626 r1780343  
    33    _deprecated_file( __FILE__, "3.2.1", "includes/bw_posts.php", "Please use includes/bw_posts.php" );  
    44} 
    5 //echo "<!-- " ; 
    6 //var_dump( debug_backtrace() ); 
    7 //echo " -->"; 
    85require_once( __DIR__ . '/bw_posts.php' ); 
  • oik/trunk/includes/bw_register.inc

    r1775626 r1780343  
    33    _deprecated_file( __FILE__, "3.2.1", "includes/bw_register.php", "Please use includes/bw_register.php" );  
    44} 
    5 //echo "<!-- " ; 
    6 //var_dump( debug_backtrace() ); 
    7 //echo " -->"; 
    85require_once( __DIR__ . '/bw_register.php' ); 
  • oik/trunk/includes/oik-menus.inc

    r540419 r1780343  
    1 <?php // (C) Copyright Bobbing Wide 2012 
     1<?php // (C) Copyright Bobbing Wide 2012-2017 
    22 
    33/**  
     
    2222 */ 
    2323function bw_get_nav_menus() { 
    24   oik_require( "bw_metadata.inc" ); 
     24  oik_require( "includes/bw_metadata.php" ); 
    2525  $menus = wp_get_nav_menus( $args = array() ); 
    2626  $terms = bw_term_array( $menus ); 
  • oik/trunk/includes/oik-remote.inc

    r1547298 r1780343  
    1 <?php // (C) Copyright Bobbing Wide 2012-2016 
     1<?php // (C) Copyright Bobbing Wide 2012-2017 
    22 
    33/** 
     
    638638  * 
    639639  */ 
    640   $url = "http://www.oik-plugins.com"; 
     640  $url = "https://www.oik-plugins.com"; 
    641641  //$url = "http://qw/wpit"; 
    642642  $url .= "/themes/info/"; 
  • oik/trunk/includes/oik-sc-help.inc

    r1775626 r1780343  
    33    _deprecated_file( __FILE__, "3.2.1", "includes/oik-sc-help.php", "Please use includes/oik-sc-help.php" );  
    44} 
    5 //echo "<!-- " ; 
    6 //var_dump( debug_backtrace() ); 
    7 //echo " -->"; 
    85require_once( __DIR__ . '/oik-sc-help.php' ); 
  • oik/trunk/languages/oik-bb_BB.po

    r1775626 r1780343  
    33msgid "" 
    44msgstr "" 
    5 "Project-Id-Version: oik 3.2.1\n" 
     5"Project-Id-Version: oik 3.2.2\n" 
    66"Report-Msgid-Bugs-To: http://wordpress.org/tag/oik\n" 
    7 "POT-Creation-Date: 2017-11-26 13:04:53+00:00\n" 
     7"POT-Creation-Date: 2017-11-30 21:52:24+00:00\n" 
    88"MIME-Version: 1.0\n" 
    99"Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\n" 
     
    438438 
    439439#: admin/oik-admin.php:212 admin/oik-admin.php:261 admin/oik-admin.php:547 
    440 #: admin/oik-admin.php:627 
     440#: admin/oik-admin.php:607 
    441441msgid "Save changes" 
    442442msgstr "Svae cahgnes" 
     
    618618 
    619619#: admin/oik-admin.php:427 
    620 msgid "Extended-address" 
    621 msgstr "Etxneedd-adderss" 
     620msgid "Extended address" 
     621msgstr "Etxneedd adderss" 
    622622 
    623623 
    624624#: admin/oik-admin.php:428 
    625 msgid "Street-address" 
    626 msgstr "Srteet-adderss" 
     625msgid "Street address" 
     626msgstr "Srteet adderss" 
    627627 
    628628 
     
    812812 
    813813 
    814 #: admin/oik-admin.php:561 admin/oik-admin.php:637 
     814#: admin/oik-admin.php:561 admin/oik-admin.php:617 
    815815msgid "Use the shortcodes in your pages, widgets and titles. e.g." 
    816816msgstr "UsE thE sohtroceds In yuor pgaes, wdiegts And ttiels. E.g." 
     
    838838 
    839839#: admin/oik-admin.php:566 
    840 msgid "Display a Googlemap for your primary address." 
    841 msgstr "Dsilpay A Goolgmeap fOr yuor piramry adderss." 
     840msgid "Display a Google Map for your primary address." 
     841msgstr "Dsilpay A Goolge MAp fOr yuor piramry adderss." 
    842842 
    843843 
     
    881881 
    882882 
    883 #: admin/oik-admin.php:638 
     883#: admin/oik-admin.php:618 
    884884msgid "Display your alternative contact name." 
    885885msgstr "Dsilpay yuor atlreanitve cnoatct nmae." 
    886886 
    887887 
    888 #: admin/oik-admin.php:639 
    889 msgid "Display your alternative email address, with a prefix of 'e-mail'." 
    890 msgstr "Dsilpay yuor atlreanitve eamil adderss, wtih A perifx Of 'E-mial'." 
    891  
    892  
    893 #: admin/oik-admin.php:640 
     888#: admin/oik-admin.php:619 
     889msgid "Display your alternative email address, with a prefix of '%1$s'." 
     890msgstr "Dsilpay yuor atlreanitve eamil adderss, wtih A perifx Of '%1$s'." 
     891 
     892 
     893#: admin/oik-admin.php:620 
    894894msgid "Display your alternative telephone number." 
    895895msgstr "Dsilpay yuor atlreanitve tlepeohne nmuebr." 
    896896 
    897897 
    898 #: admin/oik-admin.php:641 
     898#: admin/oik-admin.php:621 
    899899msgid "Display your alternative address." 
    900900msgstr "Dsilpay yuor atlreanitve adderss." 
    901901 
    902902 
    903 #: admin/oik-admin.php:642 
    904 msgid "Display a Googlemap for your alternative address." 
    905 msgstr "Dsilpay A Goolgmeap fOr yuor atlreanitve adderss." 
    906  
    907  
    908 #: admin/oik-admin.php:643 
     903#: admin/oik-admin.php:622 
     904msgid "Display a Google Map for your alternative address." 
     905msgstr "Dsilpay A Goolge MAp fOr yuor atlreanitve adderss." 
     906 
     907 
     908#: admin/oik-admin.php:623 
    909909msgid "Display directions to the alternative address." 
    910910msgstr "Dsilpay driceitnos tO thE atlreanitve adderss." 
    911911 
    912912 
    913 #: admin/oik-admin.php:768 
     913#: admin/oik-admin.php:748 
    914914msgid "Edit custom CSS" 
    915915msgstr "Eidt csuotm CSS" 
    916916 
    917917 
    918 #: admin/oik-admin.php:787 
     918#: admin/oik-admin.php:767 
    919919msgid "shortcode help" 
    920920msgstr "sohtrocde hlep" 
    921921 
    922922 
    923 #: admin/oik-admin.php:788 
     923#: admin/oik-admin.php:768 
    924924msgid "About shortcodes" 
    925925msgstr "Aobut sohtroceds" 
    926926 
    927927 
    928 #: admin/oik-admin.php:792 
     928#: admin/oik-admin.php:772 
    929929msgid "%1$s - more information" 
    930930msgstr "%1$s - mroe ifnroamiton" 
    931931 
    932932 
    933 #: admin/oik-admin.php:793 
     933#: admin/oik-admin.php:773 
    934934msgid "%1$s - snippet" 
    935935msgstr "%1$s - sinppet" 
    936936 
    937937 
    938 #: admin/oik-admin.php:796 
     938#: admin/oik-admin.php:776 
    939939msgid "Shortcode summary" 
    940940msgstr "Sohtrocde smuamry" 
    941941 
    942942 
    943 #: admin/oik-admin.php:805 
     943#: admin/oik-admin.php:785 
    944944msgid "" 
    945945"This page lists all the currently active shortcodes. To find out more " 
     
    950950 
    951951 
    952 #: admin/oik-admin.php:806 
     952#: admin/oik-admin.php:786 
    953953msgid "" 
    954954"Depending on how the shortcode is implemented you will either be shown some " 
     
    959959 
    960960 
    961 #: admin/oik-admin.php:807 
     961#: admin/oik-admin.php:787 
    962962msgid "" 
    963963"You will also be shown the HTML snippet for the example. There should be no " 
     
    968968 
    969969 
    970 #: admin/oik-admin.php:808 
     970#: admin/oik-admin.php:788 
    971971msgid "" 
    972972"For further information on a shortcode or its parameters click on the links " 
     
    977977 
    978978 
    979 #: admin/oik-admin.php:1073 
     979#: admin/oik-admin.php:1053 
    980980msgid "" 
    981981"WordPress has previously determined that there is a new version available: %s" 
     
    984984 
    985985 
    986 #: admin/oik-admin.php:1075 admin/oik-admin.php:1179 
     986#: admin/oik-admin.php:1055 admin/oik-admin.php:1159 
    987987msgid "Current version: %s" 
    988988msgstr "Cruernt vreison: %s" 
    989989 
    990990 
    991 #: admin/oik-admin.php:1077 
     991#: admin/oik-admin.php:1057 
    992992msgid "However, this is a symlinked plugin, located at <br /> %s" 
    993993msgstr "Hwoveer, tihs Is A smyilkned pulign, lcotaed At <br /> %s" 
    994994 
    995995 
    996 #: admin/oik-admin.php:1080 
     996#: admin/oik-admin.php:1060 
    997997msgid "So please don't attempt to apply updates." 
    998998msgstr "SO pelsae dOn't attmept tO apply udptaes." 
    999999 
    10001000 
    1001 #: admin/oik-admin.php:1175 
     1001#: admin/oik-admin.php:1155 
    10021002msgid "This plugin is a Git repository." 
    10031003msgstr "Tihs pulign Is A GIt rpesotiroy." 
    10041004 
    10051005 
    1006 #: admin/oik-admin.php:1177 
     1006#: admin/oik-admin.php:1157 
    10071007msgid "New version?: %s" 
    10081008msgstr "NEw vreison?: %s" 
    10091009 
    10101010 
    1011 #: admin/oik-admin.php:1181 
     1011#: admin/oik-admin.php:1161 
    10121012msgid "Please don't attempt to apply updates using WordPress." 
    10131013msgstr "Pelsae dOn't attmept tO apply udptaes uisng WroPderss." 
     
    25042504 
    25052505 
    2506 #: shortcodes/oik-address.php:12 shortcodes/oik-address.php:46 
     2506#: shortcodes/oik-address.php:15 shortcodes/oik-address.php:50 
    25072507msgid "Work" 
    25082508msgstr "Wrok" 
    25092509 
    25102510 
    2511 #: shortcodes/oik-address.php:46 
     2511#: shortcodes/oik-address.php:50 
    25122512msgid "type" 
    25132513msgstr "tpye" 
    25142514 
    25152515 
    2516 #: shortcodes/oik-address.php:46 
     2516#: shortcodes/oik-address.php:50 
    25172517msgid "Address type." 
    25182518msgstr "Adderss tpye." 
    25192519 
    25202520 
    2521 #: shortcodes/oik-address.php:47 
     2521#: shortcodes/oik-address.php:51 
    25222522msgid "suffix for alternative address" 
    25232523msgstr "sfuifx fOr atlreanitve adderss" 
     2524 
     2525 
     2526#: shortcodes/oik-address.php:52 
     2527msgid "HTML formatting tag" 
     2528msgstr "HMTL froamttnig tAg" 
     2529 
     2530 
     2531#: shortcodes/oik-address.php:58 
     2532msgid "Display the address defined in oik options" 
     2533msgstr "Dsilpay thE adderss dfenied In OIk otpoins" 
    25242534 
    25252535 
     
    32253235 
    32263236#: shortcodes/oik-googlemap.php:255 
    3227 msgid "To display a Googlemap for your company location" 
    3228 msgstr "TO dsilpay A Goolgmeap fOr yuor cmoapny lcotaoin" 
     3237msgid "To display a Google Map for your company location" 
     3238msgstr "TO dsilpay A Goolge MAp fOr yuor cmoapny lcotaoin" 
    32293239 
    32303240 
  • oik/trunk/languages/oik-en_GB.po

    r1775626 r1780343  
    33msgid "" 
    44msgstr "" 
    5 "Project-Id-Version: oik 3.2.1\n" 
     5"Project-Id-Version: oik 3.2.2\n" 
    66"Report-Msgid-Bugs-To: http://wordpress.org/tag/oik\n" 
    7 "POT-Creation-Date: 2017-11-26 13:04:53+00:00\n" 
     7"POT-Creation-Date: 2017-11-30 21:52:24+00:00\n" 
    88"MIME-Version: 1.0\n" 
    99"Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\n" 
     
    349349 
    350350#: admin/oik-admin.php:212 admin/oik-admin.php:261 admin/oik-admin.php:547 
    351 #: admin/oik-admin.php:627 
     351#: admin/oik-admin.php:607 
    352352msgid "Save changes" 
    353353msgstr "Save changes" 
     
    494494 
    495495#: admin/oik-admin.php:427 
    496 msgid "Extended-address" 
    497 msgstr "Extended-address" 
     496msgid "Extended address" 
     497msgstr "Extended address" 
    498498 
    499499#: admin/oik-admin.php:428 
    500 msgid "Street-address" 
    501 msgstr "Street-address" 
     500msgid "Street address" 
     501msgstr "Street address" 
    502502 
    503503#: admin/oik-admin.php:429 
     
    648648msgstr "'Hi,' replacement string" 
    649649 
    650 #: admin/oik-admin.php:561 admin/oik-admin.php:637 
     650#: admin/oik-admin.php:561 admin/oik-admin.php:617 
    651651msgid "Use the shortcodes in your pages, widgets and titles. e.g." 
    652652msgstr "Use the shortcodes in your pages, widgets and titles. e.g." 
     
    669669 
    670670#: admin/oik-admin.php:566 
    671 msgid "Display a Googlemap for your primary address." 
    672 msgstr "Display a Googlemap for your primary address." 
     671msgid "Display a Google Map for your primary address." 
     672msgstr "Display a Google Map for your primary address." 
    673673 
    674674#: admin/oik-admin.php:567 
     
    702702msgstr "usage notes" 
    703703 
    704 #: admin/oik-admin.php:638 
     704#: admin/oik-admin.php:618 
    705705msgid "Display your alternative contact name." 
    706706msgstr "Display your alternative contact name." 
    707707 
    708 #: admin/oik-admin.php:639 
    709 msgid "Display your alternative email address, with a prefix of 'e-mail'." 
    710 msgstr "Display your alternative email address, with a prefix of 'e-mail'." 
    711  
    712 #: admin/oik-admin.php:640 
     708#: admin/oik-admin.php:619 
     709msgid "Display your alternative email address, with a prefix of '%1$s'." 
     710msgstr "Display your alternative email address, with a prefix of '%1$s'." 
     711 
     712#: admin/oik-admin.php:620 
    713713msgid "Display your alternative telephone number." 
    714714msgstr "Display your alternative telephone number." 
    715715 
    716 #: admin/oik-admin.php:641 
     716#: admin/oik-admin.php:621 
    717717msgid "Display your alternative address." 
    718718msgstr "Display your alternative address." 
    719719 
    720 #: admin/oik-admin.php:642 
    721 msgid "Display a Googlemap for your alternative address." 
    722 msgstr "Display a Googlemap for your alternative address." 
    723  
    724 #: admin/oik-admin.php:643 
     720#: admin/oik-admin.php:622 
     721msgid "Display a Google Map for your alternative address." 
     722msgstr "Display a Google Map for your alternative address." 
     723 
     724#: admin/oik-admin.php:623 
    725725msgid "Display directions to the alternative address." 
    726726msgstr "Display directions to the alternative address." 
    727727 
    728 #: admin/oik-admin.php:768 
     728#: admin/oik-admin.php:748 
    729729msgid "Edit custom CSS" 
    730730msgstr "Edit custom CSS" 
    731731 
    732 #: admin/oik-admin.php:787 
     732#: admin/oik-admin.php:767 
    733733msgid "shortcode help" 
    734734msgstr "shortcode help" 
    735735 
    736 #: admin/oik-admin.php:788 
     736#: admin/oik-admin.php:768 
    737737msgid "About shortcodes" 
    738738msgstr "About shortcodes" 
    739739 
    740 #: admin/oik-admin.php:792 
     740#: admin/oik-admin.php:772 
    741741msgid "%1$s - more information" 
    742742msgstr "%1$s - more information" 
    743743 
    744 #: admin/oik-admin.php:793 
     744#: admin/oik-admin.php:773 
    745745msgid "%1$s - snippet" 
    746746msgstr "%1$s - snippet" 
    747747 
    748 #: admin/oik-admin.php:796 
     748#: admin/oik-admin.php:776 
    749749msgid "Shortcode summary" 
    750750msgstr "Shortcode summary" 
    751751 
    752 #: admin/oik-admin.php:805 
     752#: admin/oik-admin.php:785 
    753753msgid "" 
    754754"This page lists all the currently active shortcodes. To find out more " 
     
    756756msgstr "This page lists all the currently active shortcodes. To find out more information about a shortcode click on the shortcode name in the Help column." 
    757757 
    758 #: admin/oik-admin.php:806 
     758#: admin/oik-admin.php:786 
    759759msgid "" 
    760760"Depending on how the shortcode is implemented you will either be shown some " 
     
    762762msgstr "Depending on how the shortcode is implemented you will either be shown some more information with one or more examples, or an 'oik generated example.'" 
    763763 
    764 #: admin/oik-admin.php:807 
     764#: admin/oik-admin.php:787 
    765765msgid "" 
    766766"You will also be shown the HTML snippet for the example. There should be no " 
     
    768768msgstr "You will also be shown the HTML snippet for the example. There should be no need to do anything with this output." 
    769769 
    770 #: admin/oik-admin.php:808 
     770#: admin/oik-admin.php:788 
    771771msgid "" 
    772772"For further information on a shortcode or its parameters click on the links " 
     
    774774msgstr "For further information on a shortcode or its parameters click on the links in the Syntax column." 
    775775 
    776 #: admin/oik-admin.php:1073 
     776#: admin/oik-admin.php:1053 
    777777msgid "" 
    778778"WordPress has previously determined that there is a new version available: %s" 
    779779msgstr "WordPress has previously determined that there is a new version available: %s" 
    780780 
    781 #: admin/oik-admin.php:1075 admin/oik-admin.php:1179 
     781#: admin/oik-admin.php:1055 admin/oik-admin.php:1159 
    782782msgid "Current version: %s" 
    783783msgstr "Current version: %s" 
    784784 
    785 #: admin/oik-admin.php:1077 
     785#: admin/oik-admin.php:1057 
    786786msgid "However, this is a symlinked plugin, located at <br /> %s" 
    787787msgstr "However, this is a symlinked plugin, located at <br /> %s" 
    788788 
    789 #: admin/oik-admin.php:1080 
     789#: admin/oik-admin.php:1060 
    790790msgid "So please don't attempt to apply updates." 
    791791msgstr "So please don't attempt to apply updates." 
    792792 
    793 #: admin/oik-admin.php:1175 
     793#: admin/oik-admin.php:1155 
    794794msgid "This plugin is a Git repository." 
    795795msgstr "This plugin is a Git repository." 
    796796 
    797 #: admin/oik-admin.php:1177 
     797#: admin/oik-admin.php:1157 
    798798msgid "New version?: %s" 
    799799msgstr "New version?: %s" 
    800800 
    801 #: admin/oik-admin.php:1181 
     801#: admin/oik-admin.php:1161 
    802802msgid "Please don't attempt to apply updates using WordPress." 
    803803msgstr "Please don't attempt to apply updates using WordPress." 
     
    20042004msgstr "Snippet not produced for this shortcode: %1$s" 
    20052005 
    2006 #: shortcodes/oik-address.php:12 shortcodes/oik-address.php:46 
     2006#: shortcodes/oik-address.php:15 shortcodes/oik-address.php:50 
    20072007msgid "Work" 
    20082008msgstr "Work" 
    20092009 
    2010 #: shortcodes/oik-address.php:46 
     2010#: shortcodes/oik-address.php:50 
    20112011msgid "type" 
    20122012msgstr "type" 
    20132013 
    2014 #: shortcodes/oik-address.php:46 
     2014#: shortcodes/oik-address.php:50 
    20152015msgid "Address type." 
    20162016msgstr "Address type." 
    20172017 
    2018 #: shortcodes/oik-address.php:47 
     2018#: shortcodes/oik-address.php:51 
    20192019msgid "suffix for alternative address" 
    20202020msgstr "suffix for alternative address" 
     2021 
     2022#: shortcodes/oik-address.php:52 
     2023msgid "HTML formatting tag" 
     2024msgstr "HTML formatting tag" 
     2025 
     2026#: shortcodes/oik-address.php:58 
     2027msgid "Display the address defined in oik options" 
     2028msgstr "Display the address defined in oik options" 
    20212029 
    20222030#: shortcodes/oik-attachments.php:323 
     
    25822590 
    25832591#: shortcodes/oik-googlemap.php:255 
    2584 msgid "To display a Googlemap for your company location" 
    2585 msgstr "To display a Googlemap for your company location" 
     2592msgid "To display a Google Map for your company location" 
     2593msgstr "To display a Google Map for your company location" 
    25862594 
    25872595#: shortcodes/oik-googlemap.php:256 
  • oik/trunk/languages/oik.pot

    r1775626 r1780343  
    33msgid "" 
    44msgstr "" 
    5 "Project-Id-Version: oik 3.2.1\n" 
     5"Project-Id-Version: oik 3.2.2\n" 
    66"Report-Msgid-Bugs-To: http://wordpress.org/tag/oik\n" 
    7 "POT-Creation-Date: 2017-11-26 13:04:53+00:00\n" 
     7"POT-Creation-Date: 2017-11-30 21:52:24+00:00\n" 
    88"MIME-Version: 1.0\n" 
    99"Content-Type: text/plain; charset=UTF-8\n" 
     
    348348 
    349349#: admin/oik-admin.php:212 admin/oik-admin.php:261 admin/oik-admin.php:547 
    350 #: admin/oik-admin.php:627 
     350#: admin/oik-admin.php:607 
    351351msgid "Save changes" 
    352352msgstr "" 
     
    493493 
    494494#: admin/oik-admin.php:427 
    495 msgid "Extended-address" 
     495msgid "Extended address" 
    496496msgstr "" 
    497497 
    498498#: admin/oik-admin.php:428 
    499 msgid "Street-address" 
     499msgid "Street address" 
    500500msgstr "" 
    501501 
     
    647647msgstr "" 
    648648 
    649 #: admin/oik-admin.php:561 admin/oik-admin.php:637 
     649#: admin/oik-admin.php:561 admin/oik-admin.php:617 
    650650msgid "Use the shortcodes in your pages, widgets and titles. e.g." 
    651651msgstr "" 
     
    668668 
    669669#: admin/oik-admin.php:566 
    670 msgid "Display a Googlemap for your primary address." 
     670msgid "Display a Google Map for your primary address." 
    671671msgstr "" 
    672672 
     
    701701msgstr "" 
    702702 
    703 #: admin/oik-admin.php:638 
     703#: admin/oik-admin.php:618 
    704704msgid "Display your alternative contact name." 
    705705msgstr "" 
    706706 
    707 #: admin/oik-admin.php:639 
    708 msgid "Display your alternative email address, with a prefix of 'e-mail'." 
    709 msgstr "" 
    710  
    711 #: admin/oik-admin.php:640 
     707#: admin/oik-admin.php:619 
     708msgid "Display your alternative email address, with a prefix of '%1$s'." 
     709msgstr "" 
     710 
     711#: admin/oik-admin.php:620 
    712712msgid "Display your alternative telephone number." 
    713713msgstr "" 
    714714 
    715 #: admin/oik-admin.php:641 
     715#: admin/oik-admin.php:621 
    716716msgid "Display your alternative address." 
    717717msgstr "" 
    718718 
    719 #: admin/oik-admin.php:642 
    720 msgid "Display a Googlemap for your alternative address." 
    721 msgstr "" 
    722  
    723 #: admin/oik-admin.php:643 
     719#: admin/oik-admin.php:622 
     720msgid "Display a Google Map for your alternative address." 
     721msgstr "" 
     722 
     723#: admin/oik-admin.php:623 
    724724msgid "Display directions to the alternative address." 
    725725msgstr "" 
    726726 
     727#: admin/oik-admin.php:748 
     728msgid "Edit custom CSS" 
     729msgstr "" 
     730 
     731#: admin/oik-admin.php:767 
     732msgid "shortcode help" 
     733msgstr "" 
     734 
    727735#: admin/oik-admin.php:768 
    728 msgid "Edit custom CSS" 
    729 msgstr "" 
    730  
    731 #: admin/oik-admin.php:787 
    732 msgid "shortcode help" 
    733 msgstr "" 
    734  
    735 #: admin/oik-admin.php:788 
    736736msgid "About shortcodes" 
    737737msgstr "" 
    738738 
    739 #: admin/oik-admin.php:792 
     739#: admin/oik-admin.php:772 
    740740msgid "%1$s - more information" 
    741741msgstr "" 
    742742 
    743 #: admin/oik-admin.php:793 
     743#: admin/oik-admin.php:773 
    744744msgid "%1$s - snippet" 
    745745msgstr "" 
    746746 
    747 #: admin/oik-admin.php:796 
     747#: admin/oik-admin.php:776 
    748748msgid "Shortcode summary" 
    749749msgstr "" 
    750750 
    751 #: admin/oik-admin.php:805 
     751#: admin/oik-admin.php:785 
    752752msgid "" 
    753753"This page lists all the currently active shortcodes. To find out more " 
     
    755755msgstr "" 
    756756 
    757 #: admin/oik-admin.php:806 
     757#: admin/oik-admin.php:786 
    758758msgid "" 
    759759"Depending on how the shortcode is implemented you will either be shown some " 
     
    761761msgstr "" 
    762762 
    763 #: admin/oik-admin.php:807 
     763#: admin/oik-admin.php:787 
    764764msgid "" 
    765765"You will also be shown the HTML snippet for the example. There should be no " 
     
    767767msgstr "" 
    768768 
    769 #: admin/oik-admin.php:808 
     769#: admin/oik-admin.php:788 
    770770msgid "" 
    771771"For further information on a shortcode or its parameters click on the links " 
     
    773773msgstr "" 
    774774 
    775 #: admin/oik-admin.php:1073 
     775#: admin/oik-admin.php:1053 
    776776msgid "" 
    777777"WordPress has previously determined that there is a new version available: %s" 
    778778msgstr "" 
    779779 
    780 #: admin/oik-admin.php:1075 admin/oik-admin.php:1179 
     780#: admin/oik-admin.php:1055 admin/oik-admin.php:1159 
    781781msgid "Current version: %s" 
    782782msgstr "" 
    783783 
    784 #: admin/oik-admin.php:1077 
     784#: admin/oik-admin.php:1057 
    785785msgid "However, this is a symlinked plugin, located at <br /> %s" 
    786786msgstr "" 
    787787 
    788 #: admin/oik-admin.php:1080 
     788#: admin/oik-admin.php:1060 
    789789msgid "So please don't attempt to apply updates." 
    790790msgstr "" 
    791791 
    792 #: admin/oik-admin.php:1175 
     792#: admin/oik-admin.php:1155 
    793793msgid "This plugin is a Git repository." 
    794794msgstr "" 
    795795 
    796 #: admin/oik-admin.php:1177 
     796#: admin/oik-admin.php:1157 
    797797msgid "New version?: %s" 
    798798msgstr "" 
    799799 
    800 #: admin/oik-admin.php:1181 
     800#: admin/oik-admin.php:1161 
    801801msgid "Please don't attempt to apply updates using WordPress." 
    802802msgstr "" 
     
    20032003msgstr "" 
    20042004 
    2005 #: shortcodes/oik-address.php:12 shortcodes/oik-address.php:46 
     2005#: shortcodes/oik-address.php:15 shortcodes/oik-address.php:50 
    20062006msgid "Work" 
    20072007msgstr "" 
    20082008 
    2009 #: shortcodes/oik-address.php:46 
     2009#: shortcodes/oik-address.php:50 
    20102010msgid "type" 
    20112011msgstr "" 
    20122012 
    2013 #: shortcodes/oik-address.php:46 
     2013#: shortcodes/oik-address.php:50 
    20142014msgid "Address type." 
    20152015msgstr "" 
    20162016 
    2017 #: shortcodes/oik-address.php:47 
     2017#: shortcodes/oik-address.php:51 
    20182018msgid "suffix for alternative address" 
     2019msgstr "" 
     2020 
     2021#: shortcodes/oik-address.php:52 
     2022msgid "HTML formatting tag" 
     2023msgstr "" 
     2024 
     2025#: shortcodes/oik-address.php:58 
     2026msgid "Display the address defined in oik options" 
    20192027msgstr "" 
    20202028 
     
    25812589 
    25822590#: shortcodes/oik-googlemap.php:255 
    2583 msgid "To display a Googlemap for your company location" 
     2591msgid "To display a Google Map for your company location" 
    25842592msgstr "" 
    25852593 
  • oik/trunk/oik.css

    r1767219 r1780343  
    1 /*  (C) Copyright Bobbing Wide 2010-2015 
     1/*  (C) Copyright Bobbing Wide 2010-2017 
    22 
    33 The oik.css stylesheet provides the default formatting for the HTML generated by the oik plugin 
     
    9898 
    9999/* For [bw_address] */ 
    100 div.bw_address div.type { display: none; } 
     100div.bw_address div.type, 
     101span.bw_address span.type { display: none; } 
     102span.bw_address span { padding-right: .5em; }  
    101103 
    102104/* disable the background on Mail Chimp's Email Format radio buttons */ 
  • oik/trunk/oik.php

    r1775626 r1780343  
    44Plugin URI: https://www.oik-plugins.com/oik-plugins/oik 
    55Description: OIK Information Kit - Over 80 lazy smart shortcodes for displaying WordPress content 
    6 Version: 3.2.1 
     6Version: 3.2.2 
    77Author: bobbingwide 
    88Author URI: https://www.oik-plugins.com/author/bobbingwide 
  • oik/trunk/oik_boot.inc

    r1393145 r1780343  
    1 <?php // (C) Copyright Bobbing Wide 2012-2015 
     1<?php // (C) Copyright Bobbing Wide 2012-2017 
    22if ( function_exists( "_deprecated_file" ) ) { 
    33    _deprecated_file( __FILE__, "2.6", "libs/oik_boot.php", "Please use libs/oik_boot.php" );  
    44} 
    5 echo "<!-- " ; 
    6 var_dump( debug_backtrace() ); 
    7 echo " -->"; 
    85require_once( __DIR__ . '/libs/oik_boot.php' ); 
    96 
  • oik/trunk/readme.txt

    r1775626 r1780343  
    44Tags: shortcodes, shortcode, advanced, oik 
    55Requires at least: 4.8  
    6 Tested up to: 4.9 
    7 Stable tag: 3.2.1 
     6Tested up to: 4.9.1 
     7Stable tag: 3.2.2 
    88License: GPLv2 or later 
    99License URI: http://www.gnu.org/licenses/gpl-2.0.html 
     
    9191 
    9292== Upgrade Notice == 
     93= 3.2.2 =  
     94Upgrade for improvements related to the bw_address shortcode. Translation ready. Tested with WordPress 4.9.1 and WordPress Multisite.  
     95 
    9396= 3.2.1 =  
    9497Translation ready. Tested with WordPress 4.9 and WordPress Multisite. 
     
    421424 
    422425== Changelog == 
     426= 3.2.2 =  
     427* Changed: Added tag= parameter to [bw_address] shortcode [github bobbingwide oik issues 89] 
     428* Changed: String changes for improved internationalization [github bobbingwide oik issues 9] 
     429* Fixed: Deprecation logic in includes/bw_fields.inc can break a site [github bobbingwide oik issues 90 ] 
     430* Fixed: Unwanted p tags in [bw_address] shortcode [github bobbingwide oik issues 89] 
     431* Tested: With PHP 7.0 and 7.1 
     432* Tested: With WordPress 4.9.1 and WordPress Multisite 
     433 
    423434= 3.2.1 =  
    424435* Changed: Change caption__example and embed__example for WordPress 4.9 [github bobbingwide oik issues 88] 
  • oik/trunk/shortcodes/oik-address.php

    r1744071 r1780343  
    33/** 
    44 * Implement [bw_address] shortcode to display an address using Microformats 
     5 * 
     6 * When the tag=div then we get a blocked version of the address. 
     7 * When tag=span the address should be inline. 
    58 *  
    69 * @param array $atts shortcode parameters 
    710 * @param string $content not expected 
    8  * @param string $tag shortcode tag 
     11 * @param string $shortcode_tag shortcode tag 
    912 * @return string generated HTML 
    1013 */ 
    11 function bw_address( $atts=null, $content=null, $tag=null ) { 
     14function bw_address( $atts=null, $content=null, $shortcode_tag=null ) { 
    1215  $type = bw_array_get( $atts, "type", __( "Work", "oik" ) ); 
    13   sdiv("adr bw_address" ); 
    14     sdiv("type"); 
     16    $tag = bw_array_get( $atts, "tag", "div" ); 
     17  stag( $tag, "adr bw_address" ); 
     18    stag( $tag, "type"); 
    1519    e( $type ); 
    16     ediv(); 
    17     sdiv("extended-address"); 
     20    etag( $tag ); 
     21    stag( $tag, "extended-address"); 
    1822    e( bw_get_option_arr( "extended-address", "bw_options", $atts ) ); 
    19     ediv(); 
    20     sdiv("street-address"); 
     23    etag( $tag ); 
     24    stag( $tag, "street-address"); 
    2125    e( bw_get_option_arr( "street-address", "bw_options", $atts ) ); 
    22     ediv();   
    23     sdiv("locality"); 
     26    etag( $tag );   
     27    stag( $tag, "locality"); 
    2428    e( bw_get_option_arr( "locality", "bw_options", $atts ) ); 
    25     ediv();       
    26     sdiv("region"); 
     29    etag( $tag );       
     30    stag( $tag, "region"); 
    2731    e( bw_get_option_arr( "region", "bw_options", $atts ) ); 
    28     ediv();       
    29     sdiv("postal-code"); 
     32    etag( $tag );       
     33    stag( $tag, "postal-code"); 
    3034    e( bw_get_option_arr( "postal-code", "bw_options", $atts ) ); 
    31     ediv(); 
    32     span("country-name"); 
     35    etag( $tag ); 
     36    stag( $tag, "country-name"); 
    3337    e( bw_get_option_arr( "country-name", "bw_options", $atts ) ); 
    34     epan(); 
    35   ediv(); 
     38    etag( $tag ); 
     39  etag( $tag ); 
    3640  return( bw_ret() ); 
    3741} 
     
    4650  $syntax = array( "type" => BW_::bw_skv( __( "Work", "oik" ), "<i>" . __( "type", "oik" ) . "</i>", __( "Address type.", "oik" ) ) 
    4751                 , "alt" => BW_::bw_skv( "", "1", __( "suffix for alternative address", "oik" ) ) 
     52                                 , "tag" => BW_::bw_skv( "div", "span", __( "HTML formatting tag", "oik" ) ) 
    4853                 ); 
    4954  return( $syntax ); 
     
    5156 
    5257function bw_address__example( $shortcode="bw_address" ) { 
    53   $text = "Display the address defined in oik options" ; 
     58  $text = __( "Display the address defined in oik options", "oik" ) ; 
    5459  $example = ''; 
    5560  bw_invoke_shortcode( $shortcode, $example, $text ); 
  • oik/trunk/shortcodes/oik-googlemap.php

    r1744071 r1780343  
    8383 
    8484/** 
    85  * Display a GoogleMap using Google Maps JavaScript API V3 
    86  *  
    87  * Display a GoogleMap  
     85 * Display a Google Map using Google Maps JavaScript API V3 
     86 *  
     87 * Display a Google Map  
    8888 * - centred around the lat and long specified in oik options 
    8989 * - zoomed to level 12 - which is good for local viewing 
     
    253253*/  
    254254function bw_show_googlemap__example( $shortcode = "bw_show_googlemap" ) { 
    255   bw_invoke_shortcode( $shortcode, null, __( "To display a Googlemap for your company location", "oik" ) );     
     255  bw_invoke_shortcode( $shortcode, null, __( "To display a Google Map for your company location", "oik" ) );     
    256256  BW_::p( __( "Some of the default values are extracted from oik information:", "oik" ) ); 
    257257  sul(); 
     
    271271                 , "lat" => BW_::bw_skv( "<i>lat</i>", __( "latitude", "oik" ) , __( "latitude", "oik" ) ) 
    272272                 , "long" => BW_::bw_skv( "<i>long</i>", __( "longitude", "oik" ), __( "longitude", "oik" ) ) 
    273                  , "postcode" => BW_::bw_skv( "<i>postcode</i>", __( "postcode", "oik" ), __( "post code or zip code", "oik" ) ) 
     273                 , "postcode" => BW_::bw_skv( "<i>postcode</i>", __( "postcode", "oik" ), __( "postcode or ZIP code", "oik" ) ) 
    274274                 , "width" => BW_::bw_skv( "100%", __( "width", "oik" ), __( "width of the Google map", "oik" ) ) 
    275275                 , "height" => BW_::bw_skv( "400px", __( "height", "oik" ), __( "height of the map", "oik" ) ) 
Note: See TracChangeset for help on using the changeset viewer.