diff --git a/.travis.yml b/.travis.yml index 2b380fc..6e66a6c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,10 +20,14 @@ matrix: include: - php: 7.4 env: WP_VERSION=latest + - php: 7.3 + env: WP_VERSION=latest - php: 5.6 env: WP_VERSION=latest - php: 5.6 env: WP_VERSION=trunk + - php: 5.6 + env: WP_VERSION=4.9 - php: 7.4 env: WP_TRAVISCI=phpcs diff --git a/Gruntfile.js b/Gruntfile.js index 0bbcec8..e059d64 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -3,161 +3,165 @@ module.exports = function( grunt ) { - // Grab package as variable for later use/ - var pkg = grunt.file.readJSON( 'package.json' ); + // Grab package as variable for later use/ + var pkg = grunt.file.readJSON( 'package.json' ); - // Load all tasks. - require('load-grunt-tasks')(grunt, {scope: 'devDependencies'}); + // Load all tasks. + require('load-grunt-tasks')(grunt, {scope: 'devDependencies'}); - // Project configuration - grunt.initConfig( { - pkg: pkg, - devUpdate: { - main: { - options: { - updateType: 'prompt', - packages: { - devDependencies: true - }, - } - } - }, - prompt: { - version: { - options: { - questions: [ - { - config: 'newVersion', - type: 'input', - message: 'What specific version would you like?', - default: '<%= pkg.version %>' - }, - { - config: 'updateStable', - type: 'confirm', - message: 'Bump stable version?', - default: false - } - ] - } - } - }, - replace: { - package: { - src: ['package.json'], - overwrite: true, - replacements: [ - { - "version": "1.0.0", - from: /("version":\s*).*,\n/g, - to: '$1"<%= newVersion %>",\n' - } - ] - }, - readme: { - src: ['readme.txt'], - overwrite: true, - replacements: [ - { - from: /(Stable tag:\s*)(.*)(\n)/g, - to: function(matchedText, index, fullText, regexMatches) { - return grunt.config('updateStable') ? regexMatches[0] + grunt.config('newVersion') + regexMatches[2]: matchedText; - } - } - ] - }, - php: { - src: ['better-font-awesome.php'], - overwrite: true, - replacements: [ - { - from: /(\*\s*Version:\s*).*\n/g, - to: '$1<%= newVersion %>\n' - } - ] - } - }, - makepot: { - target: { - options: { - domainPath: '/languages/', // Where to save the POT file. - potFilename: 'better-font-awesome.pot', // Name of the POT file. - type: 'wp-plugin' // Type of project (wp-plugin or wp-theme). - } - } - }, - wp_readme_to_markdown: { - readme: { - files: { - 'readme.md': 'readme.txt' - }, - options: { - post_convert: function(text) { - var prefix = [ - '[![Build Status](https://travis-ci.org/MickeyKay/better-font-awesome.svg?branch=master)](https://travis-ci.org/MickeyKay/better-font-awesome)', - '[![Downloads](https://img.shields.io/wordpress/plugin/dt/better-font-awesome.svg)](https://wordpress.org/plugins/better-font-awesome/)', - '[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)' - ].join(' '); + // Project configuration + grunt.initConfig( { + pkg: pkg, + devUpdate: { + main: { + options: { + updateType: 'prompt', + packages: { + devDependencies: true + }, + } + } + }, + prompt: { + version: { + options: { + questions: [ + { + config: 'newVersion', + type: 'input', + message: 'What specific version would you like?', + default: '<%= pkg.version %>' + }, + { + config: 'updateStable', + type: 'confirm', + message: 'Bump stable version?', + default: false + } + ] + } + } + }, + replace: { + package: { + src: ['package.json'], + overwrite: true, + replacements: [ + { + "version": "1.0.0", + from: /("version":\s*).*,\n/g, + to: '$1"<%= newVersion %>",\n' + } + ] + }, + readme: { + src: ['readme.txt'], + overwrite: true, + replacements: [ + { + from: /(Stable tag:\s*)(.*)(\n)/g, + to: function(matchedText, index, fullText, regexMatches) { + return grunt.config('updateStable') ? regexMatches[0] + grunt.config('newVersion') + regexMatches[2]: matchedText; + } + } + ] + }, + php: { + src: ['better-font-awesome.php'], + overwrite: true, + replacements: [ + { + from: /(\*\s*Version:\s*).*\n/g, + to: '$1<%= newVersion %>\n' + }, + { + from: /(const VERSION = ').*(';)/g, + to: '$1<%= newVersion %>$2' + } + ] + } + }, + makepot: { + target: { + options: { + domainPath: '/languages/', // Where to save the POT file. + potFilename: 'better-font-awesome.pot', // Name of the POT file. + type: 'wp-plugin' // Type of project (wp-plugin or wp-theme). + } + } + }, + wp_readme_to_markdown: { + readme: { + files: { + 'readme.md': 'readme.txt' + }, + options: { + post_convert: function(text) { + var prefix = [ + '[![Build Status](https://travis-ci.com/MickeyKay/better-font-awesome.svg?branch=master)](https://travis-ci.com/MickeyKay/better-font-awesome)', + '[![Downloads](https://img.shields.io/wordpress/plugin/dt/better-font-awesome.svg)](https://wordpress.org/plugins/better-font-awesome/)', + '[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)' + ].join(' '); - return [prefix,text].join('\n\n'); - } - } - }, - }, - copy: { - composerDeps: { - src: [ - 'vendor/mickey-kay/**' - ], - dest: 'svn/trunk/' - }, - svnAssets: { - cwd: 'assets/', - src: ['**'], - dest: 'svn/assets/', - expand: true, - }, - svnTrunk: { - src: [ - '**', - '!node_modules/**', - '!vendor/**', - '!svn/**', - '!.git/**', - '!.gitignore', - '!.gitmodules', - '!.sass-cache/**', - '!bin/**', - '!tests/**', - '!css/src/**', - '!js/src/**', - '!img/src/**', - '!assets/**', - '!design/**', - '!Gruntfile.js', - '!package.json', - '!composer*', - ], - dest: 'svn/trunk/', - }, - svnTags: { - cwd: 'svn/trunk/', - src: ['**'], - dest: 'svn/tags/<%= newVersion %>/', - expand: true, - } - } - } ); + return [prefix,text].join('\n\n'); + } + } + }, + }, + copy: { + composerDeps: { + src: [ + 'vendor/mickey-kay/**' + ], + dest: 'svn/trunk/' + }, + svnAssets: { + cwd: 'assets/', + src: ['**'], + dest: 'svn/assets/', + expand: true, + }, + svnTrunk: { + src: [ + '**', + '!node_modules/**', + '!vendor/**', + '!svn/**', + '!.git/**', + '!.gitignore', + '!.gitmodules', + '!.sass-cache/**', + '!bin/**', + '!tests/**', + '!css/src/**', + '!js/src/**', + '!img/src/**', + '!assets/**', + '!design/**', + '!Gruntfile.js', + '!package.json', + '!composer*', + ], + dest: 'svn/trunk/', + }, + svnTags: { + cwd: 'svn/trunk/', + src: ['**'], + dest: 'svn/tags/<%= newVersion %>/', + expand: true, + } + } + } ); - grunt.registerTask( 'build', [ - 'prompt', - 'replace', - 'makepot', - 'wp_readme_to_markdown', - 'copy' - ] ); + grunt.registerTask( 'build', [ + 'prompt', + 'replace', + 'makepot', + 'wp_readme_to_markdown', + 'copy' + ] ); - grunt.registerTask( 'default', 'build' ); + grunt.registerTask( 'default', 'build' ); - grunt.util.linefeed = '\n'; + grunt.util.linefeed = '\n'; }; diff --git a/README.md b/README.md index b52d4b2..d7cb78c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build Status](https://travis-ci.org/MickeyKay/better-font-awesome.svg?branch=master)](https://travis-ci.org/MickeyKay/better-font-awesome) [![Downloads](https://img.shields.io/wordpress/plugin/dt/better-font-awesome.svg)](https://wordpress.org/plugins/better-font-awesome/) [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) +[![Build Status](https://travis-ci.com/MickeyKay/better-font-awesome.svg?branch=master)](https://travis-ci.com/MickeyKay/better-font-awesome) [![Downloads](https://img.shields.io/wordpress/plugin/dt/better-font-awesome.svg)](https://wordpress.org/plugins/better-font-awesome/) [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) # Better Font Awesome # **Contributors:** [McGuive7](https://profiles.wordpress.org/McGuive7), [aaronbmm](https://profiles.wordpress.org/aaronbmm), [mightyminnow](https://profiles.wordpress.org/mightyminnow) @@ -14,7 +14,7 @@ The Better Font Awesome plugin for WordPress. Shortcodes, HTML, TinyMCE, various ## Description ## -[![Build Status](https://travis-ci.org/MickeyKay/better-font-awesome.svg?branch=master)](https://travis-ci.org/MickeyKay/better-font-awesome) +[![Build Status](https://travis-ci.com/MickeyKay/better-font-awesome.svg?branch=master)](https://travis-ci.com/MickeyKay/better-font-awesome) **Do you find this plugin helpful? Please consider [leaving a 5-star review](https://wordpress.org/support/view/plugin-reviews/better-font-awesome).** @@ -113,6 +113,18 @@ Better Font Awesome does it's best to load after any existing Font Awesome CSS, ## Changelog ## +### 2.0.0 ### +* Add support for Font Awesome v5 +* Integration with Font Awesome GraphQL API for all data fetching (improve performance) +* Integrate with Font Awesome CDN for all CSS +* Add option to include the v4 Font Awesome CSS shim to support older icons (default on for upgrades) +* Updatee hard-coded fallback Font Awesome version +* Modify version check frequency to a saner 24 hour interval +* Ensure admin notices are dismissible +* Lower data fetch timeout to mitigate performance risks +* Remove legacy options that are no longer relevant (version select, minification opt-out) +* Add more/better unit tests to ensure things are working as expected + ### 1.7.6 ### * Fix: revert to 1.7.4 codebase. * Fix: remove calls to `ready()` jQuery method to support latest jQuery versions. @@ -138,126 +150,20 @@ Better Font Awesome does it's best to load after any existing Font Awesome CSS, * Update fallback Font Awesome to v4.7.0. * Switch from using git submodules to composer dependency management for core library inclusion. -### 1.6.0 ### -* Update fallback Font Awesome to v4.6.3. - -### 1.5.0 ### -* Update fallback Font Awesome to v4.5.0. -* Add new `bfa_icon_tag` to allow for filtering default `` tag. - -### 1.4.3 ### -* Fix: refactor JS to allow icon shortcode insertion button to work in all instances (ACF Flexible and Repeater fields, divi, Black Studio TinyMCE ). - -### 1.4.2 ### -* Fix: icon picker not working for ACF Pro repeater field. - -### 1.4.1 ### -* Fix: icon picker not working for ACF repeater field. - -### 1.4.0 ### -* Fix: icon picker not working for Black Studio TinyMCE Widget. (props @EJOweb and @marcochiesi) -* Update fallback Font Awesome to version 4.4.0. - -### 1.3.4 ### -* Update Better Font Awesome Library to version 1.3.4. -* Fix double shortcode insert issue. -* Fix behavior in which clicking shortcode insert button scrolls to top of page. - -### 1.3.3 ### -* Update plugin and BFAL to all fire on `init` hook instead of mix of `plugins_loaded` and `after_theme_setup`. This should fix issues in which icons don't show up when BFAL is used in other plugins. -* Update iconpicker JS to avoid conflict that arose from preventing subsequent `mouseup` event listeners from firing. -* Change appearance of iconpicker button to match default buttons. - -### 1.3.2 ### -* Update Better Font Awesome Library with better prefix removal method for filtered icons. - -### 1.3.1 ### -* Update admin JS to trigger icon picker on ALL TinyMCE initializations (e.g. Visual Composer and AJAX) - -### 1.3.0 ### -* Replace outdated TinyMCE shortcode selector brand new jQuery dropdown selector that works in both the visual and text editor -* Clean up CSS and JS - -### 1.2.1 ### -* Update get_instance() call to work for older versions of PHP (< 5.3) - -### 1.2.0 ### -* Attach load functionality to after_theme_setup hook to allow themes to filter options -* Update fallback Font Awesome to version 4.3.0 - -### 1.1.0 ### -* Implement Ajax to save plugin settings (thanks [Braad](https://profiles.wordpress.org/braad)) - -### 1.0.10 ### -* Fix SSL bug breaking wp_remote_get() from https. - -### 1.0.9 ### -* Fix debuggin hook set to init instead of plugins_loaded. - -### 1.0.8 ### -* Add admin setting to hide admin notices for API and CDN connectivity warnings. -* Update translations. - -### 1.0.7 ### -* Update included fallback to Font Awesome version 4.3. - -### 1.0.6 ### -* Unhook library load() function from plugins_loaded and run directly from constructor (fixes bug preventing developers from overriding initialization easily). - -### 1.0.5 ### -* Add fa_force_fallback and bfa_show_errors filters. -* Add hex icon values as $icon array indexes. - -### 1.0.4 ### -* Add missing isset() check that was causing intermittent warning. - -### 1.0.3 ### -* Add French translation. -* Correct text domain slug. - -### 1.0.2 ### -* Add updated .pot file. -* Further improve error handling and fallback. - -### 1.0.1 ### -* Fix error handling for 404 API requests. - -### 1.0.0 ### -* Fully refactor the back-end. -* Switch to just using the jsDelivr CDN. -* Implement transients to minimize load time. -* Implement improved fallback handling (transient → wp_remote_get() → locally included files) -* Switch out bulky Titan Framework for native Settings API. - -### 0.9.6 ### -* Fixed missing icon previews in WordPress 3.8 and below. - -### 0.9.5 ### -* Added ability to choose which CDN to use. -* Added `unprefixed_class` shortcode attribute to allow for unprefixed shortcodes. -* Updated prefixes to now return just the prefix without the dash (-). - -### 0.9.4 ### -* Switched default   being output. Now the default "space" attribute is false, and can be set to true to optionally include a space. -* PLEASE NOTE: this will affect existing shortcodes. - -### 0.9.3 ### -* Fixed admin-styles.css bug that was applying FontAwesome font-face outside TinyMCE -* Print JS variables in front-end to aid developers -* Create global $better_font_awesome object for developers to access - -### 0.9.2 ### -* Fixes issue of missing icon drop-down select menu in TinyMCE (adds compatibility for TinyMCE v4) - -### 0.9.1 ### -* Added fixes for older versions of PHP (Titan Framework not found, unexpected "[") - -### 0.9.0 ### -* First release! - - ## Upgrade Notice ## +### 2.0.0 ### +* Add support for Font Awesome v5 +* Integration with Font Awesome GraphQL API for all data fetching (improve performance) +* Integrate with Font Awesome CDN for all CSS +* Add option to include the v4 Font Awesome CSS shim to support older icons (default on for upgrades) +* Updatee hard-coded fallback Font Awesome version +* Modify version check frequency to a saner 24 hour interval +* Ensure admin notices are dismissible +* Lower data fetch timeout to mitigate performance risks +* Remove legacy options that are no longer relevant (version select, minification opt-out) +* Add more/better unit tests to ensure things are working as expected + ### 1.7.6 ### * Fix: revert to 1.7.4 codebase. * Fix: remove calls to `ready()` jQuery method to support latest jQuery versions. @@ -282,120 +188,3 @@ Better Font Awesome does it's best to load after any existing Font Awesome CSS, ### 1.7.0 ### * Update fallback Font Awesome to v4.7.0. * Switch from using git submodules to composer dependency management for core library inclusion. - -### 1.6.0 ### -* Update fallback Font Awesome to v4.6.3. - -### 1.5.0 ### -* Update fallback Font Awesome to v4.5.0. -* Add new `bfa_icon_tag` to allow for filtering default `` tag. - -### 1.4.3 ### -* Fix: refactor JS to allow icon shortcode insertion button to work in all instances (ACF Flexible and Repeater fields, divi, Black Studio TinyMCE ). - -### 1.4.2 ### -* Fix: icon picker not working for ACF Pro repeater field. - -### 1.4.1 ### -* Fix: icon picker not working for ACF repeater field. - -### 1.4.0 ### -* Fix: icon picker not working for Black Studio TinyMCE Widget. (props @EJOweb and @marcochiesi) -* Update fallback Font Awesome to version 4.4.0. - -### 1.3.4 ### -* Update Better Font Awesome Library to version 1.3.4. -* Fix double shortcode insert issue. -* Fix behavior in which clicking shortcode insert button scrolls to top of page. - -### 1.3.3 ### -* Update plugin and BFAL to all fire on `init` hook instead of mix of `plugins_loaded` and `after_theme_setup`. This should fix issues in which icons don't show up when BFAL is used in other plugins. -* Update iconpicker JS to avoid conflict that arose from preventing subsequent `mouseup` event listeners from firing. -* Change appearance of iconpicker button to match default buttons. - -### 1.3.2 ### -* Update Better Font Awesome Library with better prefix removal method. - -### 1.3.1 ### -* Update admin JS to trigger icon picker on ALL TinyMCE initializations (e.g. Visual Composer and AJAX) - -### 1.3.0 ### -* Replace outdated TinyMCE shortcode selector brand new jQuery dropdown selector that works in both the visual and text editor -* Clean up CSS and JS - -### 1.2.1 ### -* Update get_instance() call to work for older versions of PHP (< 5.3) - -### 1.2.0 ### -* Attach load functionality to after_theme_setup hook to allow themes to filter options -* Update fallback Font Awesome to version 4.3.0 - -### 1.1.0 ### -* Implement Ajax to save plugin settings (thanks [Braad](https://profiles.wordpress.org/braad)) - -### 1.0.10 ### -* Fix SSL bug breaking wp_remote_get() from https - -### 1.0.9 ### -* Fix debuggin hook set to init instead of plugins_loaded. - -### 1.0.8 ### -* Add admin setting to hide admin notices for API and CDN connectivity warnings. -* Update translations. - -### 1.0.7 ### -* Update included fallback to Font Awesome version 4.3. - -### 1.0.6 ### -* Unhook library load() function from plugins_loaded and run directly from constructor (fixes bug preventing developers from overriding initialization easily). - -### 1.0.5 ### -* Add fa_force_fallback and bfa_show_errors filters. -* Add hex icon values as $icon array indexes. - -### 1.0.4 ### -* Add missing isset() check that was causing intermittent warning. - -### 1.0.3 ### -* Add French translation. -* Correct text domain slug. - -### 1.0.2 ### -* Add updated .pot file. -* Further improve error handling and fallback. - -### 1.0.1 ### -* Fix error handling for 404 API requests. - -### 1.0.0 ### -* Fully refactor the back-end. -* Switch to just using the jsDelivr CDN. -* Implement transients to minimize load time. -* Implement improved fallback handling (transient → wp_remote_get() → locally included files) -* Switch out bulky Titan Framework for native Settings API. - -### 0.9.6 ### -* Fixed missing icon previews in WordPress 3.8 and below. - -### 0.9.5 ### -* Added ability to choose which CDN to use. -* Added `unprefixed_class` shortcode attribute to allow for unprefixed shortcodes. -* Updated prefixes to now return just the prefix without the dash (-). - -### 0.9.4 ### -* Switched default   being output. Now the default "space" attribute is false, and can be set to true to optionally include a space. -* PLEASE NOTE: this will affect existing shortcodes. - -### 0.9.3 ### -* Fixed admin-styles.css bug that was applying FontAwesome font-face outside TinyMCE -* Print JS variables in front-end to aid developers -* Create global $better_font_awesome object for developers to access - -### 0.9.2 ### -* Fixes issue of missing icon drop-down select menu in TinyMCE (adds compatibility for TinyMCE v4) - -### 0.9.1 ### -* Added fixes for older versions of PHP (Titan Framework not found, unexpected "[") - -### 0.9.0 ### -* First release! diff --git a/better-font-awesome.php b/better-font-awesome.php old mode 100644 new mode 100755 index 848eb41..51873ad --- a/better-font-awesome.php +++ b/better-font-awesome.php @@ -12,7 +12,7 @@ * Plugin Name: Better Font Awesome * Plugin URI: http://wordpress.org/plugins/better-font-awesome * Description: The ultimate Font Awesome icon plugin for WordPress. - * Version: 1.7.6 + * Version: 2.0.0 * Author: Mickey Kay * Author URI: mickeyskay@gmail.com * License: GPLv2+ @@ -32,8 +32,8 @@ * @since 0.9.5 */ function bfa_start() { - global $better_font_awesome; - $better_font_awesome = Better_Font_Awesome_Plugin::get_instance(); + global $better_font_awesome; + $better_font_awesome = Better_Font_Awesome_Plugin::get_instance(); } /** @@ -43,675 +43,539 @@ function bfa_start() { */ class Better_Font_Awesome_Plugin { - /** - * Plugin slug. - * - * @since 0.9.0 - * - * @var string - */ - const SLUG = 'better-font-awesome'; - - /** - * The Better Font Awesome Library object. - * - * @since 0.1.0 - * - * @var Better_Font_Awesome_Library - */ - private $bfa_lib; - - /** - * Path to the Better Font Awesome Library main file. - * - * @since 0.1.0 - * - * @var Better_Font_Awesome_Library - */ - private $bfa_lib_file_path; - - /** - * Plugin display name. - * - * @since 0.9.0 - * - * @var string - */ - private $plugin_display_name; - - /** - * Plugin option name. - * - * @since 0.9.0 - * - * @var string - */ - protected $option_name; - - /** - * Plugin options. - * - * @since 0.9.0 - * - * @var string - */ - protected $options; - - /** - * Default options. - * - * Used for setting uninitialized plugin options. - * - * @since 0.9.0 - * - * @var array - */ - protected $option_defaults = array( - 'version' => 'latest', - 'minified' => 1, - 'remove_existing_fa' => '', - 'hide_admin_notices' => '', - ); - - /** - * Instance of this class. - * - * @since 0.9.0 - * - * @var Better_Font_Awesome_Plugin - */ - protected static $instance = null; - - - /** - * Returns the instance of this class, and initializes the instance if it - * doesn't already exist. - * - * @return Better_Font_Awesome The BFA object. - */ - public static function get_instance( $args = array() ) { - - // If the single instance hasn't been set, set it now. - if ( null == self::$instance ) { - self::$instance = new self( $args ); - } - - return self::$instance; - - } - - /** - * Better Font Awesome Plugin constructor. - * - * @since 0.9.0 - */ - function __construct() { - - // Perform plugin initialization actions. - $this->initialize(); - - // Stop if the Better Font Awesome Library isn't included. - if ( ! $this->bfal_exists() ) { - add_action( 'admin_init', array( $this, 'deactivate' ) ); - return false; - } - - // Include required files. - $this->includes(); - - // Initialize the Better Font Awesome Library. - $this->initialize_better_font_awesome_library( $this->options ); - - // Load the plugin text domain. - $this->load_text_domain(); - - // Output admin notices. - add_action( 'admin_notices', array( $this, 'do_admin_notices' ) ); - - // Set up the admin settings page. - add_action( 'admin_menu', array( $this, 'add_settings_page' ) ); - add_action( 'admin_init', array( $this, 'add_settings' ) ); - add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts' ) ); - - // Handle saving options via AJAX - add_action( 'wp_ajax_bfa_save_options', array( $this, 'save_options' ) ); - add_action( 'wp_ajax_bfa_dismiss_testing_admin_notice', array( $this, 'dismiss_testing_admin_notice' ) ); - - } - - /** - * Do necessary initialization actions. - * - * @since 0.10.0 - */ - private function initialize() { - - // Set display name. - $this->plugin_display_name = __( 'Better Font Awesome', 'better-font-awesome' ); - - // Set options name. - $this->option_name = self::SLUG . '_options'; - - // Set up main Better Font Awesome Library file path. - $this->bfa_lib_file_path = plugin_dir_path( __FILE__ ) . 'vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php'; - - // Get plugin options, and populate defaults as needed. - $this->initialize_options( $this->option_name ); - - } - - /** - * Get class prop. - * - * @since 1.7.0 - * - * @param string $prop Prop to fetch. - * - * @return mixed Value of the prop. - */ - public function get( $prop ) { - return $this->$prop; - } - - /** - * Check if the Better Font Awesome Library is included. - * - * @since 0.10.0 - */ - public function bfal_exists() { - - if ( ! is_readable( $this->bfa_lib_file_path ) ) { - return false; - } else { - return true; - } - - } - - /** - * Deactivate and display an error if the BFAL isn't included. - * - * @since 0.10.0 - */ - public function deactivate() { - - deactivate_plugins( plugin_basename( __FILE__ ) ); - - $message = '

' . __( 'Better Font Awesome', 'better-font-awesome' ) . '

'; - $message .= '

' . __( 'It appears that Better Font Awesome is missing it\'s core library, which typically occurs when cloning the Git repository and failing to run composer install. Please refer to the plugin\'s installation instructions for details on how to properly install Better Font Awesome via Git. If you installed from within WordPress, or via the wordpress.org repo, then chances are the install failed and you can try again. If the issue persists, please create a new topic on the plugin\'s support forum or file an issue on the Github repo.' , 'better-font-awesome' ) . '

