ntwb / wordpress

tools/i18n/pot-ext-meta.php

Spacing +11 added lines, -11 removed lines

@@ -7,9 +7,9 @@ 
  * @subpackage tools
  */
 
-$pomo = dirname( dirname( dirname( __FILE__ ) ) ) . '/src/wp-includes/pomo';
+$pomo = dirname(dirname(dirname(__FILE__))).'/src/wp-includes/pomo';
 require_once "$pomo/po.php";
-require_once dirname( __FILE__ ) . '/makepot.php';
+require_once dirname(__FILE__).'/makepot.php';
 
 class PotExtMeta {
 
@@ -36,9 +36,9 @@ 
 		$source = $makepot->get_first_lines($ext_filename);
 		$pot = '';
 		$po = new PO;
-		foreach($this->headers as $header) {
+		foreach ($this->headers as $header) {
 			$string = $makepot->get_addon_header($header, $source);
-			if (!$string) continue;
+			if ( ! $string) continue;
 			$args = array(
 				'singular' => $string,
 				'extracted_comments' => $header.' of the plugin/theme',
@@ -49,16 +49,16 @@ 
 		return $pot;
 	}
 
-	function append( $ext_filename, $pot_filename, $headers = null ) {
-		if ( $headers )
+	function append($ext_filename, $pot_filename, $headers = null) {
+		if ($headers)
 			$this->headers = (array) $headers;
-		if ( is_dir( $ext_filename ) ) {
+		if (is_dir($ext_filename)) {
 			$pot = implode('', array_map(array($this, 'load_from_file'), glob("$ext_filename/*.php")));
 		} else {
 			$pot = $this->load_from_file($ext_filename);
 		}
-		$potf = '-' == $pot_filename? STDOUT : fopen($pot_filename, 'a');
-		if (!$potf) return false;
+		$potf = '-' == $pot_filename ? STDOUT : fopen($pot_filename, 'a');
+		if ( ! $potf) return false;
 		fwrite($potf, $pot);
 		if ('-' != $pot_filename) fclose($potf);
 		return true;
@@ -69,10 +69,10 @@ 
 if ($included_files[0] == __FILE__) {
 	ini_set('display_errors', 1);
 	$potextmeta = new PotExtMeta;
-	if (!isset($argv[1])) {
+	if ( ! isset($argv[1])) {
 		$potextmeta->usage();
 	}
-	$potextmeta->append( $argv[1], isset( $argv[2] ) ? $argv[2] : '-', isset( $argv[3] ) ? $argv[3] : null );
+	$potextmeta->append($argv[1], isset($argv[2]) ? $argv[2] : '-', isset($argv[3]) ? $argv[3] : null);
 }
 
 ?>

tools/i18n/not-gettexted.php

Spacing +24 added lines, -24 removed lines

@@ -7,12 +7,12 @@ 
  * @subpackage tools
  */
 // see: http://php.net/tokenizer
-if ( ! defined( 'T_ML_COMMENT' ) )
-	    define( 'T_ML_COMMENT', T_COMMENT );
+if ( ! defined('T_ML_COMMENT'))
+	    define('T_ML_COMMENT', T_COMMENT);
 else
-	    define( 'T_DOC_COMMENT', T_ML_COMMENT );
+	    define('T_DOC_COMMENT', T_ML_COMMENT);
 
-$pomo = dirname( dirname( dirname( __FILE__ ) ) ) . '/src/wp-includes/pomo';
+$pomo = dirname(dirname(dirname(__FILE__))).'/src/wp-includes/pomo';
 require_once "$pomo/po.php";
 require_once "$pomo/mo.php";
 
@@ -26,7 +26,7 @@ 
 	var $STAGE_WHITESPACE_AFTER = 4;
 	var $STAGE_END_COMMENT = 4;
 
-	var $commands = array('extract' => 'command_extract', 'replace' => 'command_replace' );
+	var $commands = array('extract' => 'command_extract', 'replace' => 'command_replace');
 
 
 	function logmsg() {
@@ -34,8 +34,8 @@ 
 		if ($this->enable_logging) error_log(implode(' ', $args));
 	}
 
-	function stderr($msg, $nl=true) {
-		fwrite(STDERR, $msg.($nl? "\n" : ""));
+	function stderr($msg, $nl = true) {
+		fwrite(STDERR, $msg.($nl ? "\n" : ""));
 	}
 
 	function cli_die($msg) {
@@ -43,19 +43,19 @@ 
 		exit(1);
 	}
 
-	function unchanged_token($token, $s='') {
-		return is_array($token)? $token[1] : $token;
+	function unchanged_token($token, $s = '') {
+		return is_array($token) ? $token[1] : $token;
 	}
 
-	function ignore_token($token, $s='') {
+	function ignore_token($token, $s = '') {
 		return '';
 	}
 
 	function list_php_files($dir) {
 		$files = array();
-		$items = scandir( $dir );
-		foreach ( (array) $items as $item ) {
-			$full_item = $dir . '/' . $item;
+		$items = scandir($dir);
+		foreach ((array) $items as $item) {
+			$full_item = $dir.'/'.$item;
 			if ('.' == $item || '..' == $item)
 				continue;
 			if ('.php' == substr($item, -4))
@@ -77,7 +77,7 @@ 
 		return create_function('$token, $string', 'global $'.$m.'; return var_export($'.$m.'->translate($string), true);');
 	}
 
-	function walk_tokens(&$tokens, $string_action, $other_action, $register_action=null) {
+	function walk_tokens(&$tokens, $string_action, $other_action, $register_action = null) {
 
 		$current_comment_id = '';
 		$current_string = '';
@@ -86,7 +86,7 @@ 
 		$result = '';
 		$line = 1;
 
-		foreach($tokens as $token) {
+		foreach ($tokens as $token) {
 			if (is_array($token)) {
 				list($id, $text) = $token;
 				$line += substr_count($text, "\n");
@@ -102,7 +102,7 @@ 
 						$stage = $this->STAGE_END_COMMENT;
 						$this->logmsg('end comment', $current_comment_id);
 						$result .= call_user_func($other_action, $token);
-						if (!is_null($register_action)) call_user_func($register_action, $current_string, $current_comment_id, $current_string_line);
+						if ( ! is_null($register_action)) call_user_func($register_action, $current_string, $current_comment_id, $current_string_line);
 						continue;
 					}
 				} else if (T_CONSTANT_ENCAPSED_STRING == $id) {
@@ -149,21 +149,21 @@ 
 		$global_name = '__entries_'.mt_rand(1, 1000);
 		$GLOBALS[$global_name] = array();
 
-		foreach($filenames as $filename) {
+		foreach ($filenames as $filename) {
 			$tokens = token_get_all(file_get_contents($filename));
 			$aggregator = $this->make_string_aggregator($global_name, $filename);
 			$this->walk_tokens($tokens, array($this, 'ignore_token'), array($this, 'ignore_token'), $aggregator);
 		}
 
-		$potf = '-' == $pot_filename? STDOUT : @fopen($pot_filename, 'a');
+		$potf = '-' == $pot_filename ? STDOUT : @fopen($pot_filename, 'a');
 		if (false === $potf) {
 			$this->cli_die("Couldn't open pot file: $pot_filename");
 		}
 
-		foreach($GLOBALS[$global_name] as $item) {
+		foreach ($GLOBALS[$global_name] as $item) {
 			@list($string, $comment_id, $filename, $line_number) = $item;
-			$filename = isset($filename)? preg_replace('|^\./|', '', $filename) : '';
-			$ref_line_number = isset($line_number)? ":$line_number" : '';
+			$filename = isset($filename) ? preg_replace('|^\./|', '', $filename) : '';
+			$ref_line_number = isset($line_number) ? ":$line_number" : '';
 			$args = array(
 				'singular' => $string,
 				'extracted_comments' => "Not gettexted string $comment_id",
@@ -192,9 +192,9 @@ 
 		if (false === $res) {
 			$this->cli_die("Couldn't read MO file '$mo_filename'!");
 		}
-		foreach($filenames as $filename) {
+		foreach ($filenames as $filename) {
 			$source = file_get_contents($filename);
-			if ( strlen($source) > 150000 ) continue;
+			if (strlen($source) > 150000) continue;
 			$tokens = token_get_all($source);
 			$new_file = $this->walk_tokens($tokens, $replacer, array($this, 'unchanged_token'));
 			$f = fopen($filename, 'w');
@@ -214,7 +214,7 @@ 
 
 	function cli() {
 		global $argv, $commands;
-		if (count($argv) < 4 || !in_array($argv[1], array_keys($this->commands))) {
+		if (count($argv) < 4 || ! in_array($argv[1], array_keys($this->commands))) {
 			$this->usage();
 			exit(1);
 		}

tools/i18n/t/ExtractTest.php

Spacing +63 added lines, -63 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-require_once dirname( dirname( __FILE__ ) ) . '/extract.php';
+require_once dirname(dirname(__FILE__)).'/extract.php';
 
 class ExtractTest extends PHPUnit_Framework_TestCase {
 
@@ -12,126 +12,126 @@ 
 	}
 
 	function test_with_just_a_string() {
-		$expected = new Translation_Entry( array( 'singular' => 'baba', 'references' => array('baba.php:1') ) );
-		$result = $this->extractor->extract_from_code('<?php __("baba"); ?>', 'baba.php' );
-		$this->assertEquals( $expected, $result->entries['baba'] );
+		$expected = new Translation_Entry(array('singular' => 'baba', 'references' => array('baba.php:1')));
+		$result = $this->extractor->extract_from_code('<?php __("baba"); ?>', 'baba.php');
+		$this->assertEquals($expected, $result->entries['baba']);
 	}
 
 	function test_entry_from_call_simple() {
-		$entry = $this->extractor->entry_from_call( array( 'name' => '__', 'args' => array('baba') ), 'baba.php' );
-		$this->assertEquals( $entry, new Translation_Entry( array( 'singular' => 'baba' ) ) );
+		$entry = $this->extractor->entry_from_call(array('name' => '__', 'args' => array('baba')), 'baba.php');
+		$this->assertEquals($entry, new Translation_Entry(array('singular' => 'baba')));
 	}
 
 	function test_entry_from_call_nonexisting_function() {
-		$entry = $this->extractor->entry_from_call( array( 'name' => 'f', 'args' => array('baba') ), 'baba.php' );
-		$this->assertEquals( $entry, null );
+		$entry = $this->extractor->entry_from_call(array('name' => 'f', 'args' => array('baba')), 'baba.php');
+		$this->assertEquals($entry, null);
 	}
 
 	function test_entry_from_call_too_few_args() {
-		$entry = $this->extractor->entry_from_call( array( 'name' => '__', 'args' => array() ), 'baba.php' );
-		$this->assertEquals( $entry, null );
+		$entry = $this->extractor->entry_from_call(array('name' => '__', 'args' => array()), 'baba.php');
+		$this->assertEquals($entry, null);
 	}
 
 	function test_entry_from_call_non_expected_null_arg() {
-		$this->extractor->rules = array( '_nx' => array( 'singular', 'plural', 'context' ) );
-		$entry = $this->extractor->entry_from_call( array( 'name' => '_nx', 'args' => array('%s baba', null, 'noun') ), 'baba.php' );
-		$this->assertEquals( $entry, null );
+		$this->extractor->rules = array('_nx' => array('singular', 'plural', 'context'));
+		$entry = $this->extractor->entry_from_call(array('name' => '_nx', 'args' => array('%s baba', null, 'noun')), 'baba.php');
+		$this->assertEquals($entry, null);
 	}
 
 	function test_entry_from_call_more_args_should_be_ok() {
-		$this->extractor->rules = array( '__' => array('string') );
-		$entry = $this->extractor->entry_from_call( array( 'name' => '__', 'args' => array('baba', 5, 'pijo', null) ), 'baba.php' );
-		$this->assertEquals( $entry, new Translation_Entry( array( 'singular' => 'baba' ) ) );
+		$this->extractor->rules = array('__' => array('string'));
+		$entry = $this->extractor->entry_from_call(array('name' => '__', 'args' => array('baba', 5, 'pijo', null)), 'baba.php');
+		$this->assertEquals($entry, new Translation_Entry(array('singular' => 'baba')));
 	}
 
 
 	function test_entry_from_call_context() {
-		$this->extractor->rules = array( '_x' => array( 'string', 'context' ) );
-		$entry = $this->extractor->entry_from_call( array( 'name' => '_x', 'args' => array('baba', 'noun') ), 'baba.php' );
-		$this->assertEquals( $entry, new Translation_Entry( array( 'singular' => 'baba', 'context' => 'noun' ) ) );
+		$this->extractor->rules = array('_x' => array('string', 'context'));
+		$entry = $this->extractor->entry_from_call(array('name' => '_x', 'args' => array('baba', 'noun')), 'baba.php');
+		$this->assertEquals($entry, new Translation_Entry(array('singular' => 'baba', 'context' => 'noun')));
 	}
 
 	function test_entry_from_call_plural() {
-		$this->extractor->rules = array( '_n' => array( 'singular', 'plural' ) );
-		$entry = $this->extractor->entry_from_call( array( 'name' => '_n', 'args' => array('%s baba', '%s babas') ), 'baba.php' );
-		$this->assertEquals( $entry, new Translation_Entry( array( 'singular' => '%s baba', 'plural' => '%s babas' ) ) );
+		$this->extractor->rules = array('_n' => array('singular', 'plural'));
+		$entry = $this->extractor->entry_from_call(array('name' => '_n', 'args' => array('%s baba', '%s babas')), 'baba.php');
+		$this->assertEquals($entry, new Translation_Entry(array('singular' => '%s baba', 'plural' => '%s babas')));
 	}
 
 	function test_entry_from_call_plural_and_context() {
-		$this->extractor->rules = array( '_nx' => array( 'singular', 'plural', 'context' ) );
-		$entry = $this->extractor->entry_from_call( array( 'name' => '_nx', 'args' => array('%s baba', '%s babas', 'noun') ), 'baba.php' );
-		$this->assertEquals( $entry, new Translation_Entry( array( 'singular' => '%s baba', 'plural' => '%s babas', 'context' => 'noun' ) ) );
+		$this->extractor->rules = array('_nx' => array('singular', 'plural', 'context'));
+		$entry = $this->extractor->entry_from_call(array('name' => '_nx', 'args' => array('%s baba', '%s babas', 'noun')), 'baba.php');
+		$this->assertEquals($entry, new Translation_Entry(array('singular' => '%s baba', 'plural' => '%s babas', 'context' => 'noun')));
 	}
 
 	function test_entry_from_call_extracted_comment() {
-		$entry = $this->extractor->entry_from_call( array( 'name' => '__', 'args' => array('baba'), 'comment' => 'translators: give me back my pants!' ), 'baba.php' );
-		$this->assertEquals( $entry, new Translation_Entry( array( 'singular' => 'baba', 'extracted_comments' => "translators: give me back my pants!\n" ) ) );
+		$entry = $this->extractor->entry_from_call(array('name' => '__', 'args' => array('baba'), 'comment' => 'translators: give me back my pants!'), 'baba.php');
+		$this->assertEquals($entry, new Translation_Entry(array('singular' => 'baba', 'extracted_comments' => "translators: give me back my pants!\n")));
 	}
 
 	function test_entry_from_call_line_number() {
-		$entry = $this->extractor->entry_from_call( array( 'name' => '__', 'args' => array('baba'), 'line' => 10 ), 'baba.php' );
-		$this->assertEquals( $entry, new Translation_Entry( array( 'singular' => 'baba', 'references' => array('baba.php:10') ) ) );
+		$entry = $this->extractor->entry_from_call(array('name' => '__', 'args' => array('baba'), 'line' => 10), 'baba.php');
+		$this->assertEquals($entry, new Translation_Entry(array('singular' => 'baba', 'references' => array('baba.php:10'))));
 	}
 
 	function test_entry_from_call_zero() {
-		$entry = $this->extractor->entry_from_call( array( 'name' => '__', 'args' => array('0') ), 'baba.php' );
-		$this->assertEquals( $entry, new Translation_Entry( array( 'singular' => '0' ) ) );
+		$entry = $this->extractor->entry_from_call(array('name' => '__', 'args' => array('0')), 'baba.php');
+		$this->assertEquals($entry, new Translation_Entry(array('singular' => '0')));
 	}
 
 	function test_entry_from_call_multiple() {
-		$this->extractor->rules = array( 'c' => array( 'string', 'singular', 'plural' ) );
-		$entries = $this->extractor->entry_from_call( array( 'name' => 'c', 'args' => array('baba', 'dyado', 'dyados') ), 'baba.php' );
-		$this->assertEquals( array(
-				new Translation_Entry( array( 'singular' => 'baba' ) ), new Translation_Entry( array( 'singular' => 'dyado', 'plural' => 'dyados' ) ) ), $entries );
+		$this->extractor->rules = array('c' => array('string', 'singular', 'plural'));
+		$entries = $this->extractor->entry_from_call(array('name' => 'c', 'args' => array('baba', 'dyado', 'dyados')), 'baba.php');
+		$this->assertEquals(array(
+				new Translation_Entry(array('singular' => 'baba')), new Translation_Entry(array('singular' => 'dyado', 'plural' => 'dyados')) ), $entries);
 	}
 
 	function test_entry_from_call_multiple_first_plural_then_two_strings() {
-		$this->extractor->rules = array( 'c' => array( 'singular', 'plural', null, 'string', 'string' ) );
-		$entries = $this->extractor->entry_from_call( array( 'name' => 'c', 'args' => array('dyado', 'dyados', 'baba', 'foo', 'bar') ), 'baba.php' );
-		$this->assertEquals( array(
-				new Translation_Entry( array( 'singular' => 'dyado', 'plural' => 'dyados' ) ),
-				new Translation_Entry( array( 'singular' => 'foo' ) ),
-				new Translation_Entry( array( 'singular' => 'bar' ) ) ), $entries );
+		$this->extractor->rules = array('c' => array('singular', 'plural', null, 'string', 'string'));
+		$entries = $this->extractor->entry_from_call(array('name' => 'c', 'args' => array('dyado', 'dyados', 'baba', 'foo', 'bar')), 'baba.php');
+		$this->assertEquals(array(
+				new Translation_Entry(array('singular' => 'dyado', 'plural' => 'dyados')),
+				new Translation_Entry(array('singular' => 'foo')),
+				new Translation_Entry(array('singular' => 'bar')) ), $entries);
 	}
 
 	function test_find_function_calls_one_arg_literal() {
-		$this->assertEquals( array( array( 'name' => '__', 'args' => array( 'baba' ), 'line' => 1 ) ), $this->extractor->find_function_calls( array('__'), '<?php __("baba"); ?>' ) );
+		$this->assertEquals(array(array('name' => '__', 'args' => array('baba'), 'line' => 1)), $this->extractor->find_function_calls(array('__'), '<?php __("baba"); ?>'));
 	}
 
 	function test_find_function_calls_one_arg_zero() {
-		$this->assertEquals( array( array( 'name' => '__', 'args' => array( '0' ), 'line' => 1 ) ), $this->extractor->find_function_calls( array('__'), '<?php __("0"); ?>' ) );
+		$this->assertEquals(array(array('name' => '__', 'args' => array('0'), 'line' => 1)), $this->extractor->find_function_calls(array('__'), '<?php __("0"); ?>'));
 	}
 
 	function test_find_function_calls_one_arg_non_literal() {
-		$this->assertEquals( array( array( 'name' => '__', 'args' => array( null ), 'line' => 1 ) ), $this->extractor->find_function_calls( array('__'), '<?php __("baba" . "dudu"); ?>' ) );
+		$this->assertEquals(array(array('name' => '__', 'args' => array(null), 'line' => 1)), $this->extractor->find_function_calls(array('__'), '<?php __("baba" . "dudu"); ?>'));
 	}
 
 	function test_find_function_calls_shouldnt_be_mistaken_by_a_class() {
-		$this->assertEquals( array(), $this->extractor->find_function_calls( array('__'), '<?php class __ { }; ("dyado");' ) );
+		$this->assertEquals(array(), $this->extractor->find_function_calls(array('__'), '<?php class __ { }; ("dyado");'));
 	}
 
 	function test_find_function_calls_2_args_bad_literal() {
-		$this->assertEquals( array( array( 'name' => 'f', 'args' => array( null, "baba" ), 'line' => 1 ) ), $this->extractor->find_function_calls( array('f'), '<?php f(5, "baba" ); ' ) );
+		$this->assertEquals(array(array('name' => 'f', 'args' => array(null, "baba"), 'line' => 1)), $this->extractor->find_function_calls(array('f'), '<?php f(5, "baba" ); '));
 	}
 
 	function test_find_function_calls_2_args_bad_literal_bad() {
-		$this->assertEquals( array( array( 'name' => 'f', 'args' => array( null, "baba", null ), 'line' => 1 ) ), $this->extractor->find_function_calls( array('f'), '<?php f(5, "baba", 5 ); ' ) );
+		$this->assertEquals(array(array('name' => 'f', 'args' => array(null, "baba", null), 'line' => 1)), $this->extractor->find_function_calls(array('f'), '<?php f(5, "baba", 5 ); '));
 	}
 
 	function test_find_function_calls_1_arg_bad_concat() {
-		$this->assertEquals( array( array( 'name' => 'f', 'args' => array( null ), 'line' => 1 ) ), $this->extractor->find_function_calls( array('f'), '<?php f( "baba" . "baba" ); ' ) );
+		$this->assertEquals(array(array('name' => 'f', 'args' => array(null), 'line' => 1)), $this->extractor->find_function_calls(array('f'), '<?php f( "baba" . "baba" ); '));
 	}
 
 	function test_find_function_calls_1_arg_bad_function_call() {
-		$this->assertEquals( array( array( 'name' => 'f', 'args' => array( null ), 'line' => 1 ) ), $this->extractor->find_function_calls( array('f'), '<?php f( g( "baba" ) ); ' ) );
+		$this->assertEquals(array(array('name' => 'f', 'args' => array(null), 'line' => 1)), $this->extractor->find_function_calls(array('f'), '<?php f( g( "baba" ) ); '));
 	}
 
 	function test_find_function_calls_2_arg_literal_bad() {
-		$this->assertEquals( array( array( 'name' => 'f', 'args' => array( "baba", null ), 'line' => 1 ) ), $this->extractor->find_function_calls( array('f'), '<?php f( "baba", null ); ' ) );
+		$this->assertEquals(array(array('name' => 'f', 'args' => array("baba", null), 'line' => 1)), $this->extractor->find_function_calls(array('f'), '<?php f( "baba", null ); '));
 	}
 
 	function test_find_function_calls_2_arg_bad_with_parens_literal() {
-		$this->assertEquals( array( array( 'name' => 'f', 'args' => array( null, "baba" ), 'line' => 1 ) ), $this->extractor->find_function_calls( array('f'), '<?php f( g( "dyado", "chicho", "lelya "), "baba" ); ' ) );
+		$this->assertEquals(array(array('name' => 'f', 'args' => array(null, "baba"), 'line' => 1)), $this->extractor->find_function_calls(array('f'), '<?php f( g( "dyado", "chicho", "lelya "), "baba" ); '));
 	}
 
 	/**
@@ -139,8 +139,8 @@ 
 	 */
 	function test_find_function_calls_with_comment() {
 		$this->assertEquals(
-			array( array( 'name' => 'f', 'args' => array( 'baba' ), 'line' => 1, 'comment' => 'translators: let your ears fly!' ) ),
-			$this->extractor->find_function_calls( array('f'), '<?php /* translators: let your ears fly! */ f( "baba" ); ' )
+			array(array('name' => 'f', 'args' => array('baba'), 'line' => 1, 'comment' => 'translators: let your ears fly!')),
+			$this->extractor->find_function_calls(array('f'), '<?php /* translators: let your ears fly! */ f( "baba" ); ')
 		);
 	}
 
@@ -149,8 +149,8 @@ 
 	 */
 	function test_find_function_calls_with_not_immediate_comment() {
 		$this->assertEquals(
-			array( array( 'name' => 'f', 'args' => array( 'baba' ), 'line' => 1, 'comment' => 'translators: let your ears fly!' ) ),
-			$this->extractor->find_function_calls( array('f'), '<?php /* translators: let your ears fly! */ $foo = g ( f( "baba" ) ); ' )
+			array(array('name' => 'f', 'args' => array('baba'), 'line' => 1, 'comment' => 'translators: let your ears fly!')),
+			$this->extractor->find_function_calls(array('f'), '<?php /* translators: let your ears fly! */ $foo = g ( f( "baba" ) ); ')
 		);
 	}
 
@@ -159,8 +159,8 @@ 
 	 */
 	function test_find_function_calls_with_not_immediate_comment_include_only_latest() {
 		$this->assertEquals(
-			array( array( 'name' => 'f', 'args' => array( 'baba' ), 'line' => 1, 'comment' => 'translators: let your ears fly!' ) ),
-			$this->extractor->find_function_calls( array('f'), '<?php /* translators: boo */ /* translators: let your ears fly! */ /* baba */ $foo = g ( f( "baba" ) ); ' )
+			array(array('name' => 'f', 'args' => array('baba'), 'line' => 1, 'comment' => 'translators: let your ears fly!')),
+			$this->extractor->find_function_calls(array('f'), '<?php /* translators: boo */ /* translators: let your ears fly! */ /* baba */ $foo = g ( f( "baba" ) ); ')
 		);
 	}
 
@@ -168,11 +168,11 @@ 
 	 * @group comment
 	 */
 	function test_find_function_calls_with_multi_line_comment() {
-		$this->assertEquals( array( array(
-				'name' => '__', 'args' => array( 'on' ), 'line' => 6,
+		$this->assertEquals(array(array(
+				'name' => '__', 'args' => array('on'), 'line' => 6,
 				'comment' => "Translators: If there are characters in your language that are not supported by Lato, translate this to 'off'. Do not translate into your own language."
-			) ),
-			$this->extractor->find_function_calls( array( '__' ),
+			)),
+			$this->extractor->find_function_calls(array('__'),
 				"<?php
 				/*
 				 * Translators: If there are characters in your language that are not supported
@@ -188,8 +188,8 @@ 
 	 */
 	function test_comment_prefix_should_be_case_insensitive() {
 		$this->assertEquals(
-			array( array( 'name' => 'f', 'args' => array( 'baba' ), 'line' => 1, 'comment' => 'Translators: let your ears fly!' ) ),
-			$this->extractor->find_function_calls( array('f'), '<?php /* Translators: let your ears fly! */ f( "baba" ); ' )
+			array(array('name' => 'f', 'args' => array('baba'), 'line' => 1, 'comment' => 'Translators: let your ears fly!')),
+			$this->extractor->find_function_calls(array('f'), '<?php /* Translators: let your ears fly! */ f( "baba" ); ')
 		);
 	}
 }

tools/i18n/t/data/not-gettexted-0-result.php

Spacing +8 added lines, -8 removed lines

@@ -1,23 +1,23 @@
 <?php
 
-if (! isset($wp_did_header)):
-if ( !file_exists( dirname(__FILE__) . '/wp-config.php') ) {
+if ( ! isset($wp_did_header)):
+if ( ! file_exists(dirname(__FILE__).'/wp-config.php')) {
 	if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) $path = '';
 	else $path = 'wp-admin/';
 
-	require_once( dirname(__FILE__) . '/wp-includes/classes.php');
-	require_once( dirname(__FILE__) . '/wp-includes/functions.php');
-	require_once( dirname(__FILE__) . '/wp-includes/plugin.php');
-	wp_die( sprintf(/*WP_I18N_CONFIG*/'Translation: There doesn\'t seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href=\'http://codex.wordpress.org/Editing_wp-config.php\'>We got it</a>. You can create a <code>wp-config.php</code> file through a web interface, but this doesn\'t work for all server setups. The safest way is to manually create the file.</p><p><a href=\'%s\' class=\'button\'>Create a Configuration File</a>' /*/WP_I18N_CONFIG*/, $path.'setup-config.php'), /*WP_I18N_ERROR*/ 'Translation: WordPress &rsaquo; Error' /*/WP_I18N_ERROR*/);
+	require_once(dirname(__FILE__).'/wp-includes/classes.php');
+	require_once(dirname(__FILE__).'/wp-includes/functions.php');
+	require_once(dirname(__FILE__).'/wp-includes/plugin.php');
+	wp_die(sprintf(/*WP_I18N_CONFIG*/'Translation: There doesn\'t seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href=\'http://codex.wordpress.org/Editing_wp-config.php\'>We got it</a>. You can create a <code>wp-config.php</code> file through a web interface, but this doesn\'t work for all server setups. The safest way is to manually create the file.</p><p><a href=\'%s\' class=\'button\'>Create a Configuration File</a>' /*/WP_I18N_CONFIG*/, $path.'setup-config.php'), /*WP_I18N_ERROR*/ 'Translation: WordPress &rsaquo; Error' /*/WP_I18N_ERROR*/);
 }
 
 $wp_did_header = true;
 
-require_once( dirname(__FILE__) . '/wp-config.php');
+require_once(dirname(__FILE__).'/wp-config.php');
 
 wp();
 
-require_once(ABSPATH . WPINC . '/template-loader.php');
+require_once(ABSPATH.WPINC.'/template-loader.php');
 
 endif;
 

tools/i18n/t/data/not-gettexted-0.php

Spacing +8 added lines, -8 removed lines

@@ -1,23 +1,23 @@
 <?php
 
-if (! isset($wp_did_header)):
-if ( !file_exists( dirname(__FILE__) . '/wp-config.php') ) {
+if ( ! isset($wp_did_header)):
+if ( ! file_exists(dirname(__FILE__).'/wp-config.php')) {
 	if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) $path = '';
 	else $path = 'wp-admin/';
 
-	require_once( dirname(__FILE__) . '/wp-includes/classes.php');
-	require_once( dirname(__FILE__) . '/wp-includes/functions.php');
-	require_once( dirname(__FILE__) . '/wp-includes/plugin.php');
-	wp_die( sprintf(/*WP_I18N_CONFIG*/" There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php'>We got it</a>. You can create a <code>wp-config.php</code> file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file.</p><p><a href='%s' class='button'>Create a Configuration File</a>" /*/WP_I18N_CONFIG*/, $path.'setup-config.php'), /*WP_I18N_ERROR*/ "WordPress &rsaquo; Error" /*/WP_I18N_ERROR*/);
+	require_once(dirname(__FILE__).'/wp-includes/classes.php');
+	require_once(dirname(__FILE__).'/wp-includes/functions.php');
+	require_once(dirname(__FILE__).'/wp-includes/plugin.php');
+	wp_die(sprintf(/*WP_I18N_CONFIG*/" There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php'>We got it</a>. You can create a <code>wp-config.php</code> file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file.</p><p><a href='%s' class='button'>Create a Configuration File</a>" /*/WP_I18N_CONFIG*/, $path.'setup-config.php'), /*WP_I18N_ERROR*/ "WordPress &rsaquo; Error" /*/WP_I18N_ERROR*/);
 }
 
 $wp_did_header = true;
 
-require_once( dirname(__FILE__) . '/wp-config.php');
+require_once(dirname(__FILE__).'/wp-config.php');
 
 wp();
 
-require_once(ABSPATH . WPINC . '/template-loader.php');
+require_once(ABSPATH.WPINC.'/template-loader.php');
 
 endif;
 

tools/i18n/t/NotGettextedTest.php

Spacing +14 added lines, -14 removed lines

@@ -5,8 +5,8 @@ 
  * @package wordpress-i18n
  * @subpackage tools
  */
-error_reporting( E_ALL );
-require_once dirname( dirname( __FILE__ ) ) . '/not-gettexted.php';
+error_reporting(E_ALL);
+require_once dirname(dirname(__FILE__)).'/not-gettexted.php';
 
 class NotGettextedTest extends PHPUnit_Framework_TestCase {
 
@@ -16,10 +16,10 @@ 
 
 	function test_make_string_aggregator() {
 		global $baba;
-		$f = $this->ng->make_string_aggregator( 'baba', 'baba.php' );
-		call_user_func( $f, 'x', 'y', 'z' );
-		call_user_func( $f, 'a', 'b', 'c' );
-		$this->assertEquals( array( array( 'x', 'y', 'baba.php', 'z'), array( 'a', 'b', 'baba.php', 'c' ) ), $baba );
+		$f = $this->ng->make_string_aggregator('baba', 'baba.php');
+		call_user_func($f, 'x', 'y', 'z');
+		call_user_func($f, 'a', 'b', 'c');
+		$this->assertEquals(array(array('x', 'y', 'baba.php', 'z'), array('a', 'b', 'baba.php', 'c')), $baba);
 	}
 
 	function test_walk() {
@@ -30,17 +30,17 @@ 
 	if ($x == "18181") { wp_die(sprintf(/*WP_I18N_DIE*/\'We died %d times!\'/*WP_I18N_DIE*/)); }
 ?>';
 		$tokens = token_get_all($code);
-		$this->assertEquals( '', $this->ng->walk_tokens( $tokens, array($this->ng, 'ignore_token'), array($this->ng, 'ignore_token') ) );
-		$this->assertEquals( '"yes"\'We died %d times!\'', $this->ng->walk_tokens( $tokens, array($this->ng, 'unchanged_token'), array($this->ng, 'ignore_token') ) );
-		$this->assertEquals( $code, $this->ng->walk_tokens( $tokens, array($this->ng, 'unchanged_token'), array($this->ng, 'unchanged_token') ) );
-		$this->assertEquals( $code, $this->ng->walk_tokens( $tokens, array($this->ng, 'unchanged_token'), array($this->ng, 'unchanged_token') ) );
+		$this->assertEquals('', $this->ng->walk_tokens($tokens, array($this->ng, 'ignore_token'), array($this->ng, 'ignore_token')));
+		$this->assertEquals('"yes"\'We died %d times!\'', $this->ng->walk_tokens($tokens, array($this->ng, 'unchanged_token'), array($this->ng, 'ignore_token')));
+		$this->assertEquals($code, $this->ng->walk_tokens($tokens, array($this->ng, 'unchanged_token'), array($this->ng, 'unchanged_token')));
+		$this->assertEquals($code, $this->ng->walk_tokens($tokens, array($this->ng, 'unchanged_token'), array($this->ng, 'unchanged_token')));
 	}
 
 	function test_replace() {
 		# copy to a new file, so that we don't corrupt the old one
-		copy( 'data/not-gettexted-0.php', 'data/not-gettexted-0-work.php' );
-		$this->ng->command_replace( 'data/not-gettexted-0.mo', 'data/not-gettexted-0-work.php' );
-		$this->assertEquals( file_get_contents( 'data/not-gettexted-0-result.php' ), file_get_contents( 'data/not-gettexted-0-work.php' ) );
-		unlink( 'data/not-gettexted-0-work.php' );
+		copy('data/not-gettexted-0.php', 'data/not-gettexted-0-work.php');
+		$this->ng->command_replace('data/not-gettexted-0.mo', 'data/not-gettexted-0-work.php');
+		$this->assertEquals(file_get_contents('data/not-gettexted-0-result.php'), file_get_contents('data/not-gettexted-0-work.php'));
+		unlink('data/not-gettexted-0-work.php');
 	}
 }

tools/i18n/add-textdomain.php

Spacing +8 added lines, -8 removed lines

@@ -7,7 +7,7 @@ 
  */
 error_reporting(E_ALL);
 
-require_once dirname( __FILE__ ) . '/makepot.php';
+require_once dirname(__FILE__).'/makepot.php';
 
 class AddTextdomain {
 
@@ -19,14 +19,14 @@ 
 	 */
 	function __construct() {
 		$makepot = new MakePOT;
-		$this->funcs = array_keys( $makepot->rules );
+		$this->funcs = array_keys($makepot->rules);
 	}
 
 	/**
 	 * PHP4 constructor.
 	 */
 	public function AddTextdomain() {
-		_deprecated_constructor( 'AddTextdomain' , '4.3'  );
+		_deprecated_constructor('AddTextdomain', '4.3');
 	}
 
 	function usage() {
@@ -56,7 +56,7 @@ 
 		$parens_balance = 0;
 		$found_domain = false;
 
-		foreach($tokens as $token) {
+		foreach ($tokens as $token) {
 			$string_success = false;
 			if (is_array($token)) {
 				list($id, $text) = $token;
@@ -71,13 +71,13 @@ 
 					}
 				}
 				$token = $text;
-			} elseif ('(' == $token){
+			} elseif ('(' == $token) {
 				$args_started = true;
 				++$parens_balance;
 			} elseif (')' == $token) {
 				--$parens_balance;
 				if ($in_func && 0 == $parens_balance) {
-					$token = $found_domain? ')' : ", '$domain')";
+					$token = $found_domain ? ')' : ", '$domain')";
 					$in_func = false;
 					$args_started = false;
 					$found_domain = false;
@@ -101,14 +101,14 @@ 
 if ($included_files[0] == __FILE__) {
 	$adddomain = new AddTextdomain;
 
-	if (!isset($argv[1]) || !isset($argv[2])) {
+	if ( ! isset($argv[1]) || ! isset($argv[2])) {
 		$adddomain->usage();
 	}
 
 	$inplace = false;
 	if ('-i' == $argv[1]) {
 		$inplace = true;
-		if (!isset($argv[3])) $adddomain->usage();
+		if ( ! isset($argv[3])) $adddomain->usage();
 		array_shift($argv);	
 	}
 

tools/i18n/makepot.php

Spacing +173 added lines, -173 removed lines

@@ -1,10 +1,10 @@ 
 <?php
-require_once dirname( __FILE__ ) . '/not-gettexted.php';
-require_once dirname( __FILE__ ) . '/pot-ext-meta.php';
-require_once dirname( __FILE__ ) . '/extract.php';
+require_once dirname(__FILE__).'/not-gettexted.php';
+require_once dirname(__FILE__).'/pot-ext-meta.php';
+require_once dirname(__FILE__).'/extract.php';
 
-if ( !defined( 'STDERR' ) ) {
-	define( 'STDERR', fopen( 'php://stderr', 'w' ) );
+if ( ! defined('STDERR')) {
+	define('STDERR', fopen('php://stderr', 'w'));
 }
 
 class MakePOT {
@@ -53,7 +53,7 @@ 
 		'comments_number_link' => array('string', 'singular', 'plural'),
 	);
 
-	var $ms_files = array( 'ms-.*', '.*/ms-.*', '.*/my-.*', 'wp-activate\.php', 'wp-signup\.php', 'wp-admin/network\.php', 'wp-admin/includes/ms\.php', 'wp-admin/network/.*\.php', 'wp-admin/includes/class-wp-ms.*' );
+	var $ms_files = array('ms-.*', '.*/ms-.*', '.*/my-.*', 'wp-activate\.php', 'wp-signup\.php', 'wp-admin/network\.php', 'wp-admin/includes/ms\.php', 'wp-admin/network/.*\.php', 'wp-admin/includes/class-wp-ms.*');
 
 	var $temp_files = array();
 
@@ -145,16 +145,16 @@ 
 	);
 
 	function __construct($deprecated = true) {
-		$this->extractor = new StringExtractor( $this->rules );
+		$this->extractor = new StringExtractor($this->rules);
 	}
 
 	function __destruct() {
-		foreach ( $this->temp_files as $temp_file )
-			unlink( $temp_file );
+		foreach ($this->temp_files as $temp_file)
+			unlink($temp_file);
 	}
 
-	function tempnam( $file ) {
-		$tempnam = tempnam( sys_get_temp_dir(), $file );
+	function tempnam($file) {
+		$tempnam = tempnam(sys_get_temp_dir(), $file);
 		$this->temp_files[] = $tempnam;
 		return $tempnam;
 	}
@@ -164,31 +164,31 @@ 
 	}
 
 	function xgettext($project, $dir, $output_file, $placeholders = array(), $excludes = array(), $includes = array()) {
-		$meta = array_merge( $this->meta['default'], $this->meta[$project] );
-		$placeholders = array_merge( $meta, $placeholders );
-		$meta['output'] = $this->realpath_missing( $output_file );
-		$placeholders['year'] = date( 'Y' );
-		$placeholder_keys = array_map( create_function( '$x', 'return "{".$x."}";' ), array_keys( $placeholders ) );
-		$placeholder_values = array_values( $placeholders );
-		foreach($meta as $key => $value) {
+		$meta = array_merge($this->meta['default'], $this->meta[$project]);
+		$placeholders = array_merge($meta, $placeholders);
+		$meta['output'] = $this->realpath_missing($output_file);
+		$placeholders['year'] = date('Y');
+		$placeholder_keys = array_map(create_function('$x', 'return "{".$x."}";'), array_keys($placeholders));
+		$placeholder_values = array_values($placeholders);
+		foreach ($meta as $key => $value) {
 			$meta[$key] = str_replace($placeholder_keys, $placeholder_values, $value);
 		}
 
-		$originals = $this->extractor->extract_from_directory( $dir, $excludes, $includes );
+		$originals = $this->extractor->extract_from_directory($dir, $excludes, $includes);
 		$pot = new PO;
 		$pot->entries = $originals->entries;
 
-		$pot->set_header( 'Project-Id-Version', $meta['package-name'].' '.$meta['package-version'] );
-		$pot->set_header( 'Report-Msgid-Bugs-To', $meta['msgid-bugs-address'] );
-		$pot->set_header( 'POT-Creation-Date', gmdate( 'Y-m-d H:i:s+00:00' ) );
-		$pot->set_header( 'MIME-Version', '1.0' );
-		$pot->set_header( 'Content-Type', 'text/plain; charset=UTF-8' );
-		$pot->set_header( 'Content-Transfer-Encoding', '8bit' );
-		$pot->set_header( 'PO-Revision-Date', date( 'Y') . '-MO-DA HO:MI+ZONE' );
-		$pot->set_header( 'Last-Translator', 'FULL NAME <EMAIL@ADDRESS>' );
-		$pot->set_header( 'Language-Team', 'LANGUAGE <LL@li.org>' );
-		$pot->set_comment_before_headers( $meta['comments'] );
-		$pot->export_to_file( $output_file );
+		$pot->set_header('Project-Id-Version', $meta['package-name'].' '.$meta['package-version']);
+		$pot->set_header('Report-Msgid-Bugs-To', $meta['msgid-bugs-address']);
+		$pot->set_header('POT-Creation-Date', gmdate('Y-m-d H:i:s+00:00'));
+		$pot->set_header('MIME-Version', '1.0');
+		$pot->set_header('Content-Type', 'text/plain; charset=UTF-8');
+		$pot->set_header('Content-Transfer-Encoding', '8bit');
+		$pot->set_header('PO-Revision-Date', date('Y').'-MO-DA HO:MI+ZONE');
+		$pot->set_header('Last-Translator', 'FULL NAME <EMAIL@ADDRESS>');
+		$pot->set_header('Language-Team', 'LANGUAGE <LL@li.org>');
+		$pot->set_comment_before_headers($meta['comments']);
+		$pot->export_to_file($output_file);
 		return true;
 	}
 
@@ -199,203 +199,203 @@ 
 			'default_output' => 'wordpress.pot',
 			'includes' => array(),
 			'excludes' => array_merge(
-				array('wp-admin/includes/continents-cities\.php', 'wp-content/themes/twenty.*', ),
+				array('wp-admin/includes/continents-cities\.php', 'wp-content/themes/twenty.*',),
 				$this->ms_files
 			),
 			'extract_not_gettexted' => false,
 			'not_gettexted_files_filter' => false,
 		);
-		$args = array_merge( $defaults, $args );
-		extract( $args );
+		$args = array_merge($defaults, $args);
+		extract($args);
 		$placeholders = array();
-		if ( $wp_version = $this->wp_version( $dir ) )
+		if ($wp_version = $this->wp_version($dir))
 			$placeholders['version'] = $wp_version;
 		else
 			return false;
-		$output = is_null( $output )? $default_output : $output;
-		$res = $this->xgettext( $project, $dir, $output, $placeholders, $excludes, $includes );
-		if ( !$res ) return false;
+		$output = is_null($output) ? $default_output : $output;
+		$res = $this->xgettext($project, $dir, $output, $placeholders, $excludes, $includes);
+		if ( ! $res) return false;
 
-		if ( $extract_not_gettexted ) {
+		if ($extract_not_gettexted) {
 			$old_dir = getcwd();
-			$output = realpath( $output );
-			chdir( $dir );
+			$output = realpath($output);
+			chdir($dir);
 			$php_files = NotGettexted::list_php_files('.');
-			$php_files = array_filter( $php_files, $not_gettexted_files_filter );
+			$php_files = array_filter($php_files, $not_gettexted_files_filter);
 			$not_gettexted = new NotGettexted;
-			$res = $not_gettexted->command_extract( $output, $php_files );
-			chdir( $old_dir );
+			$res = $not_gettexted->command_extract($output, $php_files);
+			chdir($old_dir);
 			/* Adding non-gettexted strings can repeat some phrases */
-			$output_shell = escapeshellarg( $output );
-			system( "msguniq --use-first $output_shell -o $output_shell" );
+			$output_shell = escapeshellarg($output);
+			system("msguniq --use-first $output_shell -o $output_shell");
 		}
 		return $res;
 	}
 
 	function wp_core($dir, $output) {
-		if ( file_exists( "$dir/wp-admin/user/about.php" ) ) return false;
+		if (file_exists("$dir/wp-admin/user/about.php")) return false;
 
-		return $this->wp_generic( $dir, array(
+		return $this->wp_generic($dir, array(
 			'project' => 'wp-core', 'output' => $output,
 			'extract_not_gettexted' => true,
-			'not_gettexted_files_filter' => array( $this, 'is_not_ms_file' ),
-		) );
+			'not_gettexted_files_filter' => array($this, 'is_not_ms_file'),
+		));
 	}
 
-	function wp_frontend( $dir, $output ) {
-		if ( ! file_exists( "$dir/wp-admin/user/about.php" ) ) {
+	function wp_frontend($dir, $output) {
+		if ( ! file_exists("$dir/wp-admin/user/about.php")) {
 			return false;
 		}
 
-		$excludes = array( 'wp-admin/.*', 'wp-content/themes/.*', 'wp-includes/class-pop3\.php' );
+		$excludes = array('wp-admin/.*', 'wp-content/themes/.*', 'wp-includes/class-pop3\.php');
 
 		// Exclude Akismet all together for 3.9+.
-		if ( file_exists( "$dir/wp-admin/css/about.css" ) ) {
+		if (file_exists("$dir/wp-admin/css/about.css")) {
 			$excludes[] = 'wp-content/plugins/akismet/.*';
 		}
 
-		return $this->wp_generic( $dir, array(
+		return $this->wp_generic($dir, array(
 			'project' => 'wp-frontend', 'output' => $output,
 			'includes' => array(),
 			'excludes' => $excludes,
 			'default_output' => 'wordpress.pot',
-		) );
+		));
 	}
 
 	function wp_admin($dir, $output) {
-		if ( ! file_exists( "$dir/wp-admin/user/about.php" ) ) {
+		if ( ! file_exists("$dir/wp-admin/user/about.php")) {
 			return false;
 		}
 
-		$frontend_pot = $this->tempnam( 'frontend.pot' );
-		if ( false === $frontend_pot ) {
+		$frontend_pot = $this->tempnam('frontend.pot');
+		if (false === $frontend_pot) {
 			return false;
 		}
 
-		$frontend_result = $this->wp_frontend( $dir, $frontend_pot );
-		if ( ! $frontend_result ) {
+		$frontend_result = $this->wp_frontend($dir, $frontend_pot);
+		if ( ! $frontend_result) {
 			return false;
 		}
 
-		$result = $this->wp_generic( $dir, array(
+		$result = $this->wp_generic($dir, array(
 			'project' => 'wp-admin', 'output' => $output,
-			'includes' => array( 'wp-admin/.*' ),
-			'excludes' => array( 'wp-admin/includes/continents-cities\.php', 'wp-admin/network/.*', 'wp-admin/network.php' ),
+			'includes' => array('wp-admin/.*'),
+			'excludes' => array('wp-admin/includes/continents-cities\.php', 'wp-admin/network/.*', 'wp-admin/network.php'),
 			'default_output' => 'wordpress-admin.pot',
-		) );
-		if ( ! $result ) {
+		));
+		if ( ! $result) {
 			return false;
 		}
 
 		$potextmeta = new PotExtMeta;
 
-		if ( ! file_exists( "$dir/wp-admin/css/about.css" ) ) { // < 3.9
-			$result = $potextmeta->append( "$dir/wp-content/plugins/akismet/akismet.php", $output );
-			if ( ! $result ) {
+		if ( ! file_exists("$dir/wp-admin/css/about.css")) { // < 3.9
+			$result = $potextmeta->append("$dir/wp-content/plugins/akismet/akismet.php", $output);
+			if ( ! $result) {
 				return false;
 			}
 		}
 
-		$result = $potextmeta->append( "$dir/wp-content/plugins/hello.php", $output );
-		if ( ! $result ) {
+		$result = $potextmeta->append("$dir/wp-content/plugins/hello.php", $output);
+		if ( ! $result) {
 			return false;
 		}
 
 		/* Adding non-gettexted strings can repeat some phrases */
-		$output_shell = escapeshellarg( $output );
-		system( "msguniq $output_shell -o $output_shell" );
+		$output_shell = escapeshellarg($output);
+		system("msguniq $output_shell -o $output_shell");
 
-		$common_pot = $this->tempnam( 'common.pot' );
-		if ( ! $common_pot ) {
+		$common_pot = $this->tempnam('common.pot');
+		if ( ! $common_pot) {
 			return false;
 		}
-		$admin_pot = realpath( is_null( $output ) ? 'wordpress-admin.pot' : $output );
-		system( "msgcat --more-than=1 --use-first $frontend_pot $admin_pot > $common_pot" );
-		system( "msgcat -u --use-first $admin_pot $common_pot -o $admin_pot" );
+		$admin_pot = realpath(is_null($output) ? 'wordpress-admin.pot' : $output);
+		system("msgcat --more-than=1 --use-first $frontend_pot $admin_pot > $common_pot");
+		system("msgcat -u --use-first $admin_pot $common_pot -o $admin_pot");
 		return true;
 	}
 
 	function wp_network_admin($dir, $output) {
-		if ( ! file_exists( "$dir/wp-admin/user/about.php" ) ) return false;
+		if ( ! file_exists("$dir/wp-admin/user/about.php")) return false;
 
-		$frontend_pot = $this->tempnam( 'frontend.pot' );
-		if ( false === $frontend_pot ) return false;
+		$frontend_pot = $this->tempnam('frontend.pot');
+		if (false === $frontend_pot) return false;
 
-		$frontend_result = $this->wp_frontend( $dir, $frontend_pot );
-		if ( ! $frontend_result )
+		$frontend_result = $this->wp_frontend($dir, $frontend_pot);
+		if ( ! $frontend_result)
 			return false;
 
-		$admin_pot = $this->tempnam( 'admin.pot' );
-		if ( false === $admin_pot ) return false;
+		$admin_pot = $this->tempnam('admin.pot');
+		if (false === $admin_pot) return false;
 
-		$admin_result = $this->wp_admin( $dir, $admin_pot );
-		if ( ! $admin_result )
+		$admin_result = $this->wp_admin($dir, $admin_pot);
+		if ( ! $admin_result)
 			return false;
 
-		$result = $this->wp_generic( $dir, array(
+		$result = $this->wp_generic($dir, array(
 			'project' => 'wp-network-admin', 'output' => $output,
-			'includes' => array( 'wp-admin/network/.*', 'wp-admin/network.php' ),
+			'includes' => array('wp-admin/network/.*', 'wp-admin/network.php'),
 			'excludes' => array(),
 			'default_output' => 'wordpress-admin-network.pot',
-		) );
+		));
 
-		if ( ! $result ) {
+		if ( ! $result) {
 			return false;
 		}
 
-		$common_pot = $this->tempnam( 'common.pot' );
-		if ( ! $common_pot )
+		$common_pot = $this->tempnam('common.pot');
+		if ( ! $common_pot)
 			return false;
 
-		$net_admin_pot = realpath( is_null( $output ) ? 'wordpress-network-admin.pot' : $output );
-		system( "msgcat --more-than=1 --use-first $frontend_pot $admin_pot $net_admin_pot > $common_pot" );
-		system( "msgcat -u --use-first $net_admin_pot $common_pot -o $net_admin_pot" );
+		$net_admin_pot = realpath(is_null($output) ? 'wordpress-network-admin.pot' : $output);
+		system("msgcat --more-than=1 --use-first $frontend_pot $admin_pot $net_admin_pot > $common_pot");
+		system("msgcat -u --use-first $net_admin_pot $common_pot -o $net_admin_pot");
 		return true;
 	}
 
 	function wp_ms($dir, $output) {
-		if ( file_exists( "$dir/wp-admin/user/about.php" ) ) return false;
-		if ( !is_file("$dir/wp-admin/ms-users.php") ) return false;
-		$core_pot = $this->tempnam( 'wordpress.pot' );
-		if ( false === $core_pot ) return false;
-		$core_result = $this->wp_core( $dir, $core_pot );
-		if ( ! $core_result )
+		if (file_exists("$dir/wp-admin/user/about.php")) return false;
+		if ( ! is_file("$dir/wp-admin/ms-users.php")) return false;
+		$core_pot = $this->tempnam('wordpress.pot');
+		if (false === $core_pot) return false;
+		$core_result = $this->wp_core($dir, $core_pot);
+		if ( ! $core_result)
 			return false;
-		$ms_result = $this->wp_generic( $dir, array(
+		$ms_result = $this->wp_generic($dir, array(
 			'project' => 'wp-ms', 'output' => $output,
 			'includes' => $this->ms_files,
 			'excludes' => array(),
 			'default_output' => 'wordpress-ms.pot',
 			'extract_not_gettexted' => true,
-			'not_gettexted_files_filter' => array( $this, 'is_ms_file' ),
-		) );
-		if ( !$ms_result ) {
+			'not_gettexted_files_filter' => array($this, 'is_ms_file'),
+		));
+		if ( ! $ms_result) {
 			return false;
 		}
-		$common_pot = $this->tempnam( 'common.pot' );
-		if ( ! $common_pot )
+		$common_pot = $this->tempnam('common.pot');
+		if ( ! $common_pot)
 			return false;
-		$ms_pot = realpath( is_null( $output )? 'wordpress-ms.pot' : $output );
-		system( "msgcat --more-than=1 --use-first $core_pot $ms_pot > $common_pot" );
-		system( "msgcat -u --use-first $ms_pot $common_pot -o $ms_pot" );
+		$ms_pot = realpath(is_null($output) ? 'wordpress-ms.pot' : $output);
+		system("msgcat --more-than=1 --use-first $core_pot $ms_pot > $common_pot");
+		system("msgcat -u --use-first $ms_pot $common_pot -o $ms_pot");
 		return true;
 	}
 
 	function wp_tz($dir, $output) {
 		$continents_path = 'wp-admin/includes/continents-cities.php';
-		if ( !file_exists( "$dir/$continents_path" ) ) return false;
-		return $this->wp_generic( $dir, array(
+		if ( ! file_exists("$dir/$continents_path")) return false;
+		return $this->wp_generic($dir, array(
 			'project' => 'wp-tz', 'output' => $output,
-			'includes' => array( $continents_path ),
+			'includes' => array($continents_path),
 			'excludes' => array(),
 			'default_output' => 'wordpress-continents-cities.pot',
-		) );
+		));
 	}
 
 	function wp_version($dir) {
 		$version_php = $dir.'/wp-includes/version.php';
-		if ( !is_readable( $version_php ) ) return false;
-		return preg_match( '/\$wp_version\s*=\s*\'(.*?)\';/', file_get_contents( $version_php ), $matches )? $matches[1] : false;
+		if ( ! is_readable($version_php)) return false;
+		return preg_match('/\$wp_version\s*=\s*\'(.*?)\';/', file_get_contents($version_php), $matches) ? $matches[1] : false;
 	}
 
 
@@ -404,23 +404,23 @@ 
 		if (preg_match('/\$wpmu_version\s*=\s*\'(.*?)\';/', file_get_contents($dir.'/wp-includes/version.php'), $matches)) {
 			$placeholders['version'] = $matches[1];
 		}
-		$output = is_null($output)? 'wordpress.pot' : $output;
+		$output = is_null($output) ? 'wordpress.pot' : $output;
 		return $this->xgettext('wp', $dir, $output, $placeholders);
 	}
 
 
 	function bb($dir, $output) {
 		$placeholders = array();
-		$output = is_null($output)? 'bbpress.pot' : $output;
+		$output = is_null($output) ? 'bbpress.pot' : $output;
 		return $this->xgettext('bb', $dir, $output, $placeholders);
 
 	}
 
 	function get_first_lines($filename, $lines = 30) {
 		$extf = fopen($filename, 'r');
-		if (!$extf) return false;
+		if ( ! $extf) return false;
 		$first_lines = '';
-		foreach(range(1, $lines) as $x) {
+		foreach (range(1, $lines) as $x) {
 			$line = fgets($extf);
 			if (feof($extf)) break;
 			if (false === $line) {
@@ -440,7 +440,7 @@ 
 	}
 
 	function generic($dir, $output) {
-		$output = is_null($output)? "generic.pot" : $output;
+		$output = is_null($output) ? "generic.pot" : $output;
 		return $this->xgettext('generic', $dir, $output, array());
 	}
 
@@ -462,41 +462,41 @@ 
 			$slug = $this->guess_plugin_slug($dir);
 		}
 
-		$plugins_dir = @opendir( $dir );
+		$plugins_dir = @opendir($dir);
 		$plugin_files = array();
-		if ( $plugins_dir ) {
-			while ( ( $file = readdir( $plugins_dir ) ) !== false ) {
-				if ( '.' === substr( $file, 0, 1 ) ) {
+		if ($plugins_dir) {
+			while (($file = readdir($plugins_dir)) !== false) {
+				if ('.' === substr($file, 0, 1)) {
 					continue;
 				}
 
-				if ( '.php' === substr( $file, -4 ) ) {
+				if ('.php' === substr($file, -4)) {
 					$plugin_files[] = $file;
 				}
 			}
-			closedir( $plugins_dir );
+			closedir($plugins_dir);
 		}
 
-		if ( empty( $plugin_files ) ) {
+		if (empty($plugin_files)) {
 			return false;
 		}
 
 		$main_file = '';
-		foreach ( $plugin_files as $plugin_file ) {
-			if ( ! is_readable( "$dir/$plugin_file" ) ) {
+		foreach ($plugin_files as $plugin_file) {
+			if ( ! is_readable("$dir/$plugin_file")) {
 				continue;
 			}
 
-			$source = $this->get_first_lines( "$dir/$plugin_file", $this->max_header_lines );
+			$source = $this->get_first_lines("$dir/$plugin_file", $this->max_header_lines);
 
 			// Stop when we find a file with a plugin name header in it.
-			if ( $this->get_addon_header( 'Plugin Name', $source ) != false ) {
+			if ($this->get_addon_header('Plugin Name', $source) != false) {
 				$main_file = "$dir/$plugin_file";
 				break;
 			}
 		}
 
-		if ( empty( $main_file ) ) {
+		if (empty($main_file)) {
 			return false;
 		}
 
@@ -505,9 +505,9 @@ 
 		$placeholders['name'] = $this->get_addon_header('Plugin Name', $source);
 		$placeholders['slug'] = $slug;
 
-		$output = is_null($output)? "$slug.pot" : $output;
+		$output = is_null($output) ? "$slug.pot" : $output;
 		$res = $this->xgettext('wp-plugin', $dir, $output, $placeholders);
-		if (!$res) return false;
+		if ( ! $res) return false;
 		$potextmeta = new PotExtMeta;
 		$res = $potextmeta->append($main_file, $output);
 		/* Adding non-gettexted strings can repeat some phrases */
@@ -530,37 +530,37 @@ 
 		$placeholders['name'] = $this->get_addon_header('Theme Name', $source);
 		$placeholders['slug'] = $slug;
 
-		$license = $this->get_addon_header( 'License', $source );
-		if ( $license )
+		$license = $this->get_addon_header('License', $source);
+		if ($license)
 			$this->meta['wp-theme']['comments'] = "Copyright (C) {year} {author}\nThis file is distributed under the {$license}.";
 		else
 			$this->meta['wp-theme']['comments'] = "Copyright (C) {year} {author}\nThis file is distributed under the same license as the {package-name} package.";
 
-		$output = is_null($output)? "$slug.pot" : $output;
+		$output = is_null($output) ? "$slug.pot" : $output;
 		$res = $this->xgettext('wp-theme', $dir, $output, $placeholders);
-		if (! $res )
+		if ( ! $res)
 			return false;
 		$potextmeta = new PotExtMeta;
-		$res = $potextmeta->append( $main_file, $output, array( 'Theme Name', 'Theme URI', 'Description', 'Author', 'Author URI' ) );
-		if ( ! $res )
+		$res = $potextmeta->append($main_file, $output, array('Theme Name', 'Theme URI', 'Description', 'Author', 'Author URI'));
+		if ( ! $res)
 			return false;
 		// If we're dealing with a pre-3.4 default theme, don't extract page templates before 3.4.
-		$extract_templates = ! in_array( $slug, array( 'twentyten', 'twentyeleven', 'default', 'classic' ) );
-		if ( ! $extract_templates ) {
-			$wp_dir = dirname( dirname( dirname( $dir ) ) );
-			$extract_templates = file_exists( "$wp_dir/wp-admin/user/about.php" ) || ! file_exists( "$wp_dir/wp-load.php" );
+		$extract_templates = ! in_array($slug, array('twentyten', 'twentyeleven', 'default', 'classic'));
+		if ( ! $extract_templates) {
+			$wp_dir = dirname(dirname(dirname($dir)));
+			$extract_templates = file_exists("$wp_dir/wp-admin/user/about.php") || ! file_exists("$wp_dir/wp-load.php");
 		}
-		if ( $extract_templates ) {
-			$res = $potextmeta->append( $dir, $output, array( 'Template Name' ) );
-			if ( ! $res )
+		if ($extract_templates) {
+			$res = $potextmeta->append($dir, $output, array('Template Name'));
+			if ( ! $res)
 				return false;
-			$files = scandir( $dir );
-			foreach ( $files as $file ) {
-				if ( '.' == $file[0] || 'CVS' == $file )
+			$files = scandir($dir);
+			foreach ($files as $file) {
+				if ('.' == $file[0] || 'CVS' == $file)
 					continue;
-				if ( is_dir( $dir . '/' . $file ) ) {
-					$res = $potextmeta->append( $dir . '/' . $file, $output, array( 'Template Name' ) );
-					if ( ! $res )
+				if (is_dir($dir.'/'.$file)) {
+					$res = $potextmeta->append($dir.'/'.$file, $output, array('Template Name'));
+					if ( ! $res)
 						return false;
 				}
 			}
@@ -572,47 +572,47 @@ 
 	}
 
 	function bp($dir, $output) {
-		$output = is_null($output)? "buddypress.pot" : $output;
+		$output = is_null($output) ? "buddypress.pot" : $output;
 		return $this->xgettext('bp', $dir, $output, array(), array('bp-forums/bbpress/.*'));
 	}
 
-	function glotpress( $dir, $output ) {
-		$output = is_null( $output ) ? "glotpress.pot" : $output;
-		return $this->xgettext( 'glotpress', $dir, $output );
+	function glotpress($dir, $output) {
+		$output = is_null($output) ? "glotpress.pot" : $output;
+		return $this->xgettext('glotpress', $dir, $output);
 	}
 
-	function wporg_bb_forums( $dir, $output ) {
-		$output = is_null( $output ) ? 'wporg.pot' : $output;
-		return $this->xgettext( 'wporg-bb-forums', $dir, $output, array(), array(
+	function wporg_bb_forums($dir, $output) {
+		$output = is_null($output) ? 'wporg.pot' : $output;
+		return $this->xgettext('wporg-bb-forums', $dir, $output, array(), array(
 			'bb-plugins/elfakismet/.*',
 			'bb-plugins/support-forum/.*',
-		) );
+		));
 	}
 
-	function rosetta( $dir, $output ) {
-		$output = is_null( $output )? 'rosetta.pot' : $output;
-		return $this->xgettext( 'rosetta', $dir, $output, array(), array(), array(
+	function rosetta($dir, $output) {
+		$output = is_null($output) ? 'rosetta.pot' : $output;
+		return $this->xgettext('rosetta', $dir, $output, array(), array(), array(
 			'mu-plugins/(roles|showcase|downloads)/.*\.php',
 			'mu-plugins/rosetta.*\.php',
 			'mu-plugins/rosetta/[^/]+\.php',
 			'mu-plugins/rosetta/tmpl/.*\.php',
 			'themes/rosetta/.*\.php',
-		) );
+		));
 	}
 
-	function is_ms_file( $file_name ) {
+	function is_ms_file($file_name) {
 		$is_ms_file = false;
-		$prefix = substr( $file_name, 0, 2 ) === './'? '\./' : '';
-		foreach( $this->ms_files as $ms_file )
-			if ( preg_match( '|^'.$prefix.$ms_file.'$|', $file_name ) ) {
+		$prefix = substr($file_name, 0, 2) === './' ? '\./' : '';
+		foreach ($this->ms_files as $ms_file)
+			if (preg_match('|^'.$prefix.$ms_file.'$|', $file_name)) {
 				$is_ms_file = true;
 				break;
 			}
 		return $is_ms_file;
 	}
 
-	function is_not_ms_file( $file_name ) {
-		return !$this->is_ms_file( $file_name );
+	function is_not_ms_file($file_name) {
+		return ! $this->is_ms_file($file_name);
 	}
 }
 
@@ -622,7 +622,7 @@ 
 if ($included_files[0] == __FILE__) {
 	$makepot = new MakePOT;
 	if ((3 == count($argv) || 4 == count($argv)) && in_array($method = str_replace('-', '_', $argv[1]), get_class_methods($makepot))) {
-		$res = call_user_func(array($makepot, $method), realpath($argv[2]), isset($argv[3])? $argv[3] : null);
+		$res = call_user_func(array($makepot, $method), realpath($argv[2]), isset($argv[3]) ? $argv[3] : null);
 		if (false === $res) {
 			fwrite(STDERR, "Couldn't generate POT file!\n");
 		}

tools/i18n/extract.php

Spacing +76 added lines, -76 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-$pomo = dirname( dirname( dirname( __FILE__ ) ) ) . '/src/wp-includes/pomo';
+$pomo = dirname(dirname(dirname(__FILE__))).'/src/wp-includes/pomo';
 require_once "$pomo/entry.php";
 require_once "$pomo/translations.php";
 
@@ -10,55 +10,55 @@ 
 class StringExtractor {
 
 	var $rules = array(
-		'__' => array( 'string' ),
-		'_e' => array( 'string' ),
-		'_n' => array( 'singular', 'plural' ),
+		'__' => array('string'),
+		'_e' => array('string'),
+		'_n' => array('singular', 'plural'),
 	);
 	var $comment_prefix = 'translators:';
 
-	function __construct( $rules = array() ) {
+	function __construct($rules = array()) {
 		$this->rules = $rules;
 	}
 
-	function extract_from_directory( $dir, $excludes = array(), $includes = array(), $prefix = '' ) {
+	function extract_from_directory($dir, $excludes = array(), $includes = array(), $prefix = '') {
 		$old_cwd = getcwd();
-		chdir( $dir );
+		chdir($dir);
 		$translations = new Translations;
-		$file_names = (array) scandir( '.' );
-		foreach ( $file_names as $file_name ) {
-			if ( '.' == $file_name || '..' == $file_name ) continue;
-			if ( preg_match( '/\.php$/', $file_name ) && $this->does_file_name_match( $prefix . $file_name, $excludes, $includes ) ) {
-				$extracted = $this->extract_from_file( $file_name, $prefix );
-				$translations->merge_originals_with( $extracted );
+		$file_names = (array) scandir('.');
+		foreach ($file_names as $file_name) {
+			if ('.' == $file_name || '..' == $file_name) continue;
+			if (preg_match('/\.php$/', $file_name) && $this->does_file_name_match($prefix.$file_name, $excludes, $includes)) {
+				$extracted = $this->extract_from_file($file_name, $prefix);
+				$translations->merge_originals_with($extracted);
 			}
-			if ( is_dir( $file_name ) ) {
-				$extracted = $this->extract_from_directory( $file_name, $excludes, $includes, $prefix . $file_name . '/' );
-				$translations->merge_originals_with( $extracted );
+			if (is_dir($file_name)) {
+				$extracted = $this->extract_from_directory($file_name, $excludes, $includes, $prefix.$file_name.'/');
+				$translations->merge_originals_with($extracted);
 			}
 		}
-		chdir( $old_cwd );
+		chdir($old_cwd);
 		return $translations;
 	}
 
-	function extract_from_file( $file_name, $prefix ) {
-		$code = file_get_contents( $file_name );
-		return $this->extract_from_code( $code, $prefix . $file_name );
+	function extract_from_file($file_name, $prefix) {
+		$code = file_get_contents($file_name);
+		return $this->extract_from_code($code, $prefix.$file_name);
 	}
 
-	function does_file_name_match( $path, $excludes, $includes ) {
-		if ( $includes ) {
+	function does_file_name_match($path, $excludes, $includes) {
+		if ($includes) {
 			$matched_any_include = false;
-			foreach( $includes as $include ) {
-				if ( preg_match( '|^'.$include.'$|', $path ) ) {
+			foreach ($includes as $include) {
+				if (preg_match('|^'.$include.'$|', $path)) {
 					$matched_any_include = true;
 					break;
 				}
 			}
-			if ( !$matched_any_include ) return false;
+			if ( ! $matched_any_include) return false;
 		}
-		if ( $excludes ) {
-			foreach( $excludes as $exclude ) {
-				if ( preg_match( '|^'.$exclude.'$|', $path ) ) {
+		if ($excludes) {
+			foreach ($excludes as $exclude) {
+				if (preg_match('|^'.$exclude.'$|', $path)) {
 					return false;
 				}
 			}
@@ -66,17 +66,17 @@ 
 		return true;
 	}
 
-	function entry_from_call( $call, $file_name ) {
-		$rule = isset( $this->rules[$call['name']] )? $this->rules[$call['name']] : null;
-		if ( !$rule ) return null;
+	function entry_from_call($call, $file_name) {
+		$rule = isset($this->rules[$call['name']]) ? $this->rules[$call['name']] : null;
+		if ( ! $rule) return null;
 		$entry = new Translation_Entry;
 		$multiple = array();
 		$complete = false;
-		for( $i = 0; $i < count( $rule ); ++$i ) {
-			if ( $rule[$i] && ( !isset( $call['args'][$i] ) || !is_string( $call['args'][$i] ) || '' == $call['args'][$i] ) ) return false;
-			switch( $rule[$i] ) {
+		for ($i = 0; $i < count($rule); ++$i) {
+			if ($rule[$i] && ( ! isset($call['args'][$i]) || ! is_string($call['args'][$i]) || '' == $call['args'][$i])) return false;
+			switch ($rule[$i]) {
 			case 'string':
-				if ( $complete ) {
+				if ($complete) {
 					$multiple[] = $entry;
 					$entry = new Translation_Entry;
 					$complete = false;
@@ -85,7 +85,7 @@ 
 				$complete = true;
 				break;
 			case 'singular':
-				if ( $complete ) {
+				if ($complete) {
 					$multiple[] = $entry;
 					$entry = new Translation_Entry;
 					$complete = false;
@@ -100,27 +100,27 @@ 
 				break;
 			case 'context':
 				$entry->context = $call['args'][$i];
-				foreach( $multiple as &$single_entry ) {
+				foreach ($multiple as &$single_entry) {
 					$single_entry->context = $entry->context;
 				}
 				break;
 			}
 		}
-		if ( isset( $call['line'] ) && $call['line'] ) {
-			$references = array( $file_name . ':' . $call['line'] );
+		if (isset($call['line']) && $call['line']) {
+			$references = array($file_name.':'.$call['line']);
 			$entry->references = $references;
-			foreach( $multiple as &$single_entry ) {
+			foreach ($multiple as &$single_entry) {
 				$single_entry->references = $references;
 			}
 		}
-		if ( isset( $call['comment'] ) && $call['comment'] ) {
-			$comments = rtrim( $call['comment'] ) . "\n";
+		if (isset($call['comment']) && $call['comment']) {
+			$comments = rtrim($call['comment'])."\n";
 			$entry->extracted_comments = $comments;
-			foreach( $multiple as &$single_entry ) {
+			foreach ($multiple as &$single_entry) {
 				$single_entry->extracted_comments = $comments;
 			}
 		}
-		if ( $multiple && $entry ) {
+		if ($multiple && $entry) {
 			$multiple[] = $entry;
 			return $multiple;
 		}
@@ -128,16 +128,16 @@ 
 		return $entry;
 	}
 
-	function extract_from_code( $code, $file_name ) {
+	function extract_from_code($code, $file_name) {
 		$translations = new Translations;
-		$function_calls = $this->find_function_calls( array_keys( $this->rules ), $code );
-		foreach( $function_calls as $call ) {
-			$entry = $this->entry_from_call( $call, $file_name );
-			if ( is_array( $entry ) )
-				foreach( $entry as $single_entry )
-					$translations->add_entry_or_merge( $single_entry );
-			elseif ( $entry)
-				$translations->add_entry_or_merge( $entry );
+		$function_calls = $this->find_function_calls(array_keys($this->rules), $code);
+		foreach ($function_calls as $call) {
+			$entry = $this->entry_from_call($call, $file_name);
+			if (is_array($entry))
+				foreach ($entry as $single_entry)
+					$translations->add_entry_or_merge($single_entry);
+			elseif ($entry)
+				$translations->add_entry_or_merge($entry);
 		}
 		return $translations;
 	}
@@ -148,70 +148,70 @@ 
 	 *	- args - array for the function arguments. Each string literal is represented by itself, other arguments are represented by null.
 	 *  - line - line number
 	 */
-	function find_function_calls( $function_names, $code ) {
-		$tokens = token_get_all( $code );
+	function find_function_calls($function_names, $code) {
+		$tokens = token_get_all($code);
 		$function_calls = array();
 		$latest_comment = false;
 		$in_func = false;
-		foreach( $tokens as $token ) {
+		foreach ($tokens as $token) {
 			$id = $text = null;
-			if ( is_array( $token ) ) list( $id, $text, $line ) = $token;
-			if ( T_WHITESPACE == $id ) continue;
-			if ( T_STRING == $id && in_array( $text, $function_names ) && !$in_func ) {
+			if (is_array($token)) list($id, $text, $line) = $token;
+			if (T_WHITESPACE == $id) continue;
+			if (T_STRING == $id && in_array($text, $function_names) && ! $in_func) {
 				$in_func = true;
 				$paren_level = -1;
 				$args = array();
 				$func_name = $text;
 				$func_line = $line;
-				$func_comment = $latest_comment? $latest_comment : '';
+				$func_comment = $latest_comment ? $latest_comment : '';
 
 				$just_got_into_func = true;
 				$latest_comment = false;
 				continue;
 			}
-			if ( T_COMMENT == $id ) {
-				$text = preg_replace( '%^\s+\*\s%m', '', $text );
-				$text = str_replace( array( "\r\n", "\n" ), ' ', $text );;
-				$text = trim( preg_replace( '%^/\*|//%', '', preg_replace( '%\*/$%', '', $text ) ) );
-				if ( 0 === stripos( $text, $this->comment_prefix ) ) {
+			if (T_COMMENT == $id) {
+				$text = preg_replace('%^\s+\*\s%m', '', $text);
+				$text = str_replace(array("\r\n", "\n"), ' ', $text); ;
+				$text = trim(preg_replace('%^/\*|//%', '', preg_replace('%\*/$%', '', $text)));
+				if (0 === stripos($text, $this->comment_prefix)) {
 					$latest_comment = $text;
 				}
 			}
-			if ( !$in_func ) continue;
-			if ( '(' == $token ) {
+			if ( ! $in_func) continue;
+			if ('(' == $token) {
 				$paren_level++;
-				if ( 0 == $paren_level ) { // start of first argument
+				if (0 == $paren_level) { // start of first argument
 					$just_got_into_func = false;
 					$current_argument = null;
 					$current_argument_is_just_literal = true;
 				}
 				continue;
 			}
-			if ( $just_got_into_func ) {
+			if ($just_got_into_func) {
 				// there wasn't a opening paren just after the function name -- this means it is not a function
 				$in_func = false;
 				$just_got_into_func = false;
 			}
-			if ( ')' == $token ) {
-				if ( 0 == $paren_level ) {
+			if (')' == $token) {
+				if (0 == $paren_level) {
 					$in_func = false;
 					$args[] = $current_argument;
-					$call = array( 'name' => $func_name, 'args' => $args, 'line' => $func_line );
-					if ( $func_comment ) $call['comment'] = $func_comment;
+					$call = array('name' => $func_name, 'args' => $args, 'line' => $func_line);
+					if ($func_comment) $call['comment'] = $func_comment;
 					$function_calls[] = $call;
 				}
 				$paren_level--;
 				continue;
 			}
-			if ( ',' == $token && 0 == $paren_level ) {
+			if (',' == $token && 0 == $paren_level) {
 				$args[] = $current_argument;
 				$current_argument = null;
 				$current_argument_is_just_literal = true;
 				continue;
 			}
-			if ( T_CONSTANT_ENCAPSED_STRING == $id && $current_argument_is_just_literal ) {
+			if (T_CONSTANT_ENCAPSED_STRING == $id && $current_argument_is_just_literal) {
 				// we can use eval safely, because we are sure $text is just a string literal
-				eval('$current_argument = '.$text.';' );
+				eval('$current_argument = '.$text.';');
 				continue;
 			}
 			$current_argument_is_just_literal = false;