Merged in INF-11-need-final-text-domain (pull request #3)

Merge commits for issue INF-11
PressCrew · Jun 10, 2015 · c852460 · c852460
2 parents 4808b06 + b74d98c
commit c852460
Show file tree

Hide file tree

Showing 73 changed files with 510 additions and 500 deletions.
diff --git a/src/404.php b/src/404.php
@@ -21,14 +21,14 @@
 		<header>
 			<h1 class="entry-title">
 				<?php
-					_e( 'Darn it.. Nothing found', 'infinity' );
+					_e( 'Darn it.. Nothing found', 'infinity-engine' );
 				?>
 			</h1>
 		</header>
 		<div class="entry-content">
 			<p>
 				<?php
-					_e( 'Sorry, but nothing matched your search criteria. Please try again with some different keywords.', 'infinity' );
+					_e( 'Sorry, but nothing matched your search criteria. Please try again with some different keywords.', 'infinity-engine' );
 				?>
 			</p>
 			<?php
@@ -41,7 +41,7 @@
 			</div>
 			<div id="search-categories-widget" class="eight columns">
 				<h2 class="widgettitle">
-					<?php _e( 'Most Used Categories', 'infinity' ); ?>
+					<?php _e( 'Most Used Categories', 'infinity-engine' ); ?>
 				</h2>
 				<ul>
 					<?php
@@ -63,7 +63,7 @@
 				$archive_content .=
 					sprintf(
 						/* translators: %1$s: smilie */
-						__( 'Try looking in the monthly archives. %1$s', 'infinity' ),
+						__( 'Try looking in the monthly archives. %1$s', 'infinity-engine' ),
 						convert_smilies( ':)' )
 					);
 				// close archive content

diff --git a/src/archive-template.php b/src/archive-template.php
@@ -47,13 +47,13 @@
 						?>
 						<div class="entry">
 							<?php
-								the_content( '<p class="serif">' . __( 'Read the rest of this page &rarr;', 'infinity' ) . '</p>' );
+								the_content( '<p class="serif">' . __( 'Read the rest of this page &rarr;', 'infinity-engine' ) . '</p>' );
 								get_search_form();
 							?>
 							<div id="archives" class="grid_24">
 								<div id="archives-recent" class="grid_16 alpha">
 									<h4>
-										<?php _e('Last 30 Posts', 'infinity'); ?>
+										<?php _e( 'Last 30 Posts', 'infinity-engine'); ?>
 									</h4>
 									<ul>
 										<?php
@@ -72,7 +72,7 @@
 								</div>
 								<div id="archives-month" class="grid_8 omega">
 									<h4>
-										<?php _e('Archives by Month:', 'infinity'); ?>
+										<?php _e( 'Archives by Month:', 'infinity-engine'); ?>
 									</h4>
 									<ul>
 										<?php
@@ -83,7 +83,7 @@
 							</div>
 						<div id="archives-subject" class="grid_24">
 							<h4>
-								<?php _e('Archives by Subject:', 'infinity'); ?>
+								<?php _e( 'Archives by Subject:', 'infinity-engine'); ?>
 							</h4>
 							<ul>
 								<?php

diff --git a/src/archive.php b/src/archive.php
@@ -23,7 +23,7 @@
 			<h1 class="page-title">
 				<?php
 					printf(
-						__( 'You are browsing the archive for %1$s.', 'infinity' ),
+						__( 'You are browsing the archive for %1$s.', 'infinity-engine' ),
 						wp_title( false, false )
 					);
 				?>

diff --git a/src/comments.php b/src/comments.php
@@ -88,7 +88,7 @@
 				// no further comments message ?>
 				<p class="no-comments">
 					<?php
-						_e( 'Closed to further comments.', 'infinity' );
+						_e( 'Closed to further comments.', 'infinity-engine' );
 					?>
 				</p>
 				<?php
@@ -118,7 +118,7 @@
 								'There are %1$s pings to &ldquo;%2$s&rdquo;',
 								count( $wp_query->comments_by_type['pings'] ),
 								'pings title',
-								'infinity'
+								'infinity-engine'
 							),
 							number_format_i18n( count( $wp_query->comments_by_type['pings'] ) ),
 							get_the_title()
@@ -145,7 +145,7 @@
 				?>
 				<p class="no-comments">
 					<?php
-						_e( 'Comments are closed.', 'infinity' );
+						_e( 'Comments are closed.', 'infinity-engine' );
 					?>
 				</p>
 				<?php

