Merge lp:~quam-plures-core/quam-plures/bug-538197 into lp:quam-plures/misc

[Tilman Blumenbach]

Merged bug-538197.

[EdB (edb)]

Not sure how I could test this so I won't, but wanted to mention that I will be taking care of the_pofile.class.php file in the main package.

Correct me if I'm wrong, but this is how one would extract the actual strings (if one did not want to use a .bat file)? pofile.class.php seems to create the _global.php file for each locale, and it still writes "if evo_main_whatever is undefined" plus a few other uncool bits.

[EdB (edb)]

Oh and I couldn't merge this if I wanted to but I say it's cool so someone should merge it. At least I think I can't merge it... I know I can say it is okay because see how I just did :)

review: Approve

[Tilman Blumenbach (tblue)]

> Correct me if I'm wrong, but this is how one would extract the actual strings (if one did not want to use a .bat file)?
Yes.

> pofile.class.php seems to create the _global.php file for each locale, and it still writes "if evo_main_whatever is undefined" plus a few other uncool bits.
Hmm, looks like it uses QP_MAIN_INIT already.

[EdB (edb)]

Yeah I type then think is the thing. The Turkish translation had it so I wondered where it came from. It came from getting Turkish from evoland :)

The change I made to _pofile is to very simply add a @package line for happy autodocs ... which I now realize I forgot to add to the files prior to pushing the restored localizations. Sheesh!

[EdB (edb)]

hmmm... maybe I could merge this but I'm not going to try. Got one thing done today I didn't know how to do, so I don't want to push my luck. Yabs?

[EdB (edb)]

I thought of a problem with this but it might not be depending on exactly how you got it working. The files in the /templates/ folder are "core" and therefore need to be translated with everything else. The folders (the actual templates) are the ones that "core translation" should be not doing. So for my method "remove plugins folder, remove all the folders in the templates folder, do the batch file thing". For this smart method it means a smarter smart line to exclude folders in a folder.

[Tilman Blumenbach (tblue)]

Okay, I will look at this. Consider this proposal to be "on hold".

[Tilman Blumenbach (tblue)]

So this turned into a major overhaul of gettext/xg.php. I tested most of it.

review: Needs Resubmitting

[Tilman Blumenbach (tblue)]

Still working on the batch file...

[Tilman Blumenbach (tblue)]

review: Abstain

[Tilman Blumenbach (tblue)]

Batch files are very limited, but the new batch file at least does more than the previous one. I think I'm done.

[lp:~quam-plures-core/quam-plures/bug-538197]

14. By Tilman Blumenbach on 2010-03-14

Added plugin and core mode to xg.bat

[EdB (edb)]

If Yabs doesn't merge this I'll see if I can. Not sure if I have perms or not, but if so I can probably figure out how to get it done. Would be better if Yabs took care of it though.

review: Approve

