[Web-erp-svn] SF.net SVN: web-erp:[6810] trunk

[<rc...@us...>]

Revision: 6810
          http://sourceforge.net/p/web-erp/reponame/6810
Author:   rchacon
Date:     2014-08-13 02:55:08 +0000 (Wed, 13 Aug 2014)
Log Message:
-----------
In Z_poRebuildDefault.php: extends title, improves comments, sets file to pot, updates $FilesToInclude, renames old pot file to bak extension. Minor improvements.

Modified Paths:
--------------
    trunk/PcAuthorizeExpenses.php
    trunk/Z_poAdmin.php
    trunk/Z_poRebuildDefault.php
    trunk/doc/Change.log

Modified: trunk/PcAuthorizeExpenses.php
===================================================================
--- trunk/PcAuthorizeExpenses.php	2014-08-12 19:16:00 UTC (rev 6809)
+++ trunk/PcAuthorizeExpenses.php	2014-08-13 02:55:08 UTC (rev 6810)
@@ -43,10 +43,10 @@
 
 if (isset($SelectedTabs)) {
 	echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . _('Petty Cash') .
-		'" alt="" />' . _('Authorisation Of Petty Cash Expenses ') . ''.$SelectedTabs . '</p>';
+		'" alt="" />' . _('Authorisation Of Petty Cash Expenses') . ' '.$SelectedTabs . '</p>';
 } else {
 	echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . _('Petty Cash') .
-		'" alt="" />' . _('Authorisation Of Petty Cash Expenses ') . '</p>';
+		'" alt="" />' . _('Authorisation Of Petty Cash Expenses') . '</p>';
 }
 if (isset($_POST['Submit']) or isset($_POST['update']) OR isset($SelectedTabs) OR isset ($_POST['GO'])) {
 

Modified: trunk/Z_poAdmin.php
===================================================================
--- trunk/Z_poAdmin.php	2014-08-12 19:16:00 UTC (rev 6809)
+++ trunk/Z_poAdmin.php	2014-08-13 02:55:08 UTC (rev 6810)
@@ -7,8 +7,8 @@
 
 include ('includes/session.inc');
 $Title = _('UTILITY PAGE') . ' ' . _('that helps maintain language files');// _('Maintain Language Files')
-$ViewTopic = "SpecialUtilities";
-$BookMark = "Z_poAdmin";// Anchor's id in the manual's html document.
+$ViewTopic = 'SpecialUtilities';// Filename in ManualContents.php's TOC.
+$BookMark = 'Z_poAdmin';// Anchor's id in the manual's html document.
 include('includes/header.inc');
 echo '<p class="page_title_text"><img alt="" src="' . $RootPath . '/css/' . $Theme . 
 		'/images/maintenance.png" title="' . 

Modified: trunk/Z_poRebuildDefault.php
===================================================================
--- trunk/Z_poRebuildDefault.php	2014-08-12 19:16:00 UTC (rev 6809)
+++ trunk/Z_poRebuildDefault.php	2014-08-13 02:55:08 UTC (rev 6810)
@@ -5,16 +5,16 @@
 	extracted from the sources. The resultant system default language file 
 	(.pot file) is saved in the .../locale/en_GB.utf8/LC_MESSAGES/messages.po 
 	path. Note: Comments (starting with ///) placed directly before strings 
-	thus marked are made available as hints to translators by helper programs. */
+	thus marked are made available as hints to translators by helper programs.*/
 
 /* Steve Kitchen */
 
 //$PageSecurity = 15;
 
 include ('includes/session.inc');
-$Title = _('Rebuild');//_('Rebuild the System Default Language File')
-$ViewTopic = "SpecialUtilities";
-$BookMark = "Z_poRebuildDefault";// Anchor's id in the manual's html document.
+$Title = _('Rebuild the System Default Language File');
+$ViewTopic = 'SpecialUtilities';// Filename in ManualContents.php's TOC.
+$BookMark = 'Z_poRebuildDefault';// Anchor's id in the manual's html document.
 include('includes/header.inc');
 echo '<p class="page_title_text"><img alt="" src="' . $RootPath . '/css/' . $Theme . 
 		'/images/maintenance.png" title="' . 
@@ -26,32 +26,24 @@
 echo '<br />&nbsp;<a href="' . $RootPath . '/Z_poAdmin.php">' . _('Back to the translation menu') . '</a>';
 echo '<br /><br />&nbsp;' . _('Utility page to rebuild the system default language file');
 
-$PathToDefault = './locale/en_GB.utf8/LC_MESSAGES/messages.po';
-$FilesToInclude = '*.php includes/*.inc includes/*.php api/*.php reportwriter/languages/en_US/reports.php';
+$PathToDefault = './locale/en_GB.utf8/LC_MESSAGES/messages.pot';
+$FilesToInclude = '*.php api/*.php includes/*.inc includes/*.php install/*.php reportwriter/languages/en_US/reports.php';
 $xgettextCmd = 'xgettext --no-wrap --from-code=utf-8 -L php -o ' . $PathToDefault . ' ' . $FilesToInclude;
 
 if (isset($_POST['submit'])) {
-
 	echo '<br /><table><tr><td>';
 	echo '<form method="post" action=' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' . SID . '>';
 	echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-
-	/// Run xgettext to recreate the default message.po language file.
-
 	prnMsg (_('Rebuilding the default language file ') . '.....<br />', 'info', ' ');
-
-	system($xgettextCmd);
-
+	$Result = rename($PathToDefault, $PathToDefault . '.old');// Renames pot file to bak.
+	system($xgettextCmd);// Runs xgettext to recreate the default message.po language file.
 	prnMsg (_('Done') .  '. ' . _('You should now edit the default language file header') . '<br />', 'info', ' ');
-
 	echo "<div class='centre'><a href='" . $RootPath . "/Z_poAdmin.php'>" . _('Back to the menu') . "</a></div>";
 	echo '</form>';
 	echo '</td></tr></table>';
 
 } else {
-
 	/* set up the page for editing */
-
 	echo '<div class="centre">';
 	echo '<br />';
 	prnMsg (_('Every new language creates a new translation file from the system default one') . '.<br />' .
@@ -61,11 +53,9 @@
 	echo '<br />';
 	echo '<form method="post" action=' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' . SID . '>';
 	echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-
 	echo '<input type="submit" name="submit" value="' . _('Proceed') . '" />&nbsp;&nbsp;';
 	echo '</form>';
 	echo '</div>';
-
 }
 
 include('includes/footer.inc');

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2014-08-12 19:16:00 UTC (rev 6809)
+++ trunk/doc/Change.log	2014-08-13 02:55:08 UTC (rev 6810)
@@ -1,5 +1,6 @@
 webERP Change Log
 
+12/08/14 RChacon: In Z_poRebuildDefault.php: extends title, improves comments, sets file to pot, updates $FilesToInclude, renames old pot file to bak extension. Minor improvements.
 08/08/14 Andrew Galuski: Add SQL and maintenance screens for Location based security. added new report aged controlled stock.  additional scripts to follow as time allows
 2/1/14 Tim: Change columns around on SelectWorkOrder.php
 31/07/14 RChacon: Corrects the bottom line of the rectangle. Adds comments (info for developers).