diff --git a/src/engine/ICE/components/options/registry.php b/src/engine/ICE/components/options/registry.php
@@ -289,11 +289,11 @@ public function process_form_ajax()
 
 		// any options saved successfuly?
 		if ( $save_count == 1 ) {
-			ICE_Ajax::responseStd( true, sprintf( __('%d option successfully updated.', 'infinity'), $save_count ) );
+			ICE_Ajax::responseStd( true, sprintf( __( '%d option successfully updated.', 'infinity-engine'), $save_count ) );
 		} elseif ( $save_count > 1 ) {
-			ICE_Ajax::responseStd( true, sprintf( __('%d options successfully updated.', 'infinity'), $save_count ) );
+			ICE_Ajax::responseStd( true, sprintf( __( '%d options successfully updated.', 'infinity-engine'), $save_count ) );
 		} else {
-			ICE_Ajax::responseStd( false, __('An error has occurred. No options were updated.', 'infinity') );
+			ICE_Ajax::responseStd( false, __( 'An error has occurred. No options were updated.', 'infinity-engine') );
 		}
 	}
 }
diff --git a/src/engine/ICE/components/options/renderer.php b/src/engine/ICE/components/options/renderer.php
@@ -142,7 +142,7 @@ public function render_save_one( $class = null )
 	{
 		// begin rendering ?>
 		<a class="<?php $this->merge_classes('ice-options-save', 'ice-options-save-one', $class) ?>" href="#<?php $this->render_name() ?>">
-			<?php _e( 'Save', 'infinity' ); ?>
+			<?php _e( 'Save', 'infinity-engine' ); ?>
 		</a><?php
 	}
 
@@ -155,7 +155,7 @@ public function render_reset_one( $class = null )
 	{
 		// begin rendering ?>
 		<a class="<?php $this->merge_classes('ice-options-save', 'ice-options-reset-one', $class) ?>" href="#<?php $this->render_name() ?>">
-			<?php _e( 'Reset', 'infinity' ); ?>
+			<?php _e( 'Reset', 'infinity-engine' ); ?>
 		</a><?php
 	}
 