=== modified file 'gettext/xg.bat'
--- gettext/xg.bat	2010-01-27 18:27:00 +0000
+++ gettext/xg.bat	2010-03-14 12:54:25 +0000
@@ -1,19 +1,61 @@
-@echo off
-
-echo Generate file list.
-dir /b /s ..\blogs\*.php > files.txt
-
-echo Extract strings.
-xgettext -D ../blogs/ -f files.txt --no-wrap --add-comments=TRANS --copyright-holder="Francois PLANQUE" --msgid-bugs-address=http://fplanque.net/ --output=..\blogs\locales\messages.pot --keyword=T_ --keyword=NT_ --keyword=TS_
-
-echo Correct paths.
-xchangecl +d! ..\blogs\locales\messages.pot !D:\www\b2cvs20\blogs\!..\..\..\!
-
-echo Correct Header.
-xchangecl +d! -t# ..\blogs\locales\messages.pot !#35##32#SOME#32#DESCRIPTIVE#32#TITLE.!#35##32#b2evolution#32#-#32#Language#32#file!#35##32#This#32#file#32#is#32#distributed#32#under#32#the#32#same#32#license#32#as#32#the#32#PACKAGE#32#package.!#35##32#This#32#file#32#is#32#distributed#32#under#32#the#32#same#32#license#32#as#32#the#32#b2evolution#32#package.!"Content-Type:#32#text/plain;#32#charset=CHARSET\n"!"Content-Type:#32#text/plain;#32#charset=iso-8859-1\n"!
-
-echo Merge with French.
-msgmerge -U --no-wrap ..\blogs\locales\fr_FR\LC_MESSAGES\messages.po ..\blogs\locales\messages.pot
-
-REM echo Change comments.
-REM xchangecl +d! -t# ..\blogs\locales\fr_FR\LC_MESSAGES\messages.po !#35#.#32#TRANS:!#35##32#TRANS:!
+@echo off
+
+REM xg.bat - Generate POT file.
+REM Invoke this batch file in the application root directory (or the
+REM directory where your plugin file resides).
+
+REM This batch file requires the sed, xgettext and fart tools to be somewhere
+REM in your Path.
+REM sed is available from:
+REM   http://gnuwin32.sourceforge.net/packages/sed.htm
+REM xgettext is available from:
+REM   http://gnuwin32.sourceforge.net/packages/gettext.htm
+REM fart is available from:
+REM   http://fart-it.sourceforge.net/
+
+if /i "%1" equ "CORE" (
+    goto MAIN
+) else if /i "%1" equ "PLUGIN" (
+    goto MAIN
+) else (
+    goto USAGE
+)
+
+:MAIN
+    REM Generate file list, make paths relative, filter excluded directories
+    REM and extract strings:
+    dir /s /b *.php | fart -qi - "%CD%" . ^
+        | findstr /r /i /v ^
+            "^\.\\templates\\[^\\]*\\.* ^\.\\plugins\\.* ^\.\\build\\.*" ^
+        | xgettext -f - -o locales\messages.pot --from-code=iso-8859-15 ^
+            --no-wrap --add-comments=TRANS "--copyright-holder=The Quam Plures developers" ^
+            --msgid-bugs-address=http://quamplures.net/ --keyword=T_ ^
+            --keyword=NT_ --keyword=TS_ -F
+
+    REM Make paths relative:
+    sed -i "/^#: /{ s| \.| ..\\..\\..|g; }" locales\messages.pot
+
+    if /i "%1" equ "CORE" (
+        REM Replace bulk header values with nicer ones.
+        REM TODO: Make app name and current year dynamic. Replace app version as in xg.php.
+        sed -i "1,20{ s/PACKAGE/Quam Plures/; s/# SOME DESCRIPTIVE TITLE./# Quam Plures - Language file/; s/(C) YEAR/(C) 2009-2010/; s/CHARSET/iso-8859-1/; }" ^
+            locales\messages.pot
+    )
+
+    REM Delete temporary sed files (bug in gnuwin32 port):
+    del sed*
+
+    exit /b 0
+
+:USAGE
+    echo Usage:
+    echo ^ %0 ^<CORE^|PLUGIN^>
+    echo.
+    echo CORE  : Work on the core application.
+    echo PLUGIN: Work on a plugin.
+    echo.
+    echo In both modes, you have to invoke this script in the application's
+    echo root directory or the directory which contains your plugin's PHP
+    echo file, respectively.
+
+    exit /b 1
\ No newline at end of file

=== modified file 'gettext/xg.php'
--- gettext/xg.php	2010-01-27 18:27:00 +0000
+++ gettext/xg.php	2010-03-14 12:54:25 +0000
@@ -4,11 +4,12 @@
  * Create a new messages.POT file and update specified .po files.
  *
  * Uses find, xargs, sed, xgettext and msgmerge tools.
