Merge lp:~quam-plures-core/quam-plures/miscfiles_rename-locales-dir into lp:quam-plures/misc

[Tilman Blumenbach]

This branch modifies the gettext/xg.php script to work with the new i18n directory structure (e. g. locales/ is now qp_locales/ etc.).

[EdB (edb)]

Don't know how to test but looking at everything makes me think "wow this is GREAT!". Will merge now even though it kinda goes with the other 'rename locales' branch.

review: Approve

=== modified file 'gettext/xg.php'
--- gettext/xg.php	2010-05-02 19:39:44 +0000
+++ gettext/xg.php	2010-08-07 12:14:42 +0000
@@ -37,7 +37,7 @@
 
 function echo_usage()
 {
-	global $argv, $app_name, $my_basename, $_app_root;
+	global $argv, $app_name, $my_basename, $_app_root, $locales_subdir;
 
 	echo 'Usage: ', "\n";
 	echo ' ', $my_basename, ' [-b <app_root>] <CORE|CWD> [extract]', "\n";
@@ -46,14 +46,14 @@
 	echo 'CORE: work on the core application.', "\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 'By default, the translatable strings get extracted into ', $locales_subdir, '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 '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 '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";
@@ -91,7 +91,7 @@
 	exit( 2 );
 }
 
-require_once $_app_root.'/conf/_config.php';
+require_once $_app_root.'/qp_config/_config.php';
 
 echo '** gettext helper tool for ', $app_name, ' **', "\n\n";
 
@@ -224,12 +224,12 @@
 		chdir( $dir_root );
 
 		/* Find *.php files, but exclude:
-		 *  - all directories below templates/
-		 *  - the plugins/ directory
+		 *  - all directories below qp_templates/
+		 *  - the qp_plugins/ directory
 		 *  - the build/ directory
 		 */
 		$cmd  = 'find . \\( ';
-		$cmd .= '-path \'./templates/*[!/]/*\' -o -path \'./plugins/*\' -o -path \'./build/*\'';
+		$cmd .= '-path \'./qp_templates/*[!/]/*\' -o -path \'./qp_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="The Quam Plures developers" --msgid-bugs-address=http://quamplures.net/ --keyword=T_ --keyword=NT_ --keyword=TS_ -F';
@@ -333,7 +333,7 @@
 
 if( $action == 'convert' )
 { // convert messages.PO files to _global.php
-	require_once $_app_root.'/inc/locales/_pofile.class.php';
+	require_once $_app_root.'/qp_inc/locales/_pofile.class.php';
 
 	foreach( $_locales as $l_locale )
 	{

=== modified file 'tutorials/templates/examples/Item__is_featured.sample.php'
--- tutorials/templates/examples/Item__is_featured.sample.php	2010-07-23 17:57:52 +0000
+++ tutorials/templates/examples/Item__is_featured.sample.php	2010-08-07 12:14:42 +0000
@@ -4,7 +4,7 @@
 	echo 'do featured item stuff here';
 }
 
-...
+// ...
 
 if( ! $Item->is_featured() )
 {

=== modified file 'tutorials/templates/examples/Item__is_intro.sample.php'
--- tutorials/templates/examples/Item__is_intro.sample.php	2010-07-23 17:57:52 +0000
+++ tutorials/templates/examples/Item__is_intro.sample.php	2010-08-07 12:14:42 +0000
@@ -4,7 +4,7 @@
 	echo 'do intro item stuff here';
 }
 
-...
+// ...
 
 if( ! $Item->is_intro() )
 {