diff --git a/src/engine/ICE/dom/style.php b/src/engine/ICE/dom/style.php
@@ -730,7 +730,7 @@ public function add_enum( $key, $desc = null )
 	{
 		if ( !isset( $this->value_helpers[ self::KEY_ENUM ] ) ) {
 			$this->value_helpers[ self::KEY_ENUM ] = ICE_Style_Value::get_flyweight( 'Enum' );
-			$this->value_list[ 'inherit' ] = __( 'Inherit', 'infinity' );
+			$this->value_list[ 'inherit' ] = __( 'Inherit', 'infinity-engine' );
 		}
 
 		$this->value_list[ $key ] = $desc;
@@ -975,10 +975,10 @@ protected function prop_background_repeat()
 	{
 		return
 			ICE_Style_Property_Primitive::create( 'background-repeat' )
-				->add_enum( 'repeat', __( 'Full Tiling', 'infinity' ) )
-				->add_enum( 'repeat-x', __( 'Tile Horizontally Only', 'infinity' ) )
-				->add_enum( 'repeat-y', __( 'Tile Vertically Only', 'infinity' ) )
-				->add_enum( 'no-repeat', __( 'Disable Tiling', 'infinity' ) );
+				->add_enum( 'repeat', __( 'Full Tiling', 'infinity-engine' ) )
+				->add_enum( 'repeat-x', __( 'Tile Horizontally Only', 'infinity-engine' ) )
+				->add_enum( 'repeat-y', __( 'Tile Vertically Only', 'infinity-engine' ) )
+				->add_enum( 'no-repeat', __( 'Disable Tiling', 'infinity-engine' ) );
 	}
 
 	/**
@@ -1000,16 +1000,16 @@ protected function prop_border_style()
 	{
 		return
 			ICE_Style_Property_Primitive::create( 'border-style' )
-				->add_enum( 'none', __( 'No Border', 'infinity' ) )
-				->add_enum( 'hidden', __( 'Hidden', 'infinity' ) )
-				->add_enum( 'dotted', __( 'Dotted', 'infinity' ) )
-				->add_enum( 'dashed', __( 'Dashed', 'infinity' ) )
-				->add_enum( 'solid', __( 'Solid', 'infinity' ) )
-				->add_enum( 'double', __( 'Double', 'infinity' ) )
-				->add_enum( 'groove', __( 'Groove', 'infinity' ) )
-				->add_enum( 'ridge', __( 'Ridge', 'infinity' ) )
-				->add_enum( 'inset', __( 'Inset', 'infinity' ) )
-				->add_enum( 'outset', __( 'Outset', 'infinity' ) );
+				->add_enum( 'none', __( 'No Border', 'infinity-engine' ) )
+				->add_enum( 'hidden', __( 'Hidden', 'infinity-engine' ) )
+				->add_enum( 'dotted', __( 'Dotted', 'infinity-engine' ) )
+				->add_enum( 'dashed', __( 'Dashed', 'infinity-engine' ) )
+				->add_enum( 'solid', __( 'Solid', 'infinity-engine' ) )
+				->add_enum( 'double', __( 'Double', 'infinity-engine' ) )
+				->add_enum( 'groove', __( 'Groove', 'infinity-engine' ) )
+				->add_enum( 'ridge', __( 'Ridge', 'infinity-engine' ) )
+				->add_enum( 'inset', __( 'Inset', 'infinity-engine' ) )
+				->add_enum( 'outset', __( 'Outset', 'infinity-engine' ) );
 	}
 
 	/**
@@ -1023,9 +1023,9 @@ protected function prop_border_width()
 			ICE_Style_Property_Primitive::create( 'border-width' )
 				->add_length()
 				->add_percentage()
-				->add_enum( 'thin', __( 'Thin', 'infinity' ) )
-				->add_enum( 'medium', __( 'Medium', 'infinity' ) )
-				->add_enum( 'thick', __( 'Thick', 'infinity' ) );
+				->add_enum( 'thin', __( 'Thin', 'infinity-engine' ) )
+				->add_enum( 'medium', __( 'Medium', 'infinity-engine' ) )
+				->add_enum( 'thick', __( 'Thick', 'infinity-engine' ) );
 	}
 
 	/**
@@ -1038,22 +1038,22 @@ protected function prop_color( $property = 'color' )
 		return
 			ICE_Style_Property_Primitive::create( $property )
 				->add_color()
-				->add_enum( 'black', __( 'Black', 'infinity' ) )
-				->add_enum( 'silver', __( 'Silver', 'infinity' ) )
-				->add_enum( 'gray', __( 'Gray', 'infinity' ) )
-				->add_enum( 'white', __( 'White', 'infinity' ) )
-				->add_enum( 'maroon', __( 'Maroon', 'infinity' ) )
-				->add_enum( 'red', __( 'Red', 'infinity' ) )
-				->add_enum( 'purple', __( 'Purple', 'infinity' ) )
-				->add_enum( 'fuchsia', __( 'Fuchsia', 'infinity' ) )
-				->add_enum( 'green', __( 'Green', 'infinity' ) )
-				->add_enum( 'lime', __( 'Lime', 'infinity' ) )
-				->add_enum( 'olive', __( 'Olive', 'infinity' ) )
-				->add_enum( 'yellow', __( 'Yellow', 'infinity' ) )
-				->add_enum( 'navy', __( 'Navy', 'infinity' ) )
-				->add_enum( 'blue', __( 'Blue', 'infinity' ) )
-				->add_enum( 'teal', __( 'Teal', 'infinity' ) )
-				->add_enum( 'aqua', __( 'Aqua', 'infinity' ) );
+				->add_enum( 'black', __( 'Black', 'infinity-engine' ) )
+				->add_enum( 'silver', __( 'Silver', 'infinity-engine' ) )
+				->add_enum( 'gray', __( 'Gray', 'infinity-engine' ) )
+				->add_enum( 'white', __( 'White', 'infinity-engine' ) )
+				->add_enum( 'maroon', __( 'Maroon', 'infinity-engine' ) )
+				->add_enum( 'red', __( 'Red', 'infinity-engine' ) )
+				->add_enum( 'purple', __( 'Purple', 'infinity-engine' ) )
+				->add_enum( 'fuchsia', __( 'Fuchsia', 'infinity-engine' ) )
+				->add_enum( 'green', __( 'Green', 'infinity-engine' ) )
+				->add_enum( 'lime', __( 'Lime', 'infinity-engine' ) )
+				->add_enum( 'olive', __( 'Olive', 'infinity-engine' ) )
+				->add_enum( 'yellow', __( 'Yellow', 'infinity-engine' ) )
+				->add_enum( 'navy', __( 'Navy', 'infinity-engine' ) )
+				->add_enum( 'blue', __( 'Blue', 'infinity-engine' ) )
+				->add_enum( 'teal', __( 'Teal', 'infinity-engine' ) )
+				->add_enum( 'aqua', __( 'Aqua', 'infinity-engine' ) );
 	}
 
 	/**
@@ -1077,11 +1077,11 @@ protected function prop_font_family()
 	{
 		return
 			ICE_Style_Property_Primitive::create( 'font-family' )
-				->add_enum( 'serif', __( 'Times (serif)', 'infinity' ) )
-				->add_enum( 'sans-serif', __( 'Helvetica (sans-serif)', 'infinity' ) )
-				->add_enum( 'monospace', __( 'Courier (monospace)', 'infinity' ) )
-				->add_enum( 'cursive', __( 'Zapf-Chancery (cursive)', 'infinity' ) )
-				->add_enum( 'fantasy', __( 'Western (fantasy)', 'infinity' ) );
+				->add_enum( 'serif', __( 'Times (serif)', 'infinity-engine' ) )
+				->add_enum( 'sans-serif', __( 'Helvetica (sans-serif)', 'infinity-engine' ) )
+				->add_enum( 'monospace', __( 'Courier (monospace)', 'infinity-engine' ) )
+				->add_enum( 'cursive', __( 'Zapf-Chancery (cursive)', 'infinity-engine' ) )
+				->add_enum( 'fantasy', __( 'Western (fantasy)', 'infinity-engine' ) );
 	}
 
 	/**
@@ -1093,10 +1093,10 @@ protected function prop_font_weight()
 	{
 		return
 			ICE_Style_Property_Primitive::create( 'font-weight' )
-				->add_enum( 'lighter', __( 'Lighter', 'infinity' ) )
-				->add_enum( 'normal', __( 'Normal', 'infinity' ) )
-				->add_enum( 'bold', __( 'Bold', 'infinity' ) )
-				->add_enum( 'bolder', __( 'Bolder', 'infinity' ) )
+				->add_enum( 'lighter', __( 'Lighter', 'infinity-engine' ) )
+				->add_enum( 'normal', __( 'Normal', 'infinity-engine' ) )
+				->add_enum( 'bold', __( 'Bold', 'infinity-engine' ) )
+				->add_enum( 'bolder', __( 'Bolder', 'infinity-engine' ) )
 				->add_enum( '100', '100' )
 				->add_enum( '200', '200' )
 				->add_enum( '300', '300' )

diff --git a/src/engine/ICE/ext/features/bp/fb-autoconnect/class.php b/src/engine/ICE/ext/features/bp/fb-autoconnect/class.php
@@ -28,8 +28,8 @@ class ICE_Ext_Feature_Bp_Fb_Autoconnect
 	protected function configure()
 	{
 		// set defaults first
-		$this->title = __( 'FaceBook Auto Connect', 'infinity' );
-		$this->description = __( 'Enables FaceBook Auto Connect support', 'infinity' );
+		$this->title = __( 'FaceBook Auto Connect', 'infinity-engine' );
+		$this->description = __( 'Enables FaceBook Auto Connect support', 'infinity-engine' );
 
 		// run parent
 		parent::configure();

diff --git a/src/engine/ICE/ext/features/bp/protect/class.php b/src/engine/ICE/ext/features/bp/protect/class.php
@@ -42,8 +42,8 @@ public function init()
 		parent::init();
 
 		// init properties
-		$this->title = __( 'BuddyPress Protect', 'infinity' );
-		$this->description = __( 'Restrict access to your BuddyPress components to members only', 'infinity' );
+		$this->title = __( 'BuddyPress Protect', 'infinity-engine' );
+		$this->description = __( 'Restrict access to your BuddyPress components to members only', 'infinity-engine' );
 
 		// add action to get_header
 		add_action( 'wp', array($this,'maybe_redirect'), 1 );

diff --git a/src/engine/ICE/ext/features/bp/tour/class.php b/src/engine/ICE/ext/features/bp/tour/class.php
@@ -28,8 +28,8 @@ public function init()
 		parent::init();
 
 		// set property defaults
-		$this->title = __( 'BuddyPress Tour', 'infinity' );
-		$this->description = __( 'Gives users a tour of the BuddyPress activity stream', 'infinity' );
+		$this->title = __( 'BuddyPress Tour', 'infinity-engine' );
+		$this->description = __( 'Gives users a tour of the BuddyPress activity stream', 'infinity-engine' );
 
 		// add action for the activity element renderer
 		add_action( 'bp_before_activity_loop', array( $this, 'render_activity_element' ) );

diff --git a/src/engine/ICE/ext/features/header-logo/class.php b/src/engine/ICE/ext/features/header-logo/class.php
@@ -26,8 +26,8 @@ class ICE_Ext_Feature_Header_Logo
 	protected function configure()
 	{
 		// set defaults first
-		$this->title = __( 'Header Logo', 'infinity' );
-		$this->description = __( 'Custom header logo support', 'infinity' );
+		$this->title = __( 'Header Logo', 'infinity-engine' );
+		$this->description = __( 'Custom header logo support', 'infinity-engine' );
 
 		// run parent
 		parent::configure();

diff --git a/src/engine/ICE/ext/features/scripts/joyride/class.php b/src/engine/ICE/ext/features/scripts/joyride/class.php
@@ -166,8 +166,8 @@ public function init()
 		parent::init();
 
 		// set property defaults
-		$this->title = __( 'Joyride Plugin', 'infinity' );
-		$this->description = __( 'A wrapper for the jQuery Joyride plugin', 'infinity' );
+		$this->title = __( 'Joyride Plugin', 'infinity-engine' );
+		$this->description = __( 'A wrapper for the jQuery Joyride plugin', 'infinity-engine' );
 		$this->id = 'joyRideTipContent';
 		$this->cookie_monster = true;
 		$this->tip_content = '#' . $this->id;

diff --git a/src/engine/ICE/ext/options/categories/class.php b/src/engine/ICE/ext/options/categories/class.php
@@ -42,7 +42,7 @@ public function render_field()
 			'exclude_tree'			=> false,
 			'include'				=> false,
 			'hierarchical'			=> false,
-			'title_li'				=> __( 'Categories', 'infinity' ),
+			'title_li'				=> __( 'Categories', 'infinity-engine' ),
 			'number'				=> null,
 			'echo'					=> true,
 			'depth'					=> false,

diff --git a/src/engine/ICE/ext/options/css/bg-color/class.php b/src/engine/ICE/ext/options/css/bg-color/class.php
@@ -26,8 +26,8 @@ class ICE_Ext_Option_Css_Bg_Color
 	protected function configure()
 	{
 		// set defaults first
-		$this->title = __( 'Background Color', 'infinity' );
-		$this->description = __( 'Choose a background color', 'infinity' );
+		$this->title = __( 'Background Color', 'infinity-engine' );
+		$this->description = __( 'Choose a background color', 'infinity-engine' );
 		$this->style_property = 'background-color';
 
 		// run parent

diff --git a/src/engine/ICE/ext/options/css/bg-image/class.php b/src/engine/ICE/ext/options/css/bg-image/class.php
@@ -25,8 +25,8 @@ class ICE_Ext_Option_Css_Bg_Image
 	protected function configure()
 	{
 		// set defaults first
-		$this->title = __( 'Background Image', 'infinity' );
-		$this->description = __( 'Upload an image to use as the background', 'infinity' );
+		$this->title = __( 'Background Image', 'infinity-engine' );
+		$this->description = __( 'Upload an image to use as the background', 'infinity-engine' );
 		$this->style_property = 'background-image';
 
 		// run parent

diff --git a/src/engine/ICE/ext/options/css/bg-repeat/class.php b/src/engine/ICE/ext/options/css/bg-repeat/class.php
@@ -25,8 +25,8 @@ class ICE_Ext_Option_Css_Bg_Repeat
 	protected function configure()
 	{
 		// set defaults first
-		$this->title = __( 'Background Image Tiling', 'infinity' );
-		$this->description = __( 'Set the tiling mode of the background image', 'infinity' );
+		$this->title = __( 'Background Image Tiling', 'infinity-engine' );
+		$this->description = __( 'Set the tiling mode of the background image', 'infinity-engine' );
 		$this->style_property = 'background-repeat';
 		$this->default_value = 'repeat';
 

diff --git a/src/engine/ICE/ext/options/css/border-style/class.php b/src/engine/ICE/ext/options/css/border-style/class.php
@@ -25,8 +25,8 @@ class ICE_Ext_Option_Css_Border_Style
 	protected function configure()
 	{
 		// set defaults first
-		$this->title = __( 'Border Style', 'infinity' );
-		$this->description = __( 'Choose a style for the border', 'infinity' );
+		$this->title = __( 'Border Style', 'infinity-engine' );
+		$this->description = __( 'Choose a style for the border', 'infinity-engine' );
 		$this->style_property = 'border-style';
 
 		// run parent

diff --git a/src/engine/ICE/ext/options/css/overlay-image/class.php b/src/engine/ICE/ext/options/css/overlay-image/class.php
@@ -25,8 +25,8 @@ class ICE_Ext_Option_Css_Overlay_Image
 	protected function configure()
 	{
 		// set defaults first
-		$this->title = __( 'Background Overlay', 'infinity' );
-		$this->description = __( 'Select a texture to use as the background overlay', 'infinity' );
+		$this->title = __( 'Background Overlay', 'infinity-engine' );
+		$this->description = __( 'Select a texture to use as the background overlay', 'infinity-engine' );
 		$this->item_width = '100px';
 		$this->item_height = '100px';