Merge branch 'release-1.2.7'

archetyped · Feb 27, 2016 · 8a19339 · 8a19339
2 parents 77b0785 + 0278e6b
commit 8a19339
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/includes/class.media.php b/includes/class.media.php
@@ -341,10 +341,10 @@ function post_mime_types($post_mime_types) {
 			$mime_types = $post_mime_types;
 			//Add additional mime types
 			$mime_types_extra = array(
-				'image/png'		=> array(__('PNG Images'), __('Manage PNG Images'), _n_noop('PNG Image <span class="count">(%s)</span>', 'PNG Images <span class="count">(%s)</span>')),
-				'image/gif'		=> array(__('GIF Images'), __('Manage GIF Images'), _n_noop('GIF Image <span class="count">(%s)</span>', 'GIF Images <span class="count">(%s)</span>')),
-				'image/jpeg'	=> array(__('JPG Images'), __('Manage JPG Images'), _n_noop('JPG Image <span class="count">(%s)</span>', 'JPG Images <span class="count">(%s)</span>')),
-				'image/x-icon'	=> array(__('ICO Images'), __('Manage ICO Images'), _n_noop('ICO Image <span class="count">(%s)</span>', 'ICO Images <span class="count">(%s)</span>'))
+				'image/png'		=> array(__('PNG Images', 'favicon-rotator'), __('Manage PNG Images', 'favicon-rotator'), _n_noop('PNG Image <span class="count">(%s)</span>', 'PNG Images <span class="count">(%s)</span>')),
+				'image/gif'		=> array(__('GIF Images', 'favicon-rotator'), __('Manage GIF Images', 'favicon-rotator'), _n_noop('GIF Image <span class="count">(%s)</span>', 'GIF Images <span class="count">(%s)</span>')),
+				'image/jpeg'	=> array(__('JPG Images', 'favicon-rotator'), __('Manage JPG Images', 'favicon-rotator'), _n_noop('JPG Image <span class="count">(%s)</span>', 'JPG Images <span class="count">(%s)</span>')),
+				'image/x-icon'	=> array(__('ICO Images', 'favicon-rotator'), __('Manage ICO Images', 'favicon-rotator'), _n_noop('ICO Image <span class="count">(%s)</span>', 'ICO Images <span class="count">(%s)</span>'))
 			);
 			$mime_types = wp_parse_args($mime_types_extra, $mime_types);
 			//Clear mime types array

diff --git a/main.php b/main.php
@@ -3,9 +3,10 @@
 Plugin Name: Favicon Rotator
 Plugin URI: http://archetyped.com/tools/favicon-rotator/
 Description: Easily set site favicon and even rotate through multiple icons
-Version: 1.2.6
+Version: 1.2.7
 Author: Archetyped
 Author URI: http://archetyped.com
+Text Domain: favicon-rotator
 */
 
 require_once 'model.php';

diff --git a/model.php b/model.php
@@ -430,7 +430,7 @@ function display_icon($type) {
 	function admin_plugin_action_links($actions, $plugin_file, $plugin_data, $context) {
 		//Add link to settings (only if active)
 		if ( is_plugin_active($this->util->get_plugin_base_name()) ) {
-			$settings = __('Settings');
+			$settings = __('Settings', 'favicon-rotator');
 			$settings_url = add_query_arg('page', dirname($this->util->get_plugin_base_name()), admin_url('themes.php'));
 			array_unshift($actions, '<a href="' . $settings_url . '" title="' . $settings . '">' . $settings . '</a>');
 		}
@@ -449,7 +449,7 @@ function admin_get_settings_section() {
 	 * Adds admin submenu item to Appearance menu 
 	 */
 	function admin_menu() {
-		$this->page = $p = add_theme_page(__('Favicon'), __('Favicon'), 'edit_theme_options', $this->util->get_plugin_base(), $this->m('admin_page'));
+		$this->page = $p = add_theme_page(__('Favicon', 'favicon-rotator'), __('Favicon', 'favicon-rotator'), 'edit_theme_options', $this->util->get_plugin_base(), $this->m('admin_page'));
 		//Head
 		add_action("admin_print_scripts-$p", $this->m('admin_scripts'));
 		add_action("admin_print_styles-$p", $this->m('admin_styles'));
@@ -461,7 +461,7 @@ function admin_menu() {
 	 */
 	function admin_page() {
 		if ( ! current_user_can('edit_theme_options') )
-			wp_die(__('You do not have permission to customize favicons.'));
+			wp_die(__('You do not have permission to customize favicons.', 'favicon-rotator'));
 
 		//Get saved icons
 		if ( isset($_POST['fv_submit']) )
@@ -479,7 +479,7 @@ function admin_page() {
 		?>
 	<div class="wrap">
 		<?php screen_icon(); ?>
-		<h2><?php _e('Favicon Rotator'); ?></h2>
+		<h2><?php _e('Favicon Rotator', 'favicon-rotator'); ?></h2>
 		<form method="post" action="<?php echo esc_attr($_SERVER['REQUEST_URI']); ?>">
 		<?php foreach ( $this->get_icon_types() as $tname => $t ) : /* Output UI for icon types */ 
 			$icons = $this->get_icons($t->type_name);
@@ -531,7 +531,7 @@ function admin_page() {
 			<input type="hidden" id="fv_id_<?php echo $t->type_name; ?>" name="fv_id_<?php echo $t->type_name; ?>" value="<?php echo esc_attr($this->get_icon_ids_list($t->type_name)); ?>" />
 		<?php endforeach; /* END UI for icon types */ ?>
 			<?php wp_nonce_field($this->action_save); ?>
-			<p class="submit"><input type="submit" class="button-primary" name="fv_submit" value="<?php esc_attr_e( 'Save Changes' ); ?>" /></p>
+			<p class="submit"><input type="submit" class="button-primary" name="fv_submit" value="<?php esc_attr_e('Save Changes', 'favicon-rotator'); ?>" /></p>
 		</form>
 	</div>
 	<?php 
@@ -565,7 +565,7 @@ function admin_help() {
 			$help = file_get_contents(dirname(__FILE__) . '/resources/admin_help.html');
 			$screen->add_help_tab(array(
 				'id'	=> $this->add_prefix('help'),
-				'title'	=> __('Overview'),
+				'title'	=> __('Overview', 'favicon-rotator'),
 				'content'	=> $help,
 			));
 		}

diff --git a/readme.txt b/readme.txt
@@ -49,6 +49,10 @@ No upgrade notices
 
 == Changelog ==
 
+= 1.2.7 =
+* Add: Text Domain plugin header (for translations)
+* Update: Use plugin-specific text domain for localized strings
+
 = 1.2.6 =
 * Update: WordPress compatibility (4.4)
 * Optimize: PHP standards