'; - $message .= '

' . __( 'Back to the plugins page →', 'better-font-awesome' ) . '

'; - - wp_die( $message ); - - } - - /** - * Include required files. - * - * @since 0.10.0 - */ - private function includes() { - - // Better Font Awesome Library. - require_once $this->bfa_lib_file_path; - - } - - /** - * Get plugin options, or initialize with default values. - * - * @since 0.10.0 - * - * @return array Plugin options. - */ - private function initialize_options( $option_name ) { - - /** - * Get plugin options. - * - * Run maybe_unserialize() in case we're updating from the old - * serialized Titan Framwork option to a new, array-based options. - */ - $this->options = maybe_unserialize( get_option( $option_name ) ); - - // Initialize the plugin options with defaults if they're not set. - if ( empty( $this->options ) ) { - update_option( $option_name, $this->option_defaults ); - } - - } - - /** - * Initialize the Better Font Awesome Library object. - * - * @since 0.9.0 - * - * @param array $options Plugin options. - */ - private function initialize_better_font_awesome_library( $options ) { - - // Hide admin notices if setting is checked. - if ( true == $options['hide_admin_notices'] ) { - add_filter( 'bfa_show_errors', '__return_false' ); - } - - // Initialize BFA library. - $args = array( - 'version' => isset( $options['version'] ) ? $options['version'] : $this->option_defaults['version'], - 'minified' => isset( $options['minified'] ) ? $options['minified'] : '', - 'remove_existing_fa' => isset( $options['remove_existing_fa'] ) ? $options['remove_existing_fa'] :'', - 'load_styles' => true, - 'load_admin_styles' => true, - 'load_shortcode' => true, - 'load_tinymce_plugin' => true, - ); - - $this->bfa_lib = Better_Font_Awesome_Library::get_instance( $args ); - - } - - /** - * Load plugin text domain. - * - * @since 0.10.0 - */ - function load_text_domain() { - load_plugin_textdomain( self::SLUG, false, dirname( plugin_basename( __FILE__ ) ) . '/languages' ); - } - - /** - * Generate admin notices. - * - * @since 1.7.3 + /** + * Plugin slug. + * + * @since 0.9.0 + * + * @var string + */ + const SLUG = 'better-font-awesome'; + + /** + * Plugin version. + * + * @since 2.0.0 + * + * @var string + */ + const VERSION = '2.0.0'; + + /** + * The Better Font Awesome Library object. + * + * @since 0.1.0 + * + * @var Better_Font_Awesome_Library + */ + private $bfa_lib; + + /** + * Path to the Better Font Awesome Library main file. + * + * @since 0.1.0 + * + * @var Better_Font_Awesome_Library + */ + private $bfa_lib_file_path; + + /** + * Plugin display name. + * + * @since 0.9.0 + * + * @var string */ - public function do_admin_notices() { + private $plugin_display_name; - $user_dismissed_option_data = $this->get_dismissed_admin_notice_testing_data(); + /** + * Plugin option name. + * + * @since 0.9.0 + * + * @var string + */ + protected $option_name; + + /** + * Plugin options. + * + * @since 0.9.0 + * + * @var string + */ + protected $options; - if ( - !isset( $user_dismissed_option_data->{get_current_user_id()} ) || - true !== $user_dismissed_option_data->{get_current_user_id()} - ) : + /** + * Default options. + * + * Used for setting uninitialized plugin options. + * + * @since 0.9.0 + * + * @var array + */ + protected $option_defaults = array( + 'include_v4_shim' => '', + 'remove_existing_fa' => '', + 'hide_admin_notices' => '', + ); + + /** + * Instance of this class. + * + * @since 0.9.0 + * + * @var Better_Font_Awesome_Plugin + */ + protected static $instance = null; + + + /** + * Returns the instance of this class, and initializes the instance if it + * doesn't already exist. + * + * @param array $args Args to instantiate BFA object. + * + * @return Better_Font_Awesome The BFA object. + */ + public static function get_instance( $args = array() ) { + + // If the single instance hasn't been set, set it now. + // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison + if ( null == self::$instance ) { + self::$instance = new self( $args ); + } + + return self::$instance; + } + + /** + * Better Font Awesome Plugin constructor. + * + * @since 0.9.0 + */ + protected function __construct() { + + // Perform plugin initialization actions. + $this->initialize(); + + // Stop if the Better Font Awesome Library isn't included. + if ( ! $this->bfal_exists() ) { + add_action( 'admin_init', array( $this, 'deactivate' ) ); + return false; + } + + // Include required files. + $this->includes(); + + // Initialize the Better Font Awesome Library. + $this->initialize_better_font_awesome_library( $this->options ); + + // Load the plugin text domain. + $this->load_text_domain(); + + // Set up the admin settings page. + add_action( 'admin_menu', array( $this, 'add_settings_page' ) ); + add_action( 'admin_init', array( $this, 'add_settings' ) ); + add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts' ) ); + + // Handle saving options via AJAX. + add_action( 'wp_ajax_bfa_save_options', array( $this, 'save_options' ) ); + } + + /** + * Do necessary initialization actions. + * + * @since 0.10.0 + */ + private function initialize() { + + // Set display name. + $this->plugin_display_name = __( 'Better Font Awesome', 'better-font-awesome' ); + + // Set options name. + $this->option_name = self::SLUG . '_options'; + + // Set up main Better Font Awesome Library file path. + $this->bfa_lib_file_path = plugin_dir_path( __FILE__ ) . 'vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php'; + + // Get plugin options, and populate defaults as needed. + $this->initialize_options( $this->option_name ); + } + + /** + * Get class prop. + * + * @since 1.7.0 + * + * @param string $prop Prop to fetch. + * + * @return mixed Value of the prop. + */ + public function get( $prop ) { + return $this->$prop; + } + + /** + * Check if the Better Font Awesome Library is included. + * + * @since 0.10.0 + */ + public function bfal_exists() { + if ( ! is_readable( $this->bfa_lib_file_path ) ) { + return false; + } else { + return true; + } + } + + /** + * Get BFAL instance. + * + * @since 2.0.0 + * + * @return Object BFAL instance. + */ + public function get_bfa_lib_instance() { + return $this->bfa_lib; + } + + /** + * Deactivate and display an error if the BFAL isn't included. + * + * @since 0.10.0 + */ + public function deactivate() { + deactivate_plugins( plugin_basename( __FILE__ ) ); + + $message = '

' . __( 'Better Font Awesome', 'better-font-awesome' ) . '

'; + $message .= '

' . __( 'It appears that Better Font Awesome is missing it\'s core library, which typically occurs when cloning the Git repository and failing to run composer install. Please refer to the plugin\'s installation instructions for details on how to properly install Better Font Awesome via Git. If you installed from within WordPress, or via the wordpress.org repo, then chances are the install failed and you can try again. If the issue persists, please create a new topic on the plugin\'s support forum or file an issue on the Github repo.', 'better-font-awesome' ) . '

'; + $message .= '

' . __( 'Back to the plugins page →', 'better-font-awesome' ) . '

