Merge lp:~quam-plures-core/quam-plures/bp-i18n-reorder-miscfiles into lp:quam-plures/misc

[Tilman Blumenbach]

[EdB (edb)]

getting now, will test to the best of my abilities later on today ... maybe tomorrow morning

[EdB (edb)]

Yabs this one is on you :)

[Yabs (yabs)]

heh

What the hell do I know about foreign languages? apart from the fact that the yanks remove u from most of the best words and the aussies add a rising inflection to everything just in case they missed the point :|

/me takes the easy route ... approved, but if it kills stuff you fix it ;)

¥

review: Approve

=== modified file 'gettext/xg.bat'
--- gettext/xg.bat	2010-03-14 12:51:28 +0000
+++ gettext/xg.bat	2010-05-08 20:28:28 +0000
@@ -1,5 +1,7 @@
 @echo off
 
+REM *** NOTE: This file is unmaintained and will not work. ***
+
 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).

=== modified file 'gettext/xg.php'
--- gettext/xg.php	2010-03-14 01:04:28 +0000
+++ gettext/xg.php	2010-05-08 20:28:28 +0000
@@ -44,7 +44,7 @@
 	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 'CWD : work on current working directory (plugin mode).', "\n";
 	echo "\n";
 	echo 'By default, the translatable strings get extracted into locales/messages.POT.', "\n";
 	echo "\n";
@@ -104,14 +104,14 @@
 switch( strtoupper($argv[1]) )
 {
 	case 'CORE':
-		echo 'CORE mode..', "\n";
+		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";
+		echo 'Using current working directory (plugin mode)...', "\n";
 		$mode = 'CWD';
 		$dir_root = getcwd();
 		break;
@@ -169,19 +169,29 @@
 $dir_root = str_replace('\\', '/', $dir_root);
 
 // The messages.pot (template) file:
-$file_pot = $dir_root.'locales/messages.pot';
+if( $mode == 'CORE' )
+{
+	$file_pot = $locales_path;
+}
+else
+{	// Plugin mode:
+	$file_pot = $dir_root.'po/';
+}
+$file_pot .= 'messages.pot';
 
 if( $action == 'extract' )
 {
 	if( ! is_writable($file_pot) )
 	{
-		if( ! file_exists( $dir_root.'locales' ) )
+		$locale_dir = dirname( $file_pot );
+
+		if( ! file_exists( $locale_dir ) )
 		{
-			echo 'Directory [', $dir_root, 'locales/] does not exist..', "\n";
+			echo 'Directory [', $locale_dir, '] does not exist..', "\n";
 
-			if( ! mkdir( $dir_root.'locales' ) )
+			if( ! mkdir( $locale_dir ) )
 			{
-				die( 'FATAL: could not create directory ['.$dir_root.'locales/]!'."\n" );
+				die( 'FATAL: could not create directory ['.$locale_dir.']!'."\n" );
 			}
 			echo 'Created directory.', "\n";
 		}
@@ -202,13 +212,13 @@
 	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".. ';
+		echo $dir_root_basename, '" into "', $file_pot, '"... ';
 		$cmd = '';
 	}
 	else
 	{
 		echo 'Extracting T_() and NT_() strings from all .php files below "';
-		echo $dir_root_basename, '" into "', $dir_root_basename, '/locales/messages.pot".. ';
+		echo $dir_root_basename, '" into "', $file_pot, '"... ';
 
 		// Change working dir (to simplify exlude patterns below):
 		chdir( $dir_root );
@@ -248,8 +258,8 @@
 	$data = file_get_contents( $file_pot );
 
 	$data = str_replace( "\r", '', $data );
+	
 	// Make paths relative:
-
 	if( isset( $argv[3] ) )
 	{	// File names given
 		$rep_path = $dir_root;
@@ -258,7 +268,7 @@
 	{	// Core mode (prepend root path to file names in POT file):
 		$rep_path = '';
 	}
-	$data = preg_replace( '~^#: .*$~me', 'str_replace( \' '.$rep_path.'\', \' ../../../\', \'$0\' )', $data );
+	$data = preg_replace( '~^#: .*$~me', 'str_replace( \' '.$rep_path.'\', \' ../\', \'$0\' )', $data );
 
 	file_put_contents( $file_pot, $data );
 
@@ -292,7 +302,15 @@
 
 	foreach( $_locales as $l_locale )
 	{
-		$l_file_po = $dir_root.'locales/'.$l_locale.'/LC_MESSAGES/messages.po';
+		if( $mode == 'CORE' )
+		{
+			$l_file_po = $locales_path;
+		}
+		else
+		{	// Plugin mode:
+			$l_file_po = $dir_root.'/po/';
+		}
+		$l_file_po .= $l_locale.'.po';
 
 		echo 'Merging with '.$l_locale.'.. ';
 
@@ -319,8 +337,20 @@
 
 	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';
+		if( $mode == 'CORE' )
+		{
+			$l_file_po       = $locales_path;
+			$global_file_dir = $locales_path;
+		}
+		else
+		{	// Plugin mode...
+			$l_file_po       = $dir_root.'po/';
+			$global_file_dir = $dir_root.'po/';
+		}
+
+		$l_file_po       .= $l_locale.'.po';
+		$global_file_dir .= 'php/'.$l_locale;
+		$global_file_path = $global_file_dir.'/_global.php';
 
 		echo 'Converting '.$l_locale.'.. ';
 
@@ -329,6 +359,12 @@
 			echo 'PO file [', $l_file_po, '] not found!', "\n";
 			continue;
 		}
+		else if( ! file_exists( $global_file_dir ) &&
+				 ! mkdir( $global_file_dir, 0777, true ) )
+		{
+			echo 'Could not create directory [', $global_file_dir, ']!', "\n";
+			continue;
+		}
 
 		$POFile = new POFile($l_file_po);
 		$POFile->read(false);