+ * This only works on UNIXoid systems.
  *
  * This file is part of the Quam Plures project - {@link http://quamplures.net/}.
  * See also {@link https://launchpad.net/quam-plures}.
  *
- * @copyright (c) 2009 by the Quam Plures developers - {@link http://quamplures.net/}
+ * @copyright (c) 2009-2010 by the Quam Plures developers - {@link http://quamplures.net/}
  * @copyright (c)2003-2007 by Francois PLANQUE - {@link http://fplanque.net/}.
  * Parts of this file are copyright (c)2004 by Daniel HAHLER - {@link http://thequod.de/contact}.
  *
@@ -18,70 +19,81 @@
  * Daniel HAHLER grants Francois PLANQUE the right to license
  * Daniel HAHLER's contributions to this file and the b2evolution project
  * under any OSI approved OSS license (http://www.opensource.org/licenses/).
- * }}
+ * }
  *
  * @package internal
  *
- * @todo Add checks for format, headers and domain ("msgfmt -c")
+ * @todo Add checks for format, headers and domain ("msgfmt -c").
  *
- * {@internal Below is a list of authors who have contributed to design/coding of this file: }}
+ * {@internal Below is a list of authors who have contributed to design/coding of this file:}
  * @author blueyed: Daniel HAHLER.
- *
+ * @author Tblue: Tilman BLUMENBACH.
  */
 
-require_once dirname(__FILE__).'/../blogs/conf/_config.php';
-
-echo '** gettext helper tool for ', $app_name, ' **', "\n";
-
-// Check that all external tools are available:
-foreach( array( 'xgettext', 'msgmerge', 'find', 'xargs', 'sed' ) as $testtool )
-{
-	exec( $testtool.' --version', $output, $return );
-	if( $return !== 0 )
-	{
-		die( "This script needs the $testtool tool.\n" );
-	}
-}
-
+// Cache script base name:
+$my_basename = basename( $argv[0] );
+// Set default application root directory:
+$_app_root = dirname( __FILE__ ).'/../../trunk';
 
 function echo_usage()
 {
-	global $argv, $app_name;
-
-	echo "Usage: \n";
-	echo basename($argv[0])." <CORE|CWD> [extract]\n";
-	echo basename($argv[0])." <CORE|CWD> merge <locale> [locale..]\n";
-	echo basename($argv[0])." <CORE|CWD> convert <locale> [locale..]\n";
-	echo "CORE: work on the core application\n";
-	echo "CWD: work on current working directory\n";
-	echo "\n";
-	echo "By default, to translatable strings get extracted into locales/messages.POT.\n";
-	echo "\n";
-	echo "By adding 'merge <locale>' to the command line arguments, you'll merge\n";
-	echo "the locale's messages.PO file with the messages.POT file. This is useful\n";
-	echo "after having updated the messages.POT file, obviously.\n";
-	echo "\n";
-	echo "By adding 'convert <locale>' to the command line arguments, you'll convert\n";
-	echo 'the locale\'s messages.PO file to _global.php, which ', $app_name, " uses.\n";
-	echo "\n";
-	echo "E.g.,\n";
-	echo " php -f xg.php CORE\n";
-	echo " php -f xg.php CORE merge de_DE\n";
-	echo " ..edit .po file..\n";
-	echo " php -f xg.php CORE convert de_DE\n";
-	echo "\n";
-}
-
-
-if( ! isset($_SERVER['argc']) || ! isset( $_SERVER['argv'] ) )
-{
-	echo_usage();
-	exit(1);
-}
-
-
-$argc = $_SERVER['argc'];
-$argv = $_SERVER['argv'];
+	global $argv, $app_name, $my_basename, $_app_root;
+
+	echo 'Usage: ', "\n";
+	echo ' ', $my_basename, ' [-b <app_root>] <CORE|CWD> [extract]', "\n";
+	echo ' ', $my_basename, ' [-b <app_root>] <CORE|CWD> merge <locale> [locale..]', "\n";
+	echo ' ', $my_basename, ' [-b <app_root>] <CORE|CWD> convert <locale> [locale..]', "\n\n";
+	echo 'CORE: work on the core application.', "\n";
+	echo 'CWD : work on current working directory.', "\n";
+	echo "\n";
+	echo 'By default, the translatable strings get extracted into locales/messages.POT.', "\n";
+	echo "\n";
+	echo 'By adding \'merge <locale>\' to the command line arguments, you\'ll merge', "\n";
+	echo 'the locale\'s messages.PO file with the messages.POT file. This is useful', "\n";
+	echo 'after having updated the messages.POT file, obviously.', "\n";
+	echo "\n";
+	echo 'By adding \'convert <locale>\' to the command line arguments, you\'ll convert', "\n";
+	echo 'the locale\'s messages.PO file to _global.php, which ', $app_name, ' uses.', "\n";
+	echo "\n";
+	echo 'E.g.:', "\n";
+	echo ' php ', $my_basename, ' CORE', "\n";
+	echo ' php ', $my_basename, ' CORE merge de_DE', "\n";
+	echo ' ..edit .po file..', "\n";
+	echo ' php ', $my_basename, ' CORE convert de_DE', "\n";
+	echo "\n";
+	echo 'This script expects the ', $app_name, ' root directory to be at [', $_app_root, '].', "\n";
+	echo 'You can specify an alternative root directory using the -b option, e. g.:', "\n";
+	echo ' php ', $my_basename, ' -b ../blogs CORE', "\n";
+	echo '...but if you are reading this message, the root directory is set correctly.', "\n";
+}
+
+
+// Allow overriding of the application root directory via command line (-b option):
+$opts = getopt( 'b:' );
+if( isset( $opts['b'] ) )
+{
+	$_app_root = $opts['b'];
+
+	// Silently modify $argc and $argv:
+	$argc -= 2;
+	// This will fail if somebody passes an argument with more than one
+	// option, e. g. "-bar".
+	array_splice( $argv, array_search( '-b', $argv ), 2 );
+
+	//var_dump( $argc, $argv );
+}
+
+if( ! is_dir( $_app_root ) )
+{
+	echo 'Error: Application root directory [', $_app_root, '] does not exist!', "\n";
+	echo 'You can specify an alternative root directory by using the -b option:', "\n";
+	echo ' php ', $my_basename, ' -b /path/to/application/root/directory CORE', "\n";
+	exit( 2 );
+}
+
+require_once $_app_root.'/conf/_config.php';
+
+echo '** gettext helper tool for ', $app_name, ' **', "\n\n";
 
 if( $argc < 2 )
 {
@@ -89,65 +101,66 @@
 	exit(1);
 }
 
-if( strtoupper($argv[1]) == 'CORE' )
-{
-	echo "CORE mode..\n";
-	$mode = 'CORE';
-	// The blogs directory:
-	$dir_root = dirname(__FILE__).'/../blogs/';
-}
-elseif( strtoupper($argv[1]) == 'CWD' )
-{
-	echo "Using current working directory..\n";
-	$mode = 'CWD';
-	$dir_root = getcwd();
-}
-else
-{
-	echo_usage();
-	exit(1);
-}
-
-if( ! isset($argv[2]) || strtoupper($argv[2]) == 'EXTRACT' )
-{
-	$action = 'extract';
-}
-elseif( isset($argv[2]) && strtoupper($argv[2]) == 'MERGE' )
-{
-	$action = 'merge';
-
-	if( ! isset($argv[3]) ) // the to-get-merged locale
-	{
-		echo_usage();
-		exit(1);
-	}
-
-	$locales_to_merge = array_slice( $argv, 3 );
-}
-elseif( isset($argv[2]) && strtoupper($argv[2]) == 'CONVERT' )
-{
-	$action = 'convert';
-
-	if( ! isset($argv[3]) ) // the to-get-converted locale
-	{
-		echo_usage();
-		exit(1);
-	}
-
-	$locales_to_convert = array_slice( $argv, 3 );
-}
-else
-{
-	echo_usage();
-	die;
-}
-
+switch( strtoupper($argv[1]) )
+{
+	case 'CORE':
+		echo 'CORE mode..', "\n";
+		$mode = 'CORE';
+		// Our root directory is the application root directory:
+		$dir_root = $_app_root;
+		break;
+
+	case 'CWD':
+		echo 'Using current working directory..', "\n";
+		$mode = 'CWD';
+		$dir_root = getcwd();
+		break;
+
+	default:
+		echo_usage();
+		exit(1);
+}
+
+$action = 'extract';
+if( isset($argv[2]) )
+{
+	$action = strtolower( $argv[2] );
+
+	if( ! in_array( $action, array( 'extract', 'merge', 'convert' ) ) )
+	{
+		echo_usage();
+		exit( 1 );
+	}
+	else if( $action == 'convert' || $action == 'merge' )
+	{
+		if( ! isset($argv[3]) )
+		{
+			echo_usage();
+			exit(1);
+		}
+
+		$_locales = array_slice( $argv, 3 );
+	}
+}
 
 // ---- COMMON CHECKS: ----
 
-if( ! realpath($dir_root) )
-{
-	die( "Fatal error: The path '$dir_root' was not found!\n" );
+if( $action != 'convert' )
+{
+	// Check that all external tools are available:
+	foreach( array( 'xgettext', 'msgmerge', 'find', 'xargs', 'sed' ) as $testtool )
+	{
+		exec( $testtool.' --version 2>/dev/null', $output, $return );
+		if( $return == 127 )
+		{	// Command not found (return code specified by POSIX):
+			die( 'This script needs the '.$testtool.' tool.'."\n" );
+		}
+	}
+}
+
+if( ! is_dir($dir_root) )
+{
+	die( 'Fatal error: The path ['.$dir_root.'] was not found!'."\n" );
 }
 // Normalize path:
 $dir_root = realpath($dir_root).'/';
@@ -158,20 +171,19 @@
 // The messages.pot (template) file:
 $file_pot = $dir_root.'locales/messages.pot';
 
-
 if( $action == 'extract' )
 {
 	if( ! is_writable($file_pot) )
 	{
 		if( ! file_exists( $dir_root.'locales' ) )
 		{
-			echo "Directory {$dir_root}locales/ does not exist..\n";
+			echo 'Directory [', $dir_root, 'locales/] does not exist..', "\n";
 
 			if( ! mkdir( $dir_root.'locales' ) )
 			{
-				die( "FATAL: could not create directory {$dir_root}locales/\n" );
+				die( 'FATAL: could not create directory ['.$dir_root.'locales/]!'."\n" );
 			}
-			echo "Created directory.\n";
+			echo 'Created directory.', "\n";
 		}
 
 		if( ! file_exists( $file_pot ) )
@@ -182,69 +194,89 @@
 
 		if( ! is_writable($file_pot) )
 		{
-			die( "FATAL: The file $file_pot is not writable.\n" );
+			die( 'FATAL: The file ['.$file_pot.'] is not writable.'."\n" );
 		}
 	}
 
-	// The locales dir is our working dir:
-#	chdir( $dir_root.'locales' );
-
+	$dir_root_basename = basename($dir_root);
 	if( isset($argv[3]) )
 	{ // File(s) specified
+		echo 'Extracting T_() and NT_() strings from given files below "';
+		echo $dir_root_basename, '" into "', $dir_root_basename, '/locales/messages.pot".. ';
 		$cmd = '';
-		echo 'Extracting T_() and NT_() strings from given files below "'.basename($dir_root).'" into "'.basename($dir_root).'/locales/messages.pot".. ';
 	}
 	else
 	{
-		echo 'Extracting T_() and NT_() strings from all .php files below "'.basename($dir_root).'" into "'.basename($dir_root).'/locales/messages.pot".. ';
-		# find *.php files, but not in "build" directory:
-		$cmd = 'find '.escapeshellarg($dir_root).' -wholename "*/build/*" -prune -o \( -iname "*.php" -print \) | xargs ';
+		echo 'Extracting T_() and NT_() strings from all .php files below "';
+		echo $dir_root_basename, '" into "', $dir_root_basename, '/locales/messages.pot".. ';
+
+		// Change working dir (to simplify exlude patterns below):
+		chdir( $dir_root );
+
+		/* Find *.php files, but exclude:
+		 *  - all directories below templates/
+		 *  - the plugins/ directory
+		 *  - the build/ directory
+		 */
+		$cmd  = 'find . \\( ';
+		$cmd .= '-path \'./templates/*[!/]/*\' -o -path \'./plugins/*\' -o -path \'./build/*\'';
+		$cmd .= ' \\) -prune -o \\( -iname \'*.php\' -print0 \\) | xargs -0 ';
 	}
-	$cmd .= 'xgettext -o '.escapeshellarg($file_pot).' --from-code=iso-8859-15 --no-wrap --add-comments=TRANS --copyright-holder="Francois PLANQUE" --msgid-bugs-address=http://fplanque.net/ --keyword=T_ --keyword=NT_ --keyword=TS_ -F';
+	$cmd .= 'xgettext -o '.escapeshellarg($file_pot).' --from-code=iso-8859-15 --no-wrap --add-comments=TRANS --copyright-holder="The Quam Plures developers" --msgid-bugs-address=http://quamplures.net/ --keyword=T_ --keyword=NT_ --keyword=TS_ -F';
 
 	// Append filenames, if specified:
 	if( isset($argv[3]) )
 	{
-		for( $i = 3; $i < count($argv); $i++ )
+		$n = count($argv);
+		for( $i = 3; $i < $n; $i++ )
 		{
 			$cmd .= ' '.escapeshellarg($argv[$i]);
 		}
 	}
 
+	//echo 'Command: [', $cmd, ']', "\n";
 	system( $cmd, $return_var );
 	if( $return_var !== 0 )
 	{
-		die("Failed!\n");
+		die('Command failed (return code: '.$return_var.')!'."\n");
 	}
 	echo "[ok]\n";
 
 
 	// Replace various things (see comments)
-	echo 'Automagically search&replace in messages.pot.. ';
+	echo 'Automagically search & replace in messages.pot.. ';
 	$data = file_get_contents( $file_pot );
 
 	$data = str_replace( "\r", '', $data );
 	// Make paths relative:
-	$data = preg_replace( '~^#: .*$~me', 'str_replace( \' '.$dir_root.'\', \' ../../../\', \'$0\' )', $data );
+
+	if( isset( $argv[3] ) )
+	{	// File names given
+		$rep_path = $dir_root;
+	}
+	else
+	{	// Core mode (prepend root path to file names in POT file):
+		$rep_path = '';
+	}
+	$data = preg_replace( '~^#: .*$~me', 'str_replace( \' '.$rep_path.'\', \' ../../../\', \'$0\' )', $data );
 
 	file_put_contents( $file_pot, $data );
 
 	if( $mode == 'CORE' )
 	{ // Replace header "vars" in first 20 lines:
-		system( 'sed -i 1,20"'
+		system( 'sed -i "1,20{'
 			.'s/PACKAGE/'.$app_name.'/;'
 			.'s/VERSION/'.$app_version.'/;'
 			.'s/# SOME DESCRIPTIVE TITLE./# '.$app_name.' - Language file/;'
-			.'s/(C) YEAR/(C) 2003-'.date('Y').'/;'
-			.'s/YEAR(?!-MO)/'.date('Y').'/;'
+			.'s/(C) YEAR/(C) 2009-'.date('Y').'/;'
 			.'s/CHARSET/iso-8859-1/;'
-			.'" '.escapeshellarg($file_pot) );
+			.'}" '.escapeshellarg($file_pot) );
 	}
 	else
 	{
 		// TODO: try to detect usage with a plugin and s&r accordingly
 	}
-	echo "[ok]\n";
+	echo '[ok]', "\n";
 
 	exit(0);
 }
@@ -254,11 +286,11 @@
 { // Merge with existing .po files:
 	if( ! @is_readable( $file_pot ) )
 	{
-		echo "FATAL: $file_pot is not readable!\n";
+		echo 'FATAL: [', $file_pot, '] is not readable!', "\n";
 		exit(1);
 	}
 
-	foreach( $locales_to_merge as $l_locale )
+	foreach( $_locales as $l_locale )
 	{
 		$l_file_po = $dir_root.'locales/'.$l_locale.'/LC_MESSAGES/messages.po';
 
@@ -266,14 +298,14 @@
 
 		if( ! file_exists( $l_file_po ) )
 		{
-			echo "PO file $l_file_po not found!\n";
+			echo 'PO file [', $l_file_po, '] not found!', "\n";
 			continue;
 		}
 
 		system( 'msgmerge -U -F --no-wrap '.escapeshellarg($l_file_po).' '.escapeshellarg($file_pot) );
 		# delete old TRANS comments and make automatic ones valid comments:
 		system( 'sed -i -r "/^#\\s+TRANS:/d; s/^#\\. TRANS:/# TRANS:/;" '.$l_file_po );
-		echo "Written $l_file_po .\n";
+		echo 'Written [', $l_file_po, '].', "\n";
 		echo "\n";
 	}
 
@@ -283,9 +315,9 @@
 
 if( $action == 'convert' )
 { // convert messages.PO files to _global.php
-	require_once dirname(__FILE__).'/../blogs/inc/locales/_pofile.class.php';
+	require_once $_app_root.'/inc/locales/_pofile.class.php';
 
-	foreach( $locales_to_convert as $l_locale )
+	foreach( $_locales as $l_locale )
 	{
 		$l_file_po = $dir_root.'locales/'.$l_locale.'/LC_MESSAGES/messages.po';
 		$global_file_path = $dir_root.'locales/'.$l_locale.'/_global.php';
@@ -294,7 +326,7 @@
 
 		if( !file_exists( $l_file_po ) )
 		{
-			echo "PO file $l_file_po not found!\n";
+			echo 'PO file [', $l_file_po, '] not found!', "\n";
 			continue;
 		}
 
@@ -304,63 +336,12 @@
 
 		if( $r !== true )
 		{
-			echo "Error: $r\n";
+			echo 'Error: ', $r, "\n";
 			continue;
 		}
 
-		echo "[ok]\n";
+		echo '[ok]', "\n";
 	}
 
 	exit(0);
 }
-
-
-/**
- * From {@link http://de.php.net/manual/en/function.realpath.php#77203}
- */
-function rel_path($dest, $root = '')
-{
- $root = explode(DIRECTORY_SEPARATOR, $root);
- $dest = explode(DIRECTORY_SEPARATOR, $dest);
- $path = '.';
- $fix = '';
- $diff = 0;
- for($i = -1; ++$i < max(($rC = count($root)), ($dC = count($dest)));)
- {
-  if(isset($root[$i]) and isset($dest[$i]))
-  {
-   if($diff)
-   {
-    $path .= DIRECTORY_SEPARATOR. '..';
-    $fix .= DIRECTORY_SEPARATOR. $dest[$i];
-    continue;
-   }
-   if($root[$i] != $dest[$i])
-   {
-    $diff = 1;
-    $path .= DIRECTORY_SEPARATOR. '..';
-    $fix .= DIRECTORY_SEPARATOR. $dest[$i];
-    continue;
-   }
-  }
-  elseif(!isset($root[$i]) and isset($dest[$i]))
-  {
-   for($j = $i-1; ++$j < $dC;)
-   {
-    $fix .= DIRECTORY_SEPARATOR. $dest[$j];
-   }
-   break;
-  }
-  elseif(isset($root[$i]) and !isset($dest[$i]))
-  {
-   for($j = $i-1; ++$j < $rC;)
-   {
-    $fix = DIRECTORY_SEPARATOR. '..'. $fix;
-   }
-   break;
-  }
- }
-  return $path. $fix;
-}
-
-?>