'; + + wp_die( wp_kses_post( $message ) ); + } + + /** + * Include required files. + * + * @since 0.10.0 + */ + private function includes() { + + // Better Font Awesome Library. + require_once $this->bfa_lib_file_path; + } + + /** + * Get plugin options, or initialize with default values. + * + * @since 0.10.0 + * + * @param string $option_name Name/slug for the plugin options object. + */ + private function initialize_options( $option_name ) { + /** + * Get plugin options. + * + * Run maybe_unserialize() in case we're updating from the old + * serialized Titan Framwork option to a new, array-based options. + */ + $this->options = maybe_unserialize( get_option( $option_name ) ); + + // Initialize the plugin options with defaults if they're not set. + if ( empty( $this->options ) ) { + update_option( $option_name, $this->option_defaults ); + } + + /** + * Set v4 shim option to true if this is the first time the + * option is present, indicating an update from legacy v4 + * support and will need shim support. + */ + if ( ! empty( $this->options ) && ! isset( $this->options['include_v4_shim'] ) ) { + $this->options['include_v4_shim'] = 1; + update_option( $option_name, $this->options ); + } + } + + /** + * Initialize the Better Font Awesome Library object. + * + * @since 0.9.0 + * + * @param array $options Plugin options. + */ + private function initialize_better_font_awesome_library( $options ) { + + // Hide admin notices if setting is checked. + // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison + if ( $options && true == $options['hide_admin_notices'] ) { + add_filter( 'bfa_show_errors', '__return_false' ); + } + + // Initialize BFA library. + $args = array( + 'include_v4_shim' => isset( $options['include_v4_shim'] ) ? $options['include_v4_shim'] : '', + 'remove_existing_fa' => isset( $options['remove_existing_fa'] ) ? $options['remove_existing_fa'] : '', + 'load_styles' => true, + 'load_admin_styles' => true, + 'load_shortcode' => true, + 'load_tinymce_plugin' => true, + ); + + $this->bfa_lib = Better_Font_Awesome_Library::get_instance( $args ); + } + + /** + * Load plugin text domain. + * + * @since 0.10.0 + */ + public function load_text_domain() { + load_plugin_textdomain( self::SLUG, false, dirname( plugin_basename( __FILE__ ) ) . '/languages' ); + } + + /** + * Create the plugin settings page. + */ + public function add_settings_page() { + add_options_page( + $this->plugin_display_name, + $this->plugin_display_name, + 'manage_options', + self::SLUG, + array( $this, 'create_admin_page' ) + ); + } + + /** + * Output the plugin settings page contents. + * + * @since 0.10.0 + */ + public function create_admin_page() { + ?> +
+

plugin_display_name ); ?>

+
+ -
-

-

almost ready for use! The new version adds a few major improvements, most notably support for Font Awesome 5 icons. Before publishing the update, it's important that we get plenty of user testing to validate that everything is working as expected, and we could really use your help.", 'better-font-awesome' ), '', '' ); ?>

-

', '' ); ?> .

-
+

+ +

+
+
+
option_name, // Option name. + array( $this, 'sanitize' ) // Sanitize. + ); + + add_settings_section( + 'settings_section_primary', // ID. + null, // Title. + null, // Callback. + self::SLUG // Page. + ); + + add_settings_field( + 'version', // ID. + __( 'Font Awesome version', 'better-font-awesome' ), // Title. + array( $this, 'version_callback' ), // Callback. + self::SLUG, // Page. + 'settings_section_primary' // Section. + ); + + add_settings_field( + 'version_check_frequency', // ID. + __( 'Version check frequency', 'better-font-awesome' ), // Title. + array( $this, 'version_check_frequency_callback' ), // Callback. + self::SLUG, // Page. + 'settings_section_primary' // Section. + ); + + add_settings_field( + 'include_v4_shim', + __( 'Include v4 CSS shim', 'better-font-awesome' ), + array( $this, 'checkbox_callback' ), + self::SLUG, + 'settings_section_primary', + array( + 'id' => 'include_v4_shim', + 'description' => __( 'Include the Font Awesome v4 CSS shim to support legacy icons (more details).', 'better-font-awesome' ), + ) + ); + + add_settings_field( + 'remove_existing_fa', + __( 'Remove existing Font Awesome', 'better-font-awesome' ), + array( $this, 'checkbox_callback' ), + self::SLUG, + 'settings_section_primary', + array( + 'id' => 'remove_existing_fa', + 'description' => __( 'Attempt to remove Font Awesome CSS and shortcodes added by other plugins and themes.', 'better-font-awesome' ), + ) + ); + + add_settings_field( + 'hide_admin_notices', + __( 'Hide admin notices', 'better-font-awesome' ), + array( $this, 'checkbox_callback' ), + self::SLUG, + 'settings_section_primary', + array( + 'id' => 'hide_admin_notices', + 'description' => __( 'Hide the default admin warnings that are shown when API and CDN errors occur.', 'better-font-awesome' ), + ) + ); } /** - * Dismiss testing admin notice. + * Enqueue admin scripts and styles. + * + * @since 1.0.10 * - * @since 1.7.3 + * @param string $hook Current admin page hook. */ - public function dismiss_testing_admin_notice() { - $dismissed_option_key = self::SLUG . '-dismissed-notice-testing'; - $dismissed_option_data = $this->get_dismissed_admin_notice_testing_data(); - $updated_option_data = $dismissed_option_data; - $updated_option_data->{get_current_user_id()} = true; + public function admin_enqueue_scripts( $hook ) { + if ( 'settings_page_better-font-awesome' === $hook ) { + // phpcs:ignore WordPress.WP.EnqueuedResourceParameters.MissingVersion + wp_enqueue_style( + self::SLUG . '-admin', + plugin_dir_url( __FILE__ ) . 'css/admin.css', + array(), + self::VERSION + ); + + // phpcs:ignore WordPress.WP.EnqueuedResourceParameters.MissingVersion, WordPress.WP.EnqueuedResourceParameters.NotInFooter + wp_enqueue_script( + self::SLUG . '-admin', + plugin_dir_url( __FILE__ ) . 'js/admin.js', + array( 'jquery' ), + self::VERSION + ); + + // phpcs:ignore WordPress.WP.EnqueuedResourceParameters.NotInFooter + wp_localize_script( + self::SLUG . '-admin', + 'bfa_ajax_object', + array( + 'ajax_url' => admin_url( 'admin-ajax.php' ), + ) + ); + } + } + + /** + * Save options via AJAX. + * + * @since 1.0.10 + */ + public function save_options() { + $options = array( + 'include_v4_shim' => isset( $_POST['include_v4_shim'] ) && $_POST['include_v4_shim'], + 'remove_existing_fa' => isset( $_POST['remove_existing_fa'] ) && $_POST['remove_existing_fa'], + 'hide_admin_notices' => isset( $_POST['hide_admin_notices'] ) && $_POST['hide_admin_notices'], + ); + + // Sanitize and update the options. + update_option( $this->option_name, $options ); - update_option( $dismissed_option_key, $updated_option_data ); + // Return a message. + echo '

' . esc_html__( 'Settings saved.', 'better-font-awesome' ) . '

'; wp_die(); } - /** - * Create the plugin settings page. - */ - function add_settings_page() { - - add_options_page( - $this->plugin_display_name, - $this->plugin_display_name, - 'manage_options', - self::SLUG, - array( $this, 'create_admin_page' ) - ); - - } - - /** - * Output the plugin settings page contents. - * - * @since 0.10.0 - */ - public function create_admin_page() { - ?> -
- -

plugin_display_name; ?>

-
- -

- -

-
- get_usage_text(); ?> -
-
- option_name, // Option name - array( $this, 'sanitize' ) // Sanitize - ); - - add_settings_section( - 'settings_section_primary', // ID - null, // Title - null, // Callback - self::SLUG // Page - ); - - add_settings_field( - 'version', // ID - __( 'Version', 'better-font-awesome' ), // Title - array( $this, 'version_callback' ), // Callback - self::SLUG, // Page - 'settings_section_primary', // Section - $this->get_versions_list() // Args - ); - - add_settings_field( - 'minified', - __( 'Use minified CSS', 'better-font-awesome' ), - array( $this, 'checkbox_callback' ), - self::SLUG, - 'settings_section_primary', - array( - 'id' => 'minified', - 'description' => __( 'Whether to include the minified version of the CSS (checked), or the unminified version (unchecked).', 'better-font-awesome' ), - ) - ); - - add_settings_field( - 'remove_existing_fa', - __( 'Remove existing Font Awesome', 'better-font-awesome' ), - array( $this, 'checkbox_callback' ), - self::SLUG, - 'settings_section_primary', - array( - 'id' => 'remove_existing_fa', - 'description' => __( 'Attempt to remove Font Awesome CSS and shortcodes added by other plugins and themes.', 'better-font-awesome' ), - ) - ); - - add_settings_field( - 'hide_admin_notices', - __( 'Hide admin notices', 'better-font-awesome' ), - array( $this, 'checkbox_callback' ), - self::SLUG, - 'settings_section_primary', - array( - 'id' => 'hide_admin_notices', - 'description' => __( 'Hide the default admin warnings that are shown when API and CDN errors occur.', 'better-font-awesome' ), - ) - ); - - } - - /** - * Enqueue admin scripts and styles. - * - * @since 1.0.10 - */ - public function admin_enqueue_scripts( $hook ) { - - // Settings-specific functionality. - if ( 'settings_page_better-font-awesome' === $hook ) { - - wp_enqueue_style( - self::SLUG . '-admin', - plugin_dir_url( __FILE__ ) . 'css/admin.css' - ); - - wp_enqueue_script( - self::SLUG . '-admin', - plugin_dir_url( __FILE__ ) . 'js/admin.js', - array( 'jquery' ) - ); - - wp_localize_script( - self::SLUG . '-admin', - 'bfa_ajax_object', - array( - 'ajax_url' => admin_url( 'admin-ajax.php' ) - ) - ); - - } - - // Admin notices. - wp_enqueue_script( - self::SLUG . '-admin-notices', - plugin_dir_url( __FILE__ ) . 'js/admin-notices.js', - array( 'jquery' ) - ); - } - - /** - * Save options via AJAX. - * - * @since 1.0.10 - */ - public function save_options() { - - $options = array( - 'version' => $_POST['version'], - 'minified' => $_POST['minified'], - 'remove_existing_fa' => $_POST['remove_existing_fa'], - 'hide_admin_notices' => $_POST['hide_admin_notices'], - ); - - // Sanitize and update the options. - update_option( $this->option_name, $options ); - - // Return a message. - echo '

' . esc_html( 'Settings saved.', 'better-font-awesome' ) . '

'; - - wp_die(); - - } - - /** - * Get all Font Awesome versions available from the jsDelivr API. - * - * @since 0.10.0 - * - * @return array All available versions and the latest version, or an - * empty array if the API fetch fails. - */ - function get_versions_list() { - - if ( $this->bfa_lib->get_api_value('versions') ) { - $versions['latest'] = __( 'Always Latest', 'better-font-awesome' ); - - foreach ( $this->bfa_lib->get_api_value('versions') as $version ) { - $versions[ $version ] = $version; - } - - } else { - $versions = array(); - } - - return $versions; - - } - - /** - * Output a element. - printf( ''; - - } else { - ?> -

- ' . $this->bfa_lib->get_error('api')->get_error_code() . ': ' . $this->bfa_lib->get_error('api')->get_error_message() . '' - ); - ?> -

-

- ' . $this->bfa_lib->get_fallback_version() . '' - ); - ?> -

-

- ', - '' - ); - ?> -

- option_name ) . '[' . $args['id'] . ']'; - $option_value = isset( $this->options[ $args['id'] ] ) ? $this->options[ $args['id'] ] : ''; - printf( - '', - $args['id'], - $args['id'], - $option_name, - checked( 1, $option_value, false ), - $args['description'] - ); - } - - /** - * Output a text setting. - * - * @since 0.10.0 - */ - public function text_callback( $args ) { - echo '
' . $args['text'] . '
'; - } - - /** - * Generate the admin instructions/usage text. - * - * @since 0.10.0 - * - * @return string Usage text. - */ - public function get_usage_text() { - return '
' . - __( '

Usage

- Font Awesome version 4.x +   See all available options »

- [icon name="coffee"] or <i class="fa-coffee"></i>

- [icon name="coffee" class="fa-2x"] or <i class="fa-coffee fa-2x"></i>

- [icon name="coffee" class="fa-2x fa-rotate-90"] or <i class="fa-coffee fa-2x fa-rotate-90"></i>


- Font Awesome version 3.x   See all available options »

- [icon name="coffee"] or <i class="icon icon-coffee"></i>

- [icon name="coffee" class="icon-2x"] or <i class="icon icon-coffee icon-2x"></i>

- [icon name="coffee" class="icon-2x icon-rotate-90"] or <i class="icon icon-coffee icon-2x icon-rotate-90"></i>', - 'better-font-awesome' ) . - '
'; - } - - /** - * Sanitize each settings field as needed. - * - * @param array $input Contains all settings fields as array keys. - */ - public function sanitize( $input ) { - - $new_input = array(); - - // Sanitize options to match their type - if ( isset( $input['version'] ) ) { - $new_input['version'] = sanitize_text_field( $input['version'] ); - } - - if ( isset( $input['minified'] ) ) { - $new_input['minified'] = absint( $input['minified'] ); - } - - if ( isset( $input['remove_existing_fa'] ) ) { - $new_input['remove_existing_fa'] = absint( $input['remove_existing_fa'] ); - } - - if ( isset( $input['hide_admin_notices'] ) ) { - $new_input['hide_admin_notices'] = absint( $input['hide_admin_notices'] ); - } - - return $new_input; - - } + /** + * Output version information. + * + * @since 0.10.0 + */ + public function version_callback() { + echo wp_kses_post( "{$this->bfa_lib->get_version()}" ); + } + + /** + * Version update interval callback. + * + * @since 2.0.0 + */ + public function version_check_frequency_callback() { + $current_time = time(); + $expiration_time = time() + $this->bfa_lib->get_transient_expiration() - 1; // -1 to improve readability (e.g. "24 hours" instead of "1 days") + $human_readable_expiration = human_time_diff( $current_time, $expiration_time ); + /* translators: placeholder is the numeric current version number. */ + echo wp_kses_post( sprintf( __( '%s (The plugin automatically uses the latest version of Font Awesome, and checks for updates at this frequency)', 'better-font-awesome' ), "{$human_readable_expiration}" ) ); + } + + /** + * Output a checkbox setting. + * + * @since 0.10.0 + * + * @param array $args Args to callback. + */ + public function checkbox_callback( $args ) { + $option_name = esc_attr( $this->option_name ) . '[' . $args['id'] . ']'; + $option_value = isset( $this->options[ $args['id'] ] ) ? $this->options[ $args['id'] ] : ''; + printf( + '', + esc_attr( $args['id'] ), + esc_attr( $args['id'] ), + esc_attr( $option_name ), + esc_attr( checked( 1, $option_value, false ) ), + wp_kses_post( $args['description'] ) + ); + } + + /** + * Output a text setting. + * + * @since 0.10.0 + * + * @param array $args Args to callback. + */ + public function text_callback( $args ) { + echo '
' . esc_html( $args['text'] ) . '
'; + } + + /** + * Sanitize each settings field as needed. + * + * @param array $input Contains all settings fields as array keys. + */ + public function sanitize( $input ) { + $new_input = array(); + + if ( isset( $input['include_v4_shim'] ) ) { + $new_input['include_v4_shim'] = absint( $input['include_v4_shim'] ); + } + + if ( isset( $input['remove_existing_fa'] ) ) { + $new_input['remove_existing_fa'] = absint( $input['remove_existing_fa'] ); + } + + if ( isset( $input['hide_admin_notices'] ) ) { + $new_input['hide_admin_notices'] = absint( $input['hide_admin_notices'] ); + } + + return $new_input; + } } diff --git a/bin/install-wp-tests.sh b/bin/install-wp-tests.sh index 16bfee7..c8e8b91 100644 --- a/bin/install-wp-tests.sh +++ b/bin/install-wp-tests.sh @@ -54,11 +54,7 @@ fi set -ex install_wp() { - - if [ -d $WP_CORE_DIR ]; then - return; - fi - + rm -rf $WP_CORE_DIR mkdir -p $WP_CORE_DIR if [[ $WP_VERSION == 'nightly' || $WP_VERSION == 'trunk' ]]; then @@ -102,13 +98,11 @@ install_test_suite() { local ioption='-i' fi - # set up testing suite if it doesn't yet exist - if [ ! -d $WP_TESTS_DIR ]; then - # set up testing suite - mkdir -p $WP_TESTS_DIR - svn export --quiet --ignore-externals https://develop.svn.wordpress.org/${WP_TESTS_TAG}/tests/phpunit/includes/ $WP_TESTS_DIR/includes - svn export --quiet --ignore-externals https://develop.svn.wordpress.org/${WP_TESTS_TAG}/tests/phpunit/data/ $WP_TESTS_DIR/data - fi + # set up testing suite + rm -rf $WP_TESTS_DIR + mkdir -p $WP_TESTS_DIR + svn export --quiet --ignore-externals https://develop.svn.wordpress.org/${WP_TESTS_TAG}/tests/phpunit/includes/ $WP_TESTS_DIR/includes + svn export --quiet --ignore-externals https://develop.svn.wordpress.org/${WP_TESTS_TAG}/tests/phpunit/data/ $WP_TESTS_DIR/data if [ ! -f wp-tests-config.php ]; then download https://develop.svn.wordpress.org/${WP_TESTS_TAG}/wp-tests-config-sample.php "$WP_TESTS_DIR"/wp-tests-config.php diff --git a/composer.json b/composer.json index 9906644..7a1acdd 100644 --- a/composer.json +++ b/composer.json @@ -1,15 +1,16 @@ { - "name": "mickey-kay/better-font-awesome", - "description": "Better Font Awesome", - "license": "GPL-2.0", - "require": { - "mickey-kay/better-font-awesome-library": "1.4.7" - }, - "require-dev": { - "phpunit/phpunit": "^5|^7", - "phpcompatibility/phpcompatibility-wp": "^2.1", - "phpcompatibility/phpcompatibility-paragonie": "^1.3", - "phpcompatibility/php-compatibility": "^9.3", - "wp-coding-standards/wpcs": "^2.3" - } + "name": "mickey-kay/better-font-awesome", + "description": "Better Font Awesome", + "license": "GPL-2.0", + "require": { + "mickey-kay/better-font-awesome-library": "2.0.0" + }, + "require-dev": { + "phpunit/phpunit": "^5|^7", + "phpcompatibility/phpcompatibility-wp": "^2.1", + "phpcompatibility/phpcompatibility-paragonie": "^1.3", + "phpcompatibility/php-compatibility": "^9.3", + "squizlabs/php_codesniffer": "^3.5", + "wp-coding-standards/wpcs": "^2.3" + } } diff --git a/composer.lock b/composer.lock index 287f5af..dc2f5b8 100644 --- a/composer.lock +++ b/composer.lock @@ -4,82 +4,29 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e64e3360b7507bc36c90efa0453919bd", + "content-hash": "4a29c3440a1b3d9d9276002f5c104b7b", "packages": [ { "name": "mickey-kay/better-font-awesome-library", - "version": "1.4.7", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/MickeyKay/better-font-awesome-library.git", - "reference": "ca83437bab1f7af249f8f18bb95267673e46df36" + "reference": "7c259fc1ccd592bcdae01ec7322a5f970ab7e8c8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/MickeyKay/better-font-awesome-library/zipball/ca83437bab1f7af249f8f18bb95267673e46df36", - "reference": "ca83437bab1f7af249f8f18bb95267673e46df36", + "url": "https://api.github.com/repos/MickeyKay/better-font-awesome-library/zipball/7c259fc1ccd592bcdae01ec7322a5f970ab7e8c8", + "reference": "7c259fc1ccd592bcdae01ec7322a5f970ab7e8c8", "shasum": "" }, - "require": { - "mustangostang/spyc": "^0.6.2" - }, "type": "library", "notification-url": "https://packagist.org/downloads/", "license": [ - "GPL-2.0" - ], - "description": "Better Font Awesome Library for PHP", - "time": "2021-02-08T04:59:58+00:00" - }, - { - "name": "mustangostang/spyc", - "version": "0.6.3", - "source": { - "type": "git", - "url": "git@github.com:mustangostang/spyc.git", - "reference": "4627c838b16550b666d15aeae1e5289dd5b77da0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/mustangostang/spyc/zipball/4627c838b16550b666d15aeae1e5289dd5b77da0", - "reference": "4627c838b16550b666d15aeae1e5289dd5b77da0", - "shasum": "" - }, - "require": { - "php": ">=5.3.1" - }, - "require-dev": { - "phpunit/phpunit": "4.3.*@dev" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "0.5.x-dev" - } - }, - "autoload": { - "files": [ - "Spyc.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "mustangostang", - "email": "vlad.andersen@gmail.com" - } - ], - "description": "A simple YAML loader/dumper class for PHP", - "homepage": "https://github.com/mustangostang/spyc/", - "keywords": [ - "spyc", - "yaml", - "yml" + "GPL-2.0-or-later" ], - "time": "2019-09-10T13:16:29+00:00" + "description": "Better Font Awesome Library for WordPress", + "time": "2021-03-01T22:17:27+00:00" } ], "packages-dev": [ @@ -364,28 +311,28 @@ }, { "name": "phpcompatibility/phpcompatibility-paragonie", - "version": "1.3.0", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie.git", - "reference": "b862bc32f7e860d0b164b199bd995e690b4b191c" + "reference": "ddabec839cc003651f2ce695c938686d1086cf43" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityParagonie/zipball/b862bc32f7e860d0b164b199bd995e690b4b191c", - "reference": "b862bc32f7e860d0b164b199bd995e690b4b191c", + "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityParagonie/zipball/ddabec839cc003651f2ce695c938686d1086cf43", + "reference": "ddabec839cc003651f2ce695c938686d1086cf43", "shasum": "" }, "require": { "phpcompatibility/php-compatibility": "^9.0" }, "require-dev": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.5", + "dealerdirect/phpcodesniffer-composer-installer": "^0.7", "paragonie/random_compat": "dev-master", "paragonie/sodium_compat": "dev-master" }, "suggest": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.5 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.", + "dealerdirect/phpcodesniffer-composer-installer": "^0.7 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.", "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues." }, "type": "phpcodesniffer-standard", @@ -412,20 +359,20 @@ "polyfill", "standards" ], - "time": "2019-11-04T15:17:54+00:00" + "time": "2021-02-15T10:24:51+00:00" }, { "name": "phpcompatibility/phpcompatibility-wp", - "version": "2.1.0", + "version": "2.1.1", "source": { "type": "git", "url": "https://github.com/PHPCompatibility/PHPCompatibilityWP.git", - "reference": "41bef18ba688af638b7310666db28e1ea9158b2f" + "reference": "b7dc0cd7a8f767ccac5e7637550ea1c50a67b09e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityWP/zipball/41bef18ba688af638b7310666db28e1ea9158b2f", - "reference": "41bef18ba688af638b7310666db28e1ea9158b2f", + "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityWP/zipball/b7dc0cd7a8f767ccac5e7637550ea1c50a67b09e", + "reference": "b7dc0cd7a8f767ccac5e7637550ea1c50a67b09e", "shasum": "" }, "require": { @@ -433,10 +380,10 @@ "phpcompatibility/phpcompatibility-paragonie": "^1.0" }, "require-dev": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.5" + "dealerdirect/phpcodesniffer-composer-installer": "^0.7" }, "suggest": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.5 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.", + "dealerdirect/phpcodesniffer-composer-installer": "^0.7 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.", "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues." }, "type": "phpcodesniffer-standard", @@ -462,7 +409,7 @@ "standards", "wordpress" ], - "time": "2019-08-28T14:22:28+00:00" + "time": "2021-02-15T12:58:46+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -1701,7 +1648,7 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.22.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", diff --git a/js/admin-notices.js b/js/admin-notices.js deleted file mode 100644 index 26df572..0000000 --- a/js/admin-notices.js +++ /dev/null @@ -1,25 +0,0 @@ -/** - * Better Font Awesome admin notice JS - * - * @since 1.7.3 - */ -( function( $ ) { - - 'use strict'; - - $( function() { - - $( '#better-font-awesome-testing-notice' ).on( 'click', '.notice-dismiss', function() { - - var data = { - 'action': 'bfa_dismiss_testing_admin_notice' - }; - - $.post( - ajaxurl, - data, - function (response) {} - ); - }); - }); -})( jQuery ); diff --git a/js/admin.js b/js/admin.js index e1fc112..652fc49 100644 --- a/js/admin.js +++ b/js/admin.js @@ -14,19 +14,17 @@ $( '.bfa-ajax-response-holder' ).empty(); $( '.bfa-loading-gif' ).fadeIn(); - var $bfaSettingsForm, data, version, minified, remove_existing_fa, hide_admin_notices; + var $bfaSettingsForm, data, include_v4_shim, remove_existing_fa, hide_admin_notices; $bfaSettingsForm = $( '#bfa-settings-form' ); - version = $bfaSettingsForm.find( 'select#version' ).val(); - minified = $bfaSettingsForm.find( 'input#minified' ).is( ':checked' ) ? 1 : 0; + include_v4_shim = $bfaSettingsForm.find( 'input#include_v4_shim' ).is( ':checked' ) ? 1 : 0; remove_existing_fa = $bfaSettingsForm.find( 'input#remove_existing_fa' ).is( ':checked' ) ? 1 : 0; hide_admin_notices = $bfaSettingsForm.find( 'input#hide_admin_notices' ).is( ':checked' ) ? 1 : 0; data = { 'action': 'bfa_save_options', - 'version': version, - 'minified': minified, + 'include_v4_shim': include_v4_shim, 'remove_existing_fa': remove_existing_fa, 'hide_admin_notices': hide_admin_notices, }; diff --git a/languages/better-font-awesome.pot b/languages/better-font-awesome.pot index 3957d0a..9f6c7cf 100644 --- a/languages/better-font-awesome.pot +++ b/languages/better-font-awesome.pot @@ -2,10 +2,10 @@ # This file is distributed under the GPLv2+. msgid "" msgstr "" -"Project-Id-Version: Better Font Awesome 1.7.6\n" +"Project-Id-Version: Better Font Awesome 2.0.0\n" "Report-Msgid-Bugs-To: " "https://wordpress.org/support/plugin/better-font-awesome\n" -"POT-Creation-Date: 2021-02-11 16:37:04+00:00\n" +"POT-Creation-Date: 2021-03-01 22:38:16+00:00\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -18,16 +18,22 @@ msgstr "" msgid "Better Font Awesome" msgstr "" -#: better-font-awesome.php:241 svn/tags/1.7.0/better-font-awesome.php:237 +#: better-font-awesome.php:253 svn/tags/1.7.0/better-font-awesome.php:237 #: svn/tags/1.7.1/better-font-awesome.php:237 #: svn/tags/1.7.2/better-font-awesome.php:237 #: svn/tags/1.7.3/better-font-awesome.php:241 +#: svn/tags/1.7.4/better-font-awesome.php:241 #: svn/tags/1.7.5/better-font-awesome.php:238 +#: svn/tags/1.7.6/better-font-awesome.php:244 +#: svn/tags/2.0.0/better-font-awesome.php:253 #: svn/tags/2.0.0-beta/better-font-awesome.php:237 #: svn/tags/2.0.0-beta1/better-font-awesome.php:237 #: svn/tags/2.0.0-beta2/better-font-awesome.php:237 #: svn/tags/2.0.0-beta3/better-font-awesome.php:237 -#: svn/trunk/better-font-awesome.php:238 +#: svn/tags/2.0.0-beta5/better-font-awesome.php:244 +#: svn/tags/2.0.0-beta6/better-font-awesome.php:253 +#: svn/tags/2.0.0-beta7/better-font-awesome.php:253 +#: svn/trunk/better-font-awesome.php:253 msgid "" "It appears that Better Font Awesome is missing it's Github repo." msgstr "" -#: better-font-awesome.php:242 svn/tags/1.0.0/better-font-awesome.php:218 +#: better-font-awesome.php:254 svn/tags/1.0.0/better-font-awesome.php:218 #: svn/tags/1.0.1/better-font-awesome.php:218 #: svn/tags/1.0.10/better-font-awesome.php:219 #: svn/tags/1.0.2/better-font-awesome.php:218 @@ -76,39 +82,22 @@ msgstr "" #: svn/tags/1.7.1/better-font-awesome.php:238 #: svn/tags/1.7.2/better-font-awesome.php:238 #: svn/tags/1.7.3/better-font-awesome.php:242 +#: svn/tags/1.7.4/better-font-awesome.php:242 #: svn/tags/1.7.5/better-font-awesome.php:239 +#: svn/tags/1.7.6/better-font-awesome.php:245 +#: svn/tags/2.0.0/better-font-awesome.php:254 #: svn/tags/2.0.0-beta/better-font-awesome.php:238 #: svn/tags/2.0.0-beta1/better-font-awesome.php:238 #: svn/tags/2.0.0-beta2/better-font-awesome.php:238 #: svn/tags/2.0.0-beta3/better-font-awesome.php:238 -#: svn/trunk/better-font-awesome.php:239 +#: svn/tags/2.0.0-beta5/better-font-awesome.php:245 +#: svn/tags/2.0.0-beta6/better-font-awesome.php:254 +#: svn/tags/2.0.0-beta7/better-font-awesome.php:254 +#: svn/trunk/better-font-awesome.php:254 msgid "Back to the plugins page →" msgstr "" -#: better-font-awesome.php:337 svn/tags/1.7.3/better-font-awesome.php:337 -#: svn/tags/1.7.5/better-font-awesome.php:330 -#: svn/trunk/better-font-awesome.php:330 -msgid "Better Font Awesome - We need your help!" -msgstr "" - -#: better-font-awesome.php:338 svn/tags/1.7.3/better-font-awesome.php:338 -msgid "" -"First of all, thanks so much for using the plugin! Second of all, %sBetter " -"Font Awesome 2.0%s is almost ready for use! The new version adds a " -"few major improvements, most notably support for Font Awesome 5 icons. " -"Before publishing the update, it's important that we get plenty of user " -"testing to validate that everything is working as expected, and we could " -"really use your help." -msgstr "" - -#: better-font-awesome.php:339 svn/tags/1.7.3/better-font-awesome.php:339 -msgid "" -"If you are interested in helping us test the new update, please read the " -"official %sblog post%s, which includes simple instructions for how to get " -"involved. Thanks so much for you support" -msgstr "" - -#: better-font-awesome.php:403 svn/tags/1.1.0/better-font-awesome.php:335 +#: better-font-awesome.php:368 svn/tags/1.1.0/better-font-awesome.php:335 #: svn/tags/1.2.0/better-font-awesome.php:335 #: svn/tags/1.2.1/better-font-awesome.php:337 #: svn/tags/1.3.0/better-font-awesome.php:337 @@ -127,135 +116,57 @@ msgstr "" #: svn/tags/1.7.1/better-font-awesome.php:350 #: svn/tags/1.7.2/better-font-awesome.php:350 #: svn/tags/1.7.3/better-font-awesome.php:406 +#: svn/tags/1.7.4/better-font-awesome.php:406 #: svn/tags/1.7.5/better-font-awesome.php:404 +#: svn/tags/1.7.6/better-font-awesome.php:425 +#: svn/tags/2.0.0/better-font-awesome.php:368 #: svn/tags/2.0.0-beta/better-font-awesome.php:350 #: svn/tags/2.0.0-beta1/better-font-awesome.php:350 #: svn/tags/2.0.0-beta2/better-font-awesome.php:350 #: svn/tags/2.0.0-beta3/better-font-awesome.php:350 -#: svn/trunk/better-font-awesome.php:404 +#: svn/tags/2.0.0-beta5/better-font-awesome.php:350 +#: svn/tags/2.0.0-beta6/better-font-awesome.php:358 +#: svn/tags/2.0.0-beta7/better-font-awesome.php:368 +#: svn/trunk/better-font-awesome.php:368 msgid "Save Settings" msgstr "" -#: better-font-awesome.php:434 svn/tags/1.0.0/better-font-awesome.php:352 -#: svn/tags/1.0.1/better-font-awesome.php:352 -#: svn/tags/1.0.10/better-font-awesome.php:359 -#: svn/tags/1.0.2/better-font-awesome.php:352 -#: svn/tags/1.0.3/better-font-awesome.php:352 -#: svn/tags/1.0.4/better-font-awesome.php:352 -#: svn/tags/1.0.5/better-font-awesome.php:352 -#: svn/tags/1.0.6/better-font-awesome.php:352 -#: svn/tags/1.0.7/better-font-awesome.php:352 -#: svn/tags/1.0.8/better-font-awesome.php:359 -#: svn/tags/1.0.9/better-font-awesome.php:359 -#: svn/tags/1.1.0/better-font-awesome.php:366 -#: svn/tags/1.2.0/better-font-awesome.php:366 -#: svn/tags/1.2.1/better-font-awesome.php:368 -#: svn/tags/1.3.0/better-font-awesome.php:368 -#: svn/tags/1.3.1/better-font-awesome.php:368 -#: svn/tags/1.3.2/better-font-awesome.php:368 -#: svn/tags/1.3.3/better-font-awesome.php:368 -#: svn/tags/1.3.4/better-font-awesome.php:368 -#: svn/tags/1.3.5/better-font-awesome.php:368 -#: svn/tags/1.4.0/better-font-awesome.php:368 -#: svn/tags/1.4.1/better-font-awesome.php:368 -#: svn/tags/1.4.2/better-font-awesome.php:368 -#: svn/tags/1.4.3/better-font-awesome.php:368 -#: svn/tags/1.5.0/better-font-awesome.php:368 -#: svn/tags/1.6.0/better-font-awesome.php:368 -#: svn/tags/1.7.0/better-font-awesome.php:381 -#: svn/tags/1.7.1/better-font-awesome.php:381 -#: svn/tags/1.7.2/better-font-awesome.php:381 -#: svn/tags/1.7.3/better-font-awesome.php:437 -#: svn/tags/1.7.5/better-font-awesome.php:434 -#: svn/tags/2.0.0-beta/better-font-awesome.php:381 -#: svn/tags/2.0.0-beta1/better-font-awesome.php:381 -#: svn/tags/2.0.0-beta2/better-font-awesome.php:381 -#: svn/tags/2.0.0-beta3/better-font-awesome.php:381 -#: svn/trunk/better-font-awesome.php:434 -msgid "Version" +#: better-font-awesome.php:397 svn/tags/2.0.0/better-font-awesome.php:397 +#: svn/tags/2.0.0-beta5/better-font-awesome.php:379 +#: svn/tags/2.0.0-beta6/better-font-awesome.php:387 +#: svn/tags/2.0.0-beta7/better-font-awesome.php:397 +#: svn/trunk/better-font-awesome.php:397 +msgid "Font Awesome version" msgstr "" -#: better-font-awesome.php:443 svn/tags/1.0.0/better-font-awesome.php:361 -#: svn/tags/1.0.1/better-font-awesome.php:361 -#: svn/tags/1.0.10/better-font-awesome.php:368 -#: svn/tags/1.0.2/better-font-awesome.php:361 -#: svn/tags/1.0.3/better-font-awesome.php:361 -#: svn/tags/1.0.4/better-font-awesome.php:361 -#: svn/tags/1.0.5/better-font-awesome.php:361 -#: svn/tags/1.0.6/better-font-awesome.php:361 -#: svn/tags/1.0.7/better-font-awesome.php:361 -#: svn/tags/1.0.8/better-font-awesome.php:368 -#: svn/tags/1.0.9/better-font-awesome.php:368 -#: svn/tags/1.1.0/better-font-awesome.php:375 -#: svn/tags/1.2.0/better-font-awesome.php:375 -#: svn/tags/1.2.1/better-font-awesome.php:377 -#: svn/tags/1.3.0/better-font-awesome.php:377 -#: svn/tags/1.3.1/better-font-awesome.php:377 -#: svn/tags/1.3.2/better-font-awesome.php:377 -#: svn/tags/1.3.3/better-font-awesome.php:377 -#: svn/tags/1.3.4/better-font-awesome.php:377 -#: svn/tags/1.3.5/better-font-awesome.php:377 -#: svn/tags/1.4.0/better-font-awesome.php:377 -#: svn/tags/1.4.1/better-font-awesome.php:377 -#: svn/tags/1.4.2/better-font-awesome.php:377 -#: svn/tags/1.4.3/better-font-awesome.php:377 -#: svn/tags/1.5.0/better-font-awesome.php:377 -#: svn/tags/1.6.0/better-font-awesome.php:377 -#: svn/tags/1.7.0/better-font-awesome.php:390 -#: svn/tags/1.7.1/better-font-awesome.php:390 -#: svn/tags/1.7.2/better-font-awesome.php:390 -#: svn/tags/1.7.3/better-font-awesome.php:446 -#: svn/tags/1.7.5/better-font-awesome.php:443 -#: svn/tags/2.0.0-beta/better-font-awesome.php:390 -#: svn/tags/2.0.0-beta1/better-font-awesome.php:390 -#: svn/tags/2.0.0-beta2/better-font-awesome.php:390 -#: svn/tags/2.0.0-beta3/better-font-awesome.php:390 -#: svn/trunk/better-font-awesome.php:443 -msgid "Use minified CSS" +#: better-font-awesome.php:405 svn/tags/2.0.0/better-font-awesome.php:405 +#: svn/tags/2.0.0-beta5/better-font-awesome.php:387 +#: svn/tags/2.0.0-beta6/better-font-awesome.php:395 +#: svn/tags/2.0.0-beta7/better-font-awesome.php:405 +#: svn/trunk/better-font-awesome.php:405 +msgid "Version check frequency" msgstr "" -#: better-font-awesome.php:449 svn/tags/1.0.0/better-font-awesome.php:367 -#: svn/tags/1.0.1/better-font-awesome.php:367 -#: svn/tags/1.0.10/better-font-awesome.php:374 -#: svn/tags/1.0.2/better-font-awesome.php:367 -#: svn/tags/1.0.3/better-font-awesome.php:367 -#: svn/tags/1.0.4/better-font-awesome.php:367 -#: svn/tags/1.0.5/better-font-awesome.php:367 -#: svn/tags/1.0.6/better-font-awesome.php:367 -#: svn/tags/1.0.7/better-font-awesome.php:367 -#: svn/tags/1.0.8/better-font-awesome.php:374 -#: svn/tags/1.0.9/better-font-awesome.php:374 -#: svn/tags/1.1.0/better-font-awesome.php:381 -#: svn/tags/1.2.0/better-font-awesome.php:381 -#: svn/tags/1.2.1/better-font-awesome.php:383 -#: svn/tags/1.3.0/better-font-awesome.php:383 -#: svn/tags/1.3.1/better-font-awesome.php:383 -#: svn/tags/1.3.2/better-font-awesome.php:383 -#: svn/tags/1.3.3/better-font-awesome.php:383 -#: svn/tags/1.3.4/better-font-awesome.php:383 -#: svn/tags/1.3.5/better-font-awesome.php:383 -#: svn/tags/1.4.0/better-font-awesome.php:383 -#: svn/tags/1.4.1/better-font-awesome.php:383 -#: svn/tags/1.4.2/better-font-awesome.php:383 -#: svn/tags/1.4.3/better-font-awesome.php:383 -#: svn/tags/1.5.0/better-font-awesome.php:383 -#: svn/tags/1.6.0/better-font-awesome.php:383 -#: svn/tags/1.7.0/better-font-awesome.php:396 -#: svn/tags/1.7.1/better-font-awesome.php:396 -#: svn/tags/1.7.2/better-font-awesome.php:396 -#: svn/tags/1.7.3/better-font-awesome.php:452 -#: svn/tags/1.7.5/better-font-awesome.php:449 -#: svn/tags/2.0.0-beta/better-font-awesome.php:396 -#: svn/tags/2.0.0-beta1/better-font-awesome.php:396 -#: svn/tags/2.0.0-beta2/better-font-awesome.php:396 -#: svn/tags/2.0.0-beta3/better-font-awesome.php:396 -#: svn/trunk/better-font-awesome.php:449 +#: better-font-awesome.php:413 svn/tags/2.0.0/better-font-awesome.php:413 +#: svn/tags/2.0.0-beta5/better-font-awesome.php:395 +#: svn/tags/2.0.0-beta6/better-font-awesome.php:403 +#: svn/tags/2.0.0-beta7/better-font-awesome.php:413 +#: svn/trunk/better-font-awesome.php:413 +msgid "Include v4 CSS shim" +msgstr "" + +#: better-font-awesome.php:419 svn/tags/2.0.0/better-font-awesome.php:419 +#: svn/tags/2.0.0-beta5/better-font-awesome.php:401 +#: svn/tags/2.0.0-beta6/better-font-awesome.php:409 +#: svn/tags/2.0.0-beta7/better-font-awesome.php:419 +#: svn/trunk/better-font-awesome.php:419 msgid "" -"Whether to include the minified version of the CSS (checked), or the " -"unminified version (unchecked)." +"Include the Font Awesome v4 CSS shim to support legacy icons (more details)." msgstr "" -#: better-font-awesome.php:455 svn/tags/1.0.0/better-font-awesome.php:373 +#: better-font-awesome.php:425 svn/tags/1.0.0/better-font-awesome.php:373 #: svn/tags/1.0.1/better-font-awesome.php:373 #: svn/tags/1.0.10/better-font-awesome.php:380 #: svn/tags/1.0.2/better-font-awesome.php:373 @@ -285,16 +196,22 @@ msgstr "" #: svn/tags/1.7.1/better-font-awesome.php:402 #: svn/tags/1.7.2/better-font-awesome.php:402 #: svn/tags/1.7.3/better-font-awesome.php:458 +#: svn/tags/1.7.4/better-font-awesome.php:458 #: svn/tags/1.7.5/better-font-awesome.php:455 +#: svn/tags/1.7.6/better-font-awesome.php:477 +#: svn/tags/2.0.0/better-font-awesome.php:425 #: svn/tags/2.0.0-beta/better-font-awesome.php:402 #: svn/tags/2.0.0-beta1/better-font-awesome.php:402 #: svn/tags/2.0.0-beta2/better-font-awesome.php:402 #: svn/tags/2.0.0-beta3/better-font-awesome.php:402 -#: svn/trunk/better-font-awesome.php:455 +#: svn/tags/2.0.0-beta5/better-font-awesome.php:407 +#: svn/tags/2.0.0-beta6/better-font-awesome.php:415 +#: svn/tags/2.0.0-beta7/better-font-awesome.php:425 +#: svn/trunk/better-font-awesome.php:425 msgid "Remove existing Font Awesome" msgstr "" -#: better-font-awesome.php:461 svn/tags/1.0.0/better-font-awesome.php:379 +#: better-font-awesome.php:431 svn/tags/1.0.0/better-font-awesome.php:379 #: svn/tags/1.0.1/better-font-awesome.php:379 #: svn/tags/1.0.10/better-font-awesome.php:386 #: svn/tags/1.0.2/better-font-awesome.php:379 @@ -324,18 +241,24 @@ msgstr "" #: svn/tags/1.7.1/better-font-awesome.php:408 #: svn/tags/1.7.2/better-font-awesome.php:408 #: svn/tags/1.7.3/better-font-awesome.php:464 +#: svn/tags/1.7.4/better-font-awesome.php:464 #: svn/tags/1.7.5/better-font-awesome.php:461 +#: svn/tags/1.7.6/better-font-awesome.php:483 +#: svn/tags/2.0.0/better-font-awesome.php:431 #: svn/tags/2.0.0-beta/better-font-awesome.php:408 #: svn/tags/2.0.0-beta1/better-font-awesome.php:408 #: svn/tags/2.0.0-beta2/better-font-awesome.php:408 #: svn/tags/2.0.0-beta3/better-font-awesome.php:408 -#: svn/trunk/better-font-awesome.php:461 +#: svn/tags/2.0.0-beta5/better-font-awesome.php:413 +#: svn/tags/2.0.0-beta6/better-font-awesome.php:421 +#: svn/tags/2.0.0-beta7/better-font-awesome.php:431 +#: svn/trunk/better-font-awesome.php:431 msgid "" "Attempt to remove Font Awesome CSS and shortcodes added by other plugins " "and themes." msgstr "" -#: better-font-awesome.php:467 svn/tags/1.0.10/better-font-awesome.php:392 +#: better-font-awesome.php:437 svn/tags/1.0.10/better-font-awesome.php:392 #: svn/tags/1.0.8/better-font-awesome.php:392 #: svn/tags/1.0.9/better-font-awesome.php:392 #: svn/tags/1.1.0/better-font-awesome.php:399 @@ -357,16 +280,22 @@ msgstr "" #: svn/tags/1.7.1/better-font-awesome.php:414 #: svn/tags/1.7.2/better-font-awesome.php:414 #: svn/tags/1.7.3/better-font-awesome.php:470 +#: svn/tags/1.7.4/better-font-awesome.php:470 #: svn/tags/1.7.5/better-font-awesome.php:467 +#: svn/tags/1.7.6/better-font-awesome.php:489 +#: svn/tags/2.0.0/better-font-awesome.php:437 #: svn/tags/2.0.0-beta/better-font-awesome.php:414 #: svn/tags/2.0.0-beta1/better-font-awesome.php:414 #: svn/tags/2.0.0-beta2/better-font-awesome.php:414 #: svn/tags/2.0.0-beta3/better-font-awesome.php:414 -#: svn/trunk/better-font-awesome.php:467 +#: svn/tags/2.0.0-beta5/better-font-awesome.php:419 +#: svn/tags/2.0.0-beta6/better-font-awesome.php:427 +#: svn/tags/2.0.0-beta7/better-font-awesome.php:437 +#: svn/trunk/better-font-awesome.php:437 msgid "Hide admin notices" msgstr "" -#: better-font-awesome.php:473 svn/tags/1.0.10/better-font-awesome.php:398 +#: better-font-awesome.php:443 svn/tags/1.0.10/better-font-awesome.php:398 #: svn/tags/1.0.8/better-font-awesome.php:398 #: svn/tags/1.0.9/better-font-awesome.php:398 #: svn/tags/1.1.0/better-font-awesome.php:405 @@ -388,18 +317,208 @@ msgstr "" #: svn/tags/1.7.1/better-font-awesome.php:420 #: svn/tags/1.7.2/better-font-awesome.php:420 #: svn/tags/1.7.3/better-font-awesome.php:476 +#: svn/tags/1.7.4/better-font-awesome.php:476 #: svn/tags/1.7.5/better-font-awesome.php:473 +#: svn/tags/1.7.6/better-font-awesome.php:495 +#: svn/tags/2.0.0/better-font-awesome.php:443 #: svn/tags/2.0.0-beta/better-font-awesome.php:420 #: svn/tags/2.0.0-beta1/better-font-awesome.php:420 #: svn/tags/2.0.0-beta2/better-font-awesome.php:420 #: svn/tags/2.0.0-beta3/better-font-awesome.php:420 -#: svn/trunk/better-font-awesome.php:473 +#: svn/tags/2.0.0-beta5/better-font-awesome.php:425 +#: svn/tags/2.0.0-beta6/better-font-awesome.php:433 +#: svn/tags/2.0.0-beta7/better-font-awesome.php:443 +#: svn/trunk/better-font-awesome.php:443 msgid "" "Hide the default admin warnings that are shown when API and CDN errors " "occur." msgstr "" -#: better-font-awesome.php:553 better-font-awesome.php:579 +#: better-font-awesome.php:500 svn/tags/1.7.5/better-font-awesome.php:541 +#: svn/tags/2.0.0/better-font-awesome.php:500 +#: svn/tags/2.0.0-beta5/better-font-awesome.php:487 +#: svn/tags/2.0.0-beta6/better-font-awesome.php:490 +#: svn/tags/2.0.0-beta7/better-font-awesome.php:500 +#: svn/trunk/better-font-awesome.php:500 +msgid "Settings saved." +msgstr "" + +#: better-font-awesome.php:524 svn/tags/2.0.0/better-font-awesome.php:524 +#: svn/tags/2.0.0-beta5/better-font-awesome.php:511 +#: svn/tags/2.0.0-beta6/better-font-awesome.php:514 +#: svn/tags/2.0.0-beta7/better-font-awesome.php:524 +#: svn/trunk/better-font-awesome.php:524 +#. translators: placeholder is the numeric current version number. +msgid "" +"%s (The plugin automatically uses the latest version of Font Awesome, and " +"checks for updates at this frequency)" +msgstr "" + +#: svn/tags/1.0.0/better-font-awesome.php:217 +#: svn/tags/1.0.1/better-font-awesome.php:217 +#: svn/tags/1.0.10/better-font-awesome.php:218 +#: svn/tags/1.0.2/better-font-awesome.php:217 +#: svn/tags/1.0.3/better-font-awesome.php:217 +#: svn/tags/1.0.4/better-font-awesome.php:217 +#: svn/tags/1.0.5/better-font-awesome.php:217 +#: svn/tags/1.0.6/better-font-awesome.php:217 +#: svn/tags/1.0.7/better-font-awesome.php:217 +#: svn/tags/1.0.8/better-font-awesome.php:218 +#: svn/tags/1.0.9/better-font-awesome.php:218 +#: svn/tags/1.1.0/better-font-awesome.php:222 +#: svn/tags/1.2.0/better-font-awesome.php:222 +#: svn/tags/1.2.1/better-font-awesome.php:224 +#: svn/tags/1.3.0/better-font-awesome.php:224 +#: svn/tags/1.3.1/better-font-awesome.php:224 +#: svn/tags/1.3.2/better-font-awesome.php:224 +#: svn/tags/1.3.3/better-font-awesome.php:224 +#: svn/tags/1.3.4/better-font-awesome.php:224 +#: svn/tags/1.3.5/better-font-awesome.php:224 +#: svn/tags/1.4.0/better-font-awesome.php:224 +#: svn/tags/1.4.1/better-font-awesome.php:224 +#: svn/tags/1.4.2/better-font-awesome.php:224 +#: svn/tags/1.4.3/better-font-awesome.php:224 +#: svn/tags/1.5.0/better-font-awesome.php:224 +#: svn/tags/1.6.0/better-font-awesome.php:224 +msgid "" +"It appears that Better Font Awesome is missing it's core library, which typically occurs when cloning the " +"Git repository and not updating all submodules. Please refer to the " +"plugin's installation instructions for details on how to " +"properly install Better Font Awesome via Git. If you installed from within " +"WordPress, or via the wordpress.org repo, then chances are the install " +"failed and you can try again. If the issue persists, please create a new " +"topic on the plugin's support forum or file an issue on the Github repo." +msgstr "" + +#: svn/tags/1.0.0/better-font-awesome.php:352 +#: svn/tags/1.0.1/better-font-awesome.php:352 +#: svn/tags/1.0.10/better-font-awesome.php:359 +#: svn/tags/1.0.2/better-font-awesome.php:352 +#: svn/tags/1.0.3/better-font-awesome.php:352 +#: svn/tags/1.0.4/better-font-awesome.php:352 +#: svn/tags/1.0.5/better-font-awesome.php:352 +#: svn/tags/1.0.6/better-font-awesome.php:352 +#: svn/tags/1.0.7/better-font-awesome.php:352 +#: svn/tags/1.0.8/better-font-awesome.php:359 +#: svn/tags/1.0.9/better-font-awesome.php:359 +#: svn/tags/1.1.0/better-font-awesome.php:366 +#: svn/tags/1.2.0/better-font-awesome.php:366 +#: svn/tags/1.2.1/better-font-awesome.php:368 +#: svn/tags/1.3.0/better-font-awesome.php:368 +#: svn/tags/1.3.1/better-font-awesome.php:368 +#: svn/tags/1.3.2/better-font-awesome.php:368 +#: svn/tags/1.3.3/better-font-awesome.php:368 +#: svn/tags/1.3.4/better-font-awesome.php:368 +#: svn/tags/1.3.5/better-font-awesome.php:368 +#: svn/tags/1.4.0/better-font-awesome.php:368 +#: svn/tags/1.4.1/better-font-awesome.php:368 +#: svn/tags/1.4.2/better-font-awesome.php:368 +#: svn/tags/1.4.3/better-font-awesome.php:368 +#: svn/tags/1.5.0/better-font-awesome.php:368 +#: svn/tags/1.6.0/better-font-awesome.php:368 +#: svn/tags/1.7.0/better-font-awesome.php:381 +#: svn/tags/1.7.1/better-font-awesome.php:381 +#: svn/tags/1.7.2/better-font-awesome.php:381 +#: svn/tags/1.7.3/better-font-awesome.php:437 +#: svn/tags/1.7.4/better-font-awesome.php:437 +#: svn/tags/1.7.5/better-font-awesome.php:434 +#: svn/tags/1.7.6/better-font-awesome.php:456 +#: svn/tags/2.0.0-beta/better-font-awesome.php:381 +#: svn/tags/2.0.0-beta1/better-font-awesome.php:381 +#: svn/tags/2.0.0-beta2/better-font-awesome.php:381 +#: svn/tags/2.0.0-beta3/better-font-awesome.php:381 +msgid "Version" +msgstr "" + +#: svn/tags/1.0.0/better-font-awesome.php:361 +#: svn/tags/1.0.1/better-font-awesome.php:361 +#: svn/tags/1.0.10/better-font-awesome.php:368 +#: svn/tags/1.0.2/better-font-awesome.php:361 +#: svn/tags/1.0.3/better-font-awesome.php:361 +#: svn/tags/1.0.4/better-font-awesome.php:361 +#: svn/tags/1.0.5/better-font-awesome.php:361 +#: svn/tags/1.0.6/better-font-awesome.php:361 +#: svn/tags/1.0.7/better-font-awesome.php:361 +#: svn/tags/1.0.8/better-font-awesome.php:368 +#: svn/tags/1.0.9/better-font-awesome.php:368 +#: svn/tags/1.1.0/better-font-awesome.php:375 +#: svn/tags/1.2.0/better-font-awesome.php:375 +#: svn/tags/1.2.1/better-font-awesome.php:377 +#: svn/tags/1.3.0/better-font-awesome.php:377 +#: svn/tags/1.3.1/better-font-awesome.php:377 +#: svn/tags/1.3.2/better-font-awesome.php:377 +#: svn/tags/1.3.3/better-font-awesome.php:377 +#: svn/tags/1.3.4/better-font-awesome.php:377 +#: svn/tags/1.3.5/better-font-awesome.php:377 +#: svn/tags/1.4.0/better-font-awesome.php:377 +#: svn/tags/1.4.1/better-font-awesome.php:377 +#: svn/tags/1.4.2/better-font-awesome.php:377 +#: svn/tags/1.4.3/better-font-awesome.php:377 +#: svn/tags/1.5.0/better-font-awesome.php:377 +#: svn/tags/1.6.0/better-font-awesome.php:377 +#: svn/tags/1.7.0/better-font-awesome.php:390 +#: svn/tags/1.7.1/better-font-awesome.php:390 +#: svn/tags/1.7.2/better-font-awesome.php:390 +#: svn/tags/1.7.3/better-font-awesome.php:446 +#: svn/tags/1.7.4/better-font-awesome.php:446 +#: svn/tags/1.7.5/better-font-awesome.php:443 +#: svn/tags/1.7.6/better-font-awesome.php:465 +#: svn/tags/2.0.0-beta/better-font-awesome.php:390 +#: svn/tags/2.0.0-beta1/better-font-awesome.php:390 +#: svn/tags/2.0.0-beta2/better-font-awesome.php:390 +#: svn/tags/2.0.0-beta3/better-font-awesome.php:390 +msgid "Use minified CSS" +msgstr "" + +#: svn/tags/1.0.0/better-font-awesome.php:367 +#: svn/tags/1.0.1/better-font-awesome.php:367 +#: svn/tags/1.0.10/better-font-awesome.php:374 +#: svn/tags/1.0.2/better-font-awesome.php:367 +#: svn/tags/1.0.3/better-font-awesome.php:367 +#: svn/tags/1.0.4/better-font-awesome.php:367 +#: svn/tags/1.0.5/better-font-awesome.php:367 +#: svn/tags/1.0.6/better-font-awesome.php:367 +#: svn/tags/1.0.7/better-font-awesome.php:367 +#: svn/tags/1.0.8/better-font-awesome.php:374 +#: svn/tags/1.0.9/better-font-awesome.php:374 +#: svn/tags/1.1.0/better-font-awesome.php:381 +#: svn/tags/1.2.0/better-font-awesome.php:381 +#: svn/tags/1.2.1/better-font-awesome.php:383 +#: svn/tags/1.3.0/better-font-awesome.php:383 +#: svn/tags/1.3.1/better-font-awesome.php:383 +#: svn/tags/1.3.2/better-font-awesome.php:383 +#: svn/tags/1.3.3/better-font-awesome.php:383 +#: svn/tags/1.3.4/better-font-awesome.php:383 +#: svn/tags/1.3.5/better-font-awesome.php:383 +#: svn/tags/1.4.0/better-font-awesome.php:383 +#: svn/tags/1.4.1/better-font-awesome.php:383 +#: svn/tags/1.4.2/better-font-awesome.php:383 +#: svn/tags/1.4.3/better-font-awesome.php:383 +#: svn/tags/1.5.0/better-font-awesome.php:383 +#: svn/tags/1.6.0/better-font-awesome.php:383 +#: svn/tags/1.7.0/better-font-awesome.php:396 +#: svn/tags/1.7.1/better-font-awesome.php:396 +#: svn/tags/1.7.2/better-font-awesome.php:396 +#: svn/tags/1.7.3/better-font-awesome.php:452 +#: svn/tags/1.7.4/better-font-awesome.php:452 +#: svn/tags/1.7.5/better-font-awesome.php:449 +#: svn/tags/1.7.6/better-font-awesome.php:471 +#: svn/tags/2.0.0-beta/better-font-awesome.php:396 +#: svn/tags/2.0.0-beta1/better-font-awesome.php:396 +#: svn/tags/2.0.0-beta2/better-font-awesome.php:396 +#: svn/tags/2.0.0-beta3/better-font-awesome.php:396 +msgid "" +"Whether to include the minified version of the CSS (checked), or the " +"unminified version (unchecked)." +msgstr "" + #: svn/tags/1.0.0/better-font-awesome.php:396 #: svn/tags/1.0.0/better-font-awesome.php:422 #: svn/tags/1.0.1/better-font-awesome.php:396 @@ -460,8 +579,12 @@ msgstr "" #: svn/tags/1.7.2/better-font-awesome.php:519 #: svn/tags/1.7.3/better-font-awesome.php:556 #: svn/tags/1.7.3/better-font-awesome.php:582 +#: svn/tags/1.7.4/better-font-awesome.php:556 +#: svn/tags/1.7.4/better-font-awesome.php:582 #: svn/tags/1.7.5/better-font-awesome.php:556 #: svn/tags/1.7.5/better-font-awesome.php:579 +#: svn/tags/1.7.6/better-font-awesome.php:575 +#: svn/tags/1.7.6/better-font-awesome.php:601 #: svn/tags/2.0.0-beta/better-font-awesome.php:493 #: svn/tags/2.0.0-beta/better-font-awesome.php:519 #: svn/tags/2.0.0-beta1/better-font-awesome.php:493 @@ -470,11 +593,10 @@ msgstr "" #: svn/tags/2.0.0-beta2/better-font-awesome.php:519 #: svn/tags/2.0.0-beta3/better-font-awesome.php:493 #: svn/tags/2.0.0-beta3/better-font-awesome.php:519 -#: svn/trunk/better-font-awesome.php:556 svn/trunk/better-font-awesome.php:579 msgid "Always Latest" msgstr "" -#: better-font-awesome.php:613 svn/tags/1.0.0/better-font-awesome.php:456 +#: svn/tags/1.0.0/better-font-awesome.php:456 #: svn/tags/1.0.1/better-font-awesome.php:456 #: svn/tags/1.0.10/better-font-awesome.php:475 #: svn/tags/1.0.2/better-font-awesome.php:456 @@ -504,19 +626,20 @@ msgstr "" #: svn/tags/1.7.1/better-font-awesome.php:553 #: svn/tags/1.7.2/better-font-awesome.php:553 #: svn/tags/1.7.3/better-font-awesome.php:616 +#: svn/tags/1.7.4/better-font-awesome.php:616 #: svn/tags/1.7.5/better-font-awesome.php:611 +#: svn/tags/1.7.6/better-font-awesome.php:635 #: svn/tags/2.0.0-beta/better-font-awesome.php:553 #: svn/tags/2.0.0-beta1/better-font-awesome.php:553 #: svn/tags/2.0.0-beta2/better-font-awesome.php:553 #: svn/tags/2.0.0-beta3/better-font-awesome.php:553 -#: svn/trunk/better-font-awesome.php:611 #. translators: string is the error code + message. msgid "" "Version selection is currently unavailable. The attempt to reach the " "jsDelivr API server failed with the following error: %s" msgstr "" -#: better-font-awesome.php:620 svn/tags/1.0.0/better-font-awesome.php:463 +#: svn/tags/1.0.0/better-font-awesome.php:463 #: svn/tags/1.0.1/better-font-awesome.php:463 #: svn/tags/1.0.10/better-font-awesome.php:482 #: svn/tags/1.0.2/better-font-awesome.php:463 @@ -546,17 +669,18 @@ msgstr "" #: svn/tags/1.7.1/better-font-awesome.php:560 #: svn/tags/1.7.2/better-font-awesome.php:560 #: svn/tags/1.7.3/better-font-awesome.php:623 +#: svn/tags/1.7.4/better-font-awesome.php:623 #: svn/tags/1.7.5/better-font-awesome.php:620 +#: svn/tags/1.7.6/better-font-awesome.php:642 #: svn/tags/2.0.0-beta/better-font-awesome.php:560 #: svn/tags/2.0.0-beta1/better-font-awesome.php:560 #: svn/tags/2.0.0-beta2/better-font-awesome.php:560 #: svn/tags/2.0.0-beta3/better-font-awesome.php:560 -#: svn/trunk/better-font-awesome.php:620 #. translators: string is the fallback version of font awesome. msgid "Font Awesome will still render using version: %s" msgstr "" -#: better-font-awesome.php:627 svn/tags/1.0.0/better-font-awesome.php:470 +#: svn/tags/1.0.0/better-font-awesome.php:470 #: svn/tags/1.0.0/lib/better-font-awesome-library/better-font-awesome-library.php:1044 #: svn/tags/1.0.1/better-font-awesome.php:470 #: svn/tags/1.0.1/lib/better-font-awesome-library/better-font-awesome-library.php:1052 @@ -617,7 +741,12 @@ msgstr "" #: svn/tags/1.7.2/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1107 #: svn/tags/1.7.3/better-font-awesome.php:630 #: svn/tags/1.7.3/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1317 +#: svn/tags/1.7.4/better-font-awesome.php:630 +#: svn/tags/1.7.4/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1107 #: svn/tags/1.7.5/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1317 +#: svn/tags/1.7.6/better-font-awesome.php:649 +#: svn/tags/1.7.6/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1107 +#: svn/tags/2.0.0/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:918 #: svn/tags/2.0.0-beta/better-font-awesome.php:567 #: svn/tags/2.0.0-beta/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1312 #: svn/tags/2.0.0-beta1/better-font-awesome.php:567 @@ -626,110 +755,18 @@ msgstr "" #: svn/tags/2.0.0-beta2/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1313 #: svn/tags/2.0.0-beta3/better-font-awesome.php:567 #: svn/tags/2.0.0-beta3/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1317 -#: svn/trunk/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1317 -#: vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1107 +#: svn/tags/2.0.0-beta5/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:877 +#: svn/tags/2.0.0-beta5/vendor/mickey-kay/better-font-awesome-library-bk/better-font-awesome-library.php:877 +#: svn/tags/2.0.0-beta6/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:916 +#: svn/tags/2.0.0-beta7/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:918 +#: svn/trunk/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:918 +#: vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:918 msgid "" "This may be the result of a temporary server or connectivity issue which " "will resolve shortly. However if the problem persists please file a support " "ticket on the %splugin forum%s, citing the errors listed above. " msgstr "" -#: better-font-awesome.php:674 svn/tags/1.3.0/better-font-awesome.php:601 -#: svn/tags/1.3.1/better-font-awesome.php:601 -#: svn/tags/1.3.2/better-font-awesome.php:601 -#: svn/tags/1.3.3/better-font-awesome.php:601 -#: svn/tags/1.3.4/better-font-awesome.php:601 -#: svn/tags/1.3.5/better-font-awesome.php:601 -#: svn/tags/1.4.0/better-font-awesome.php:601 -#: svn/tags/1.4.1/better-font-awesome.php:601 -#: svn/tags/1.4.2/better-font-awesome.php:601 -#: svn/tags/1.4.3/better-font-awesome.php:601 -#: svn/tags/1.5.0/better-font-awesome.php:601 -#: svn/tags/1.6.0/better-font-awesome.php:601 -#: svn/tags/1.7.0/better-font-awesome.php:614 -#: svn/tags/1.7.1/better-font-awesome.php:614 -#: svn/tags/1.7.2/better-font-awesome.php:614 -#: svn/tags/1.7.3/better-font-awesome.php:677 -#: svn/tags/2.0.0-beta/better-font-awesome.php:614 -#: svn/tags/2.0.0-beta1/better-font-awesome.php:614 -#: svn/tags/2.0.0-beta2/better-font-awesome.php:614 -#: svn/tags/2.0.0-beta3/better-font-awesome.php:614 -msgid "" -"

Usage

\n" -" Font Awesome version 4.x " -"+   See all available options " -"»

\n" -" [icon " -"name=\"coffee\"] or <i " -"class=\"fa-coffee\"></i>

\n" -" [icon name=\"coffee\" class=\"fa-2x\"] or " -"<i class=\"fa-coffee fa-2x\"></i>

\n" -" [icon name=\"coffee\" " -"class=\"fa-2x fa-rotate-90\"] or <i class=\"fa-coffee fa-2x " -"fa-rotate-90\"></i>


\n" -" Font Awesome version " -"3.x   See all available options " -"»

\n" -" [icon " -"name=\"coffee\"] or <i class=\"icon " -"icon-coffee\"></i>

\n" -" [icon name=\"coffee\" class=\"icon-2x\"] or " -"<i class=\"icon icon-coffee icon-2x\"></i>

\n" -" [icon name=\"coffee\" " -"class=\"icon-2x icon-rotate-90\"] or <i class=\"icon " -"icon-coffee icon-2x icon-rotate-90\"></i>" -msgstr "" - -#: svn/tags/1.0.0/better-font-awesome.php:217 -#: svn/tags/1.0.1/better-font-awesome.php:217 -#: svn/tags/1.0.10/better-font-awesome.php:218 -#: svn/tags/1.0.2/better-font-awesome.php:217 -#: svn/tags/1.0.3/better-font-awesome.php:217 -#: svn/tags/1.0.4/better-font-awesome.php:217 -#: svn/tags/1.0.5/better-font-awesome.php:217 -#: svn/tags/1.0.6/better-font-awesome.php:217 -#: svn/tags/1.0.7/better-font-awesome.php:217 -#: svn/tags/1.0.8/better-font-awesome.php:218 -#: svn/tags/1.0.9/better-font-awesome.php:218 -#: svn/tags/1.1.0/better-font-awesome.php:222 -#: svn/tags/1.2.0/better-font-awesome.php:222 -#: svn/tags/1.2.1/better-font-awesome.php:224 -#: svn/tags/1.3.0/better-font-awesome.php:224 -#: svn/tags/1.3.1/better-font-awesome.php:224 -#: svn/tags/1.3.2/better-font-awesome.php:224 -#: svn/tags/1.3.3/better-font-awesome.php:224 -#: svn/tags/1.3.4/better-font-awesome.php:224 -#: svn/tags/1.3.5/better-font-awesome.php:224 -#: svn/tags/1.4.0/better-font-awesome.php:224 -#: svn/tags/1.4.1/better-font-awesome.php:224 -#: svn/tags/1.4.2/better-font-awesome.php:224 -#: svn/tags/1.4.3/better-font-awesome.php:224 -#: svn/tags/1.5.0/better-font-awesome.php:224 -#: svn/tags/1.6.0/better-font-awesome.php:224 -msgid "" -"It appears that Better Font Awesome is missing it's core library, which typically occurs when cloning the " -"Git repository and not updating all submodules. Please refer to the " -"plugin's installation instructions for details on how to " -"properly install Better Font Awesome via Git. If you installed from within " -"WordPress, or via the wordpress.org repo, then chances are the install " -"failed and you can try again. If the issue persists, please create a new " -"topic on the plugin's support forum or file an issue on the Github repo." -msgstr "" - #: svn/tags/1.0.0/better-font-awesome.php:517 #: svn/tags/1.0.1/better-font-awesome.php:517 #: svn/tags/1.0.10/better-font-awesome.php:536 @@ -807,13 +844,13 @@ msgstr "" #: svn/tags/1.7.1/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1077 #: svn/tags/1.7.2/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1077 #: svn/tags/1.7.3/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1287 +#: svn/tags/1.7.4/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1077 #: svn/tags/1.7.5/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1287 +#: svn/tags/1.7.6/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1077 #: svn/tags/2.0.0-beta/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1282 #: svn/tags/2.0.0-beta1/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1282 #: svn/tags/2.0.0-beta2/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1283 #: svn/tags/2.0.0-beta3/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1287 -#: svn/trunk/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1287 -#: vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1077 msgid "API Error" msgstr "" @@ -848,13 +885,13 @@ msgstr "" #: svn/tags/1.7.1/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1079 #: svn/tags/1.7.2/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1079 #: svn/tags/1.7.3/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1289 +#: svn/tags/1.7.4/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1079 #: svn/tags/1.7.5/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1289 +#: svn/tags/1.7.6/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1079 #: svn/tags/2.0.0-beta/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1284 #: svn/tags/2.0.0-beta1/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1284 #: svn/tags/2.0.0-beta2/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1285 #: svn/tags/2.0.0-beta3/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1289 -#: svn/trunk/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1289 -#: vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1079 msgid "" "The attempt to reach the jsDelivr API server failed with the following " "error: %s" @@ -891,13 +928,13 @@ msgstr "" #: svn/tags/1.7.1/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1089 #: svn/tags/1.7.2/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1089 #: svn/tags/1.7.3/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1299 +#: svn/tags/1.7.4/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1089 #: svn/tags/1.7.5/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1299 +#: svn/tags/1.7.6/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1089 #: svn/tags/2.0.0-beta/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1294 #: svn/tags/2.0.0-beta1/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1294 #: svn/tags/2.0.0-beta2/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1295 #: svn/tags/2.0.0-beta3/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1299 -#: svn/trunk/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1299 -#: vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1089 msgid "Remote CSS Error" msgstr "" @@ -932,13 +969,13 @@ msgstr "" #: svn/tags/1.7.1/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1091 #: svn/tags/1.7.2/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1091 #: svn/tags/1.7.3/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1301 +#: svn/tags/1.7.4/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1091 #: svn/tags/1.7.5/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1301 +#: svn/tags/1.7.6/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1091 #: svn/tags/2.0.0-beta/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1296 #: svn/tags/2.0.0-beta1/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1296 #: svn/tags/2.0.0-beta2/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1297 #: svn/tags/2.0.0-beta3/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1301 -#: svn/trunk/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1301 -#: vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1091 msgid "" "The attempt to fetch the remote Font Awesome stylesheet failed with the " "following error: %s %s The embedded fallback Font Awesome will be used " @@ -976,13 +1013,13 @@ msgstr "" #: svn/tags/1.7.1/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1105 #: svn/tags/1.7.2/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1105 #: svn/tags/1.7.3/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1315 +#: svn/tags/1.7.4/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1105 #: svn/tags/1.7.5/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1315 +#: svn/tags/1.7.6/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1105 #: svn/tags/2.0.0-beta/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1310 #: svn/tags/2.0.0-beta1/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1310 #: svn/tags/2.0.0-beta2/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1311 #: svn/tags/2.0.0-beta3/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1315 -#: svn/trunk/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1315 -#: vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1105 msgid "Solution" msgstr "" @@ -1017,8 +1054,10 @@ msgstr "" #: svn/tags/1.7.2/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:491 #: svn/tags/1.7.3/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:524 #: svn/tags/1.7.3/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:595 +#: svn/tags/1.7.4/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:491 #: svn/tags/1.7.5/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:524 #: svn/tags/1.7.5/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:595 +#: svn/tags/1.7.6/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:491 #: svn/tags/2.0.0-beta/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:524 #: svn/tags/2.0.0-beta/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:590 #: svn/tags/2.0.0-beta1/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:524 @@ -1027,9 +1066,6 @@ msgstr "" #: svn/tags/2.0.0-beta2/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:590 #: svn/tags/2.0.0-beta3/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:524 #: svn/tags/2.0.0-beta3/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:595 -#: svn/trunk/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:524 -#: svn/trunk/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:595 -#: vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:491 msgid "The jsDelivr API servers appear to be temporarily unavailable." msgstr "" @@ -1063,18 +1099,73 @@ msgstr "" #: svn/tags/1.7.1/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1101 #: svn/tags/1.7.2/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1101 #: svn/tags/1.7.3/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1311 +#: svn/tags/1.7.4/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1101 #: svn/tags/1.7.5/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1311 +#: svn/tags/1.7.6/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1101 #: svn/tags/2.0.0-beta/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1306 #: svn/tags/2.0.0-beta1/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1306 #: svn/tags/2.0.0-beta2/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1307 #: svn/tags/2.0.0-beta3/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1311 -#: svn/trunk/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1311 -#: vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1101 msgid "" "Don't worry! Better Font Awesome will still render using the included " "fallback version: " msgstr "" +#: svn/tags/1.3.0/better-font-awesome.php:601 +#: svn/tags/1.3.1/better-font-awesome.php:601 +#: svn/tags/1.3.2/better-font-awesome.php:601 +#: svn/tags/1.3.3/better-font-awesome.php:601 +#: svn/tags/1.3.4/better-font-awesome.php:601 +#: svn/tags/1.3.5/better-font-awesome.php:601 +#: svn/tags/1.4.0/better-font-awesome.php:601 +#: svn/tags/1.4.1/better-font-awesome.php:601 +#: svn/tags/1.4.2/better-font-awesome.php:601 +#: svn/tags/1.4.3/better-font-awesome.php:601 +#: svn/tags/1.5.0/better-font-awesome.php:601 +#: svn/tags/1.6.0/better-font-awesome.php:601 +#: svn/tags/1.7.0/better-font-awesome.php:614 +#: svn/tags/1.7.1/better-font-awesome.php:614 +#: svn/tags/1.7.2/better-font-awesome.php:614 +#: svn/tags/1.7.3/better-font-awesome.php:677 +#: svn/tags/1.7.4/better-font-awesome.php:677 +#: svn/tags/1.7.6/better-font-awesome.php:696 +#: svn/tags/2.0.0-beta/better-font-awesome.php:614 +#: svn/tags/2.0.0-beta1/better-font-awesome.php:614 +#: svn/tags/2.0.0-beta2/better-font-awesome.php:614 +#: svn/tags/2.0.0-beta3/better-font-awesome.php:614 +msgid "" +"

Usage

\n" +" Font Awesome version 4.x " +"+   See all available options " +"»

\n" +" [icon " +"name=\"coffee\"] or <i " +"class=\"fa-coffee\"></i>

\n" +" [icon name=\"coffee\" class=\"fa-2x\"] or " +"<i class=\"fa-coffee fa-2x\"></i>

\n" +" [icon name=\"coffee\" " +"class=\"fa-2x fa-rotate-90\"] or <i class=\"fa-coffee fa-2x " +"fa-rotate-90\"></i>


\n" +" Font Awesome version " +"3.x   See all available options " +"»

\n" +" [icon " +"name=\"coffee\"] or <i class=\"icon " +"icon-coffee\"></i>

\n" +" [icon name=\"coffee\" class=\"icon-2x\"] or " +"<i class=\"icon icon-coffee icon-2x\"></i>

\n" +" [icon name=\"coffee\" " +"class=\"icon-2x icon-rotate-90\"] or <i class=\"icon " +"icon-coffee icon-2x icon-rotate-90\"></i>" +msgstr "" + #: svn/tags/1.3.0/lib/better-font-awesome-library/better-font-awesome-library.php:1031 #: svn/tags/1.3.1/lib/better-font-awesome-library/better-font-awesome-library.php:1039 #: svn/tags/1.3.2/lib/better-font-awesome-library/better-font-awesome-library.php:1039 @@ -1092,22 +1183,57 @@ msgstr "" #: svn/tags/1.7.1/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1051 #: svn/tags/1.7.2/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1051 #: svn/tags/1.7.3/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1261 +#: svn/tags/1.7.4/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1051 #: svn/tags/1.7.5/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1261 +#: svn/tags/1.7.6/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1051 +#: svn/tags/2.0.0/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:879 #: svn/tags/2.0.0-beta/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1256 #: svn/tags/2.0.0-beta1/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1256 #: svn/tags/2.0.0-beta2/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1257 #: svn/tags/2.0.0-beta3/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1261 -#: svn/trunk/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1261 -#: vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1051 +#: svn/tags/2.0.0-beta5/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:838 +#: svn/tags/2.0.0-beta5/vendor/mickey-kay/better-font-awesome-library-bk/better-font-awesome-library.php:838 +#: svn/tags/2.0.0-beta6/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:877 +#: svn/tags/2.0.0-beta7/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:879 +#: svn/trunk/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:879 +#: vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:879 msgid "Insert Icon" msgstr "" +#: svn/tags/1.7.3/better-font-awesome.php:337 +#: svn/tags/1.7.4/better-font-awesome.php:337 +#: svn/tags/1.7.5/better-font-awesome.php:330 +#: svn/tags/1.7.6/better-font-awesome.php:340 +msgid "Better Font Awesome - We need your help!" +msgstr "" + +#: svn/tags/1.7.3/better-font-awesome.php:338 +#: svn/tags/1.7.4/better-font-awesome.php:338 +#: svn/tags/1.7.6/better-font-awesome.php:341 +msgid "" +"First of all, thanks so much for using the plugin! Second of all, %sBetter " +"Font Awesome 2.0%s is almost ready for use! The new version adds a " +"few major improvements, most notably support for Font Awesome 5 icons. " +"Before publishing the update, it's important that we get plenty of user " +"testing to validate that everything is working as expected, and we could " +"really use your help." +msgstr "" + +#: svn/tags/1.7.3/better-font-awesome.php:339 +#: svn/tags/1.7.4/better-font-awesome.php:339 +#: svn/tags/1.7.6/better-font-awesome.php:342 +msgid "" +"If you are interested in helping us test the new update, please read the " +"official %sblog post%s, which includes simple instructions for how to get " +"involved. Thanks so much for you support" +msgstr "" + #: svn/tags/1.7.3/better-font-awesome.php:341 +#: svn/tags/1.7.4/better-font-awesome.php:341 msgid "Dismiss this notice." msgstr "" #: svn/tags/1.7.5/better-font-awesome.php:334 -#: svn/trunk/better-font-awesome.php:334 #. translators: placeholders are the opening and closing tags. msgid "" "First of all, thanks so much for using the plugin! Second of all, " @@ -1119,7 +1245,6 @@ msgid "" msgstr "" #: svn/tags/1.7.5/better-font-awesome.php:340 -#: svn/trunk/better-font-awesome.php:340 #. translators: placeholders are the opening and closing tags. msgid "" "If you are interested in helping us test the new update, please read the " @@ -1127,13 +1252,7 @@ msgid "" "get involved. Thanks so much for you support" msgstr "" -#: svn/tags/1.7.5/better-font-awesome.php:541 -#: svn/trunk/better-font-awesome.php:541 -msgid "Settings saved." -msgstr "" - #: svn/tags/1.7.5/better-font-awesome.php:629 -#: svn/trunk/better-font-awesome.php:629 #. translators: placeholders are the opening and closing tags. msgid "" "This may be the result of a temporary server or connectivity issue which " @@ -1142,7 +1261,6 @@ msgid "" msgstr "" #: svn/tags/1.7.5/better-font-awesome.php:668 -#: svn/trunk/better-font-awesome.php:668 msgid "" "

Usage

\n" "\t\t\t\t\t Font Awesome version 4.x +   
" msgstr "" +#: svn/tags/2.0.0/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:906 +#: svn/tags/2.0.0-beta5/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:865 +#: svn/tags/2.0.0-beta5/vendor/mickey-kay/better-font-awesome-library-bk/better-font-awesome-library.php:865 +#: svn/tags/2.0.0-beta6/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:904 +#: svn/tags/2.0.0-beta7/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:906 +#: svn/trunk/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:906 +#: vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:906 +msgid "" +"It looks like something went wrong when trying to fetch data from the Font " +"Awesome API:" +msgstr "" + +#: svn/tags/2.0.0/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:917 +#: svn/tags/2.0.0-beta5/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:876 +#: svn/tags/2.0.0-beta5/vendor/mickey-kay/better-font-awesome-library-bk/better-font-awesome-library.php:876 +#: svn/tags/2.0.0-beta6/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:915 +#: svn/tags/2.0.0-beta7/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:917 +#: svn/trunk/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:917 +#: vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:917 +msgid "" +"Don't worry! Better Font Awesome will still render using the included " +"fallback version: " +msgstr "" + #. Plugin URI of the plugin/theme msgid "http://wordpress.org/plugins/better-font-awesome" msgstr "" diff --git a/package-lock.json b/package-lock.json index b00ed49..afc6155 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "version": "1.7.4", + "version": "2.0.0-beta7", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 4237d6e..e97347e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "title": "Better Font Awesome", "description": "The best WordPress extension ever made!", - "version": "1.7.6", + "version": "2.0.0", "homepage": "http://wordpress.org/plugins/better-font-awesome", "scripts": { "composer": "composer install", diff --git a/readme.txt b/readme.txt old mode 100644 new mode 100755 index 29eca10..9091f15 --- a/readme.txt +++ b/readme.txt @@ -12,7 +12,7 @@ The Better Font Awesome plugin for WordPress. Shortcodes, HTML, TinyMCE, various == Description == -[![Build Status](https://travis-ci.org/MickeyKay/better-font-awesome.svg?branch=master)](https://travis-ci.org/MickeyKay/better-font-awesome) +[![Build Status](https://travis-ci.com/MickeyKay/better-font-awesome.svg?branch=master)](https://travis-ci.com/MickeyKay/better-font-awesome) **Do you find this plugin helpful? Please consider [leaving a 5-star review](https://wordpress.org/support/view/plugin-reviews/better-font-awesome).** @@ -111,6 +111,18 @@ Better Font Awesome does it's best to load after any existing Font Awesome CSS, == Changelog == += 2.0.0 = +* Add support for Font Awesome v5 +* Integration with Font Awesome GraphQL API for all data fetching (improve performance) +* Integrate with Font Awesome CDN for all CSS +* Add option to include the v4 Font Awesome CSS shim to support older icons (default on for upgrades) +* Updatee hard-coded fallback Font Awesome version +* Modify version check frequency to a saner 24 hour interval +* Ensure admin notices are dismissible +* Lower data fetch timeout to mitigate performance risks +* Remove legacy options that are no longer relevant (version select, minification opt-out) +* Add more/better unit tests to ensure things are working as expected + = 1.7.6 = * Fix: revert to 1.7.4 codebase. * Fix: remove calls to `ready()` jQuery method to support latest jQuery versions. @@ -136,126 +148,20 @@ Better Font Awesome does it's best to load after any existing Font Awesome CSS, * Update fallback Font Awesome to v4.7.0. * Switch from using git submodules to composer dependency management for core library inclusion. -= 1.6.0 = -* Update fallback Font Awesome to v4.6.3. - -= 1.5.0 = -* Update fallback Font Awesome to v4.5.0. -* Add new `bfa_icon_tag` to allow for filtering default `` tag. - -= 1.4.3 = -* Fix: refactor JS to allow icon shortcode insertion button to work in all instances (ACF Flexible and Repeater fields, divi, Black Studio TinyMCE ). - -= 1.4.2 = -* Fix: icon picker not working for ACF Pro repeater field. - -= 1.4.1 = -* Fix: icon picker not working for ACF repeater field. - -= 1.4.0 = -* Fix: icon picker not working for Black Studio TinyMCE Widget. (props @EJOweb and @marcochiesi) -* Update fallback Font Awesome to version 4.4.0. - -= 1.3.4 = -* Update Better Font Awesome Library to version 1.3.4. -* Fix double shortcode insert issue. -* Fix behavior in which clicking shortcode insert button scrolls to top of page. - -= 1.3.3 = -* Update plugin and BFAL to all fire on `init` hook instead of mix of `plugins_loaded` and `after_theme_setup`. This should fix issues in which icons don't show up when BFAL is used in other plugins. -* Update iconpicker JS to avoid conflict that arose from preventing subsequent `mouseup` event listeners from firing. -* Change appearance of iconpicker button to match default buttons. - -= 1.3.2 = -* Update Better Font Awesome Library with better prefix removal method for filtered icons. - -= 1.3.1 = -* Update admin JS to trigger icon picker on ALL TinyMCE initializations (e.g. Visual Composer and AJAX) - -= 1.3.0 = -* Replace outdated TinyMCE shortcode selector brand new jQuery dropdown selector that works in both the visual and text editor -* Clean up CSS and JS - -= 1.2.1 = -* Update get_instance() call to work for older versions of PHP (< 5.3) - -= 1.2.0 = -* Attach load functionality to after_theme_setup hook to allow themes to filter options -* Update fallback Font Awesome to version 4.3.0 - -= 1.1.0 = -* Implement Ajax to save plugin settings (thanks [Braad](https://profiles.wordpress.org/braad)) - -= 1.0.10 = -* Fix SSL bug breaking wp_remote_get() from https. - -= 1.0.9 = -* Fix debuggin hook set to init instead of plugins_loaded. - -= 1.0.8 = -* Add admin setting to hide admin notices for API and CDN connectivity warnings. -* Update translations. - -= 1.0.7 = -* Update included fallback to Font Awesome version 4.3. - -= 1.0.6 = -* Unhook library load() function from plugins_loaded and run directly from constructor (fixes bug preventing developers from overriding initialization easily). - -= 1.0.5 = -* Add fa_force_fallback and bfa_show_errors filters. -* Add hex icon values as $icon array indexes. - -= 1.0.4 = -* Add missing isset() check that was causing intermittent warning. - -= 1.0.3 = -* Add French translation. -* Correct text domain slug. - -= 1.0.2 = -* Add updated .pot file. -* Further improve error handling and fallback. - -= 1.0.1 = -* Fix error handling for 404 API requests. - -= 1.0.0 = -* Fully refactor the back-end. -* Switch to just using the jsDelivr CDN. -* Implement transients to minimize load time. -* Implement improved fallback handling (transient → wp_remote_get() → locally included files) -* Switch out bulky Titan Framework for native Settings API. - -= 0.9.6 = -* Fixed missing icon previews in WordPress 3.8 and below. - -= 0.9.5 = -* Added ability to choose which CDN to use. -* Added `unprefixed_class` shortcode attribute to allow for unprefixed shortcodes. -* Updated prefixes to now return just the prefix without the dash (-). - -= 0.9.4 = -* Switched default   being output. Now the default "space" attribute is false, and can be set to true to optionally include a space. -* PLEASE NOTE: this will affect existing shortcodes. - -= 0.9.3 = -* Fixed admin-styles.css bug that was applying FontAwesome font-face outside TinyMCE -* Print JS variables in front-end to aid developers -* Create global $better_font_awesome object for developers to access - -= 0.9.2 = -* Fixes issue of missing icon drop-down select menu in TinyMCE (adds compatibility for TinyMCE v4) - -= 0.9.1 = -* Added fixes for older versions of PHP (Titan Framework not found, unexpected "[") - -= 0.9.0 = -* First release! - - == Upgrade Notice == += 2.0.0 = +* Add support for Font Awesome v5 +* Integration with Font Awesome GraphQL API for all data fetching (improve performance) +* Integrate with Font Awesome CDN for all CSS +* Add option to include the v4 Font Awesome CSS shim to support older icons (default on for upgrades) +* Updatee hard-coded fallback Font Awesome version +* Modify version check frequency to a saner 24 hour interval +* Ensure admin notices are dismissible +* Lower data fetch timeout to mitigate performance risks +* Remove legacy options that are no longer relevant (version select, minification opt-out) +* Add more/better unit tests to ensure things are working as expected + = 1.7.6 = * Fix: revert to 1.7.4 codebase. * Fix: remove calls to `ready()` jQuery method to support latest jQuery versions. @@ -280,120 +186,3 @@ Better Font Awesome does it's best to load after any existing Font Awesome CSS, = 1.7.0 = * Update fallback Font Awesome to v4.7.0. * Switch from using git submodules to composer dependency management for core library inclusion. - -= 1.6.0 = -* Update fallback Font Awesome to v4.6.3. - -= 1.5.0 = -* Update fallback Font Awesome to v4.5.0. -* Add new `bfa_icon_tag` to allow for filtering default `` tag. - -= 1.4.3 = -* Fix: refactor JS to allow icon shortcode insertion button to work in all instances (ACF Flexible and Repeater fields, divi, Black Studio TinyMCE ). - -= 1.4.2 = -* Fix: icon picker not working for ACF Pro repeater field. - -= 1.4.1 = -* Fix: icon picker not working for ACF repeater field. - -= 1.4.0 = -* Fix: icon picker not working for Black Studio TinyMCE Widget. (props @EJOweb and @marcochiesi) -* Update fallback Font Awesome to version 4.4.0. - -= 1.3.4 = -* Update Better Font Awesome Library to version 1.3.4. -* Fix double shortcode insert issue. -* Fix behavior in which clicking shortcode insert button scrolls to top of page. - -= 1.3.3 = -* Update plugin and BFAL to all fire on `init` hook instead of mix of `plugins_loaded` and `after_theme_setup`. This should fix issues in which icons don't show up when BFAL is used in other plugins. -* Update iconpicker JS to avoid conflict that arose from preventing subsequent `mouseup` event listeners from firing. -* Change appearance of iconpicker button to match default buttons. - -= 1.3.2 = -* Update Better Font Awesome Library with better prefix removal method. - -= 1.3.1 = -* Update admin JS to trigger icon picker on ALL TinyMCE initializations (e.g. Visual Composer and AJAX) - -= 1.3.0 = -* Replace outdated TinyMCE shortcode selector brand new jQuery dropdown selector that works in both the visual and text editor -* Clean up CSS and JS - -= 1.2.1 = -* Update get_instance() call to work for older versions of PHP (< 5.3) - -= 1.2.0 = -* Attach load functionality to after_theme_setup hook to allow themes to filter options -* Update fallback Font Awesome to version 4.3.0 - -= 1.1.0 = -* Implement Ajax to save plugin settings (thanks [Braad](https://profiles.wordpress.org/braad)) - -= 1.0.10 = -* Fix SSL bug breaking wp_remote_get() from https - -= 1.0.9 = -* Fix debuggin hook set to init instead of plugins_loaded. - -= 1.0.8 = -* Add admin setting to hide admin notices for API and CDN connectivity warnings. -* Update translations. - -= 1.0.7 = -* Update included fallback to Font Awesome version 4.3. - -= 1.0.6 = -* Unhook library load() function from plugins_loaded and run directly from constructor (fixes bug preventing developers from overriding initialization easily). - -= 1.0.5 = -* Add fa_force_fallback and bfa_show_errors filters. -* Add hex icon values as $icon array indexes. - -= 1.0.4 = -* Add missing isset() check that was causing intermittent warning. - -= 1.0.3 = -* Add French translation. -* Correct text domain slug. - -= 1.0.2 = -* Add updated .pot file. -* Further improve error handling and fallback. - -= 1.0.1 = -* Fix error handling for 404 API requests. - -= 1.0.0 = -* Fully refactor the back-end. -* Switch to just using the jsDelivr CDN. -* Implement transients to minimize load time. -* Implement improved fallback handling (transient → wp_remote_get() → locally included files) -* Switch out bulky Titan Framework for native Settings API. - -= 0.9.6 = -* Fixed missing icon previews in WordPress 3.8 and below. - -= 0.9.5 = -* Added ability to choose which CDN to use. -* Added `unprefixed_class` shortcode attribute to allow for unprefixed shortcodes. -* Updated prefixes to now return just the prefix without the dash (-). - -= 0.9.4 = -* Switched default   being output. Now the default "space" attribute is false, and can be set to true to optionally include a space. -* PLEASE NOTE: this will affect existing shortcodes. - -= 0.9.3 = -* Fixed admin-styles.css bug that was applying FontAwesome font-face outside TinyMCE -* Print JS variables in front-end to aid developers -* Create global $better_font_awesome object for developers to access - -= 0.9.2 = -* Fixes issue of missing icon drop-down select menu in TinyMCE (adds compatibility for TinyMCE v4) - -= 0.9.1 = -* Added fixes for older versions of PHP (Titan Framework not found, unexpected "[") - -= 0.9.0 = -* First release! diff --git a/tests/test-better-font-awesome.php b/tests/test-better-font-awesome.php old mode 100644 new mode 100755 index 88d896d..f1eaa32 --- a/tests/test-better-font-awesome.php +++ b/tests/test-better-font-awesome.php @@ -3,9 +3,11 @@ class Better_Font_Awesome_Test extends WP_UnitTestCase { protected $bfa; + protected $bfa_lib; public function setUp() { $this->bfa = Better_Font_Awesome_Plugin::get_instance( [] ); + $this->bfa_lib = $this->bfa->get_bfa_lib_instance( [] ); } public function test_props_that_should_never_change() { @@ -13,8 +15,7 @@ public function test_props_that_should_never_change() { $props = array( 'option_name' => 'better-font-awesome_options', 'option_defaults' => array( - 'version' => 'latest', - 'minified' => 1, + 'include_v4_shim' => '', 'remove_existing_fa' => '', 'hide_admin_notices' => '', ), @@ -28,4 +29,118 @@ public function test_props_that_should_never_change() { public function test_bfal_exists() { $this->assertTrue( $this->bfa->bfal_exists() ); } + + /** + * BFA Library Tests + * + * Including here for now until we get BFAL up and running with local tests. + */ + + public function test_bfal_version() { + $this->assertEquals( '5.15.2', $this->bfa_lib->get_version() ); + } + + public function test_get_stylesheet_url() { + $this->assertEquals( 'https://use.fontawesome.com/releases/v5.15.2/css/all.css', $this->bfa_lib->get_stylesheet_url() ); + } + + public function test_get_stylesheet_url_v4_shim() { + $this->assertEquals( 'https://use.fontawesome.com/releases/v5.15.2/css/v4-shims.css', $this->bfa_lib->get_stylesheet_url_v4_shim() ); + } + + public function test_get_icons() { + $expected_icon_keys = [ + 'title', + 'slug', + 'style', + 'base_class', + 'searchTerms', + ]; + + $icons = $this->bfa_lib->get_icons(); + + foreach ( $icons as $icon ) { + foreach ( $expected_icon_keys as $expected_icon_key ) { + $this->assertArrayHasKey( $expected_icon_key, $icon); + } + } + } + + public function test_get_release_icons() { + $expected_icon_keys = [ + 'id', + 'label', + 'membership', + 'styles', + ]; + + $release_icons = $this->bfa_lib->get_release_icons(); + + foreach ( $release_icons as $release_icon ) { + foreach ( $expected_icon_keys as $expected_icon_key ) { + $this->assertArrayHasKey( $expected_icon_key, $release_icon); + } + } + } + + public function test_get_release_assets() { + $assets = $this->bfa_lib->get_release_assets(); + + $release_icons = $this->bfa_lib->get_release_icons(); + + foreach ( $assets as $asset ) { + $this->assertInternalType( 'string', $asset['path'] ); + $this->assertNotEmpty( $asset['path'] ); + } + } + + public function test_get_prefix() { + $this->assertEquals( 'fa', $this->bfa_lib->get_prefix() ); + } + + public function test_render_shortcode() { + $shortcodes = [ + // Minimal props populated. + [ + 'atts' => [ + 'name' => 'bicycle', + ], + 'output' => '', + ], + // All props populated. + [ + 'atts' => [ + 'name' => 'ethereum', + 'style' => 'brands', + 'class' => '2x', + 'unprefixed_class' => 'my-custom-class', + ], + 'output' => '', + ], + // Minimal props populated. + [ + 'atts' => [ + 'name' => 'bicycle', + ], + 'output' => '', + ], + // Properly strip/replace prefixes + [ + 'atts' => [ + 'name' => 'icon-bicycle', + 'class' => 'icon-rotate fa-2x', + ], + 'output' => '', + ] + ]; + + foreach ( $shortcodes as $shortcode ) { + $this->assertEquals( $this->bfa_lib->render_shortcode( $shortcode['atts'] ), $shortcode['output'] ); + } + } + + public function test_get_transient_expiration() { + $this->assertEquals( $this->bfa_lib->get_transient_expiration(), DAY_IN_SECONDS ); + } + }