SVN Commit by dpage: r4130 - in trunk/www/pgadmin3: . cache class cnt - Mailing list pgadmin-hackers

From svn@pgadmin.org
Subject SVN Commit by dpage: r4130 - in trunk/www/pgadmin3: . cache class cnt
Date
Msg-id 200505041535.j44FZSQI003878@dev.pgadmin.org
Whole thread Raw
List pgadmin-hackers
Author: dpage
Date: 2005-05-04 16:35:28 +0100 (Wed, 04 May 2005)
New Revision: 4130

Added:
   trunk/www/pgadmin3/svnrepo
Modified:
   trunk/www/pgadmin3/cache/update.php
   trunk/www/pgadmin3/class/pgadmin_po.php
   trunk/www/pgadmin3/cnt/cnt_translation.php
Log:
Update website for new server and SVN


Modified: trunk/www/pgadmin3/cache/update.php
===================================================================
--- trunk/www/pgadmin3/cache/update.php    2005-05-04 14:36:38 UTC (rev 4129)
+++ trunk/www/pgadmin3/cache/update.php    2005-05-04 15:35:28 UTC (rev 4130)
@@ -6,10 +6,10 @@
     $outofdate = new po_status();

     $translated->setWebRoot($_SERVER["DOCUMENT_ROOT"]);
-    $translated->setCvsRoot($_SERVER["DOCUMENT_ROOT"]."/cvsroot/pgadmin3");
+    $translated->setSvnRoot($_SERVER["DOCUMENT_ROOT"]."/svnrepo");

     $outofdate->setWebRoot($_SERVER["DOCUMENT_ROOT"]);
-    $outofdate->setCvsRoot($_SERVER["DOCUMENT_ROOT"]."/cvsroot/pgadmin3");
+    $outofdate->setSvnRoot($_SERVER["DOCUMENT_ROOT"]."/svnrepo");

     require_once "../cnt/cnt_translation_status.php";


Modified: trunk/www/pgadmin3/class/pgadmin_po.php
===================================================================
--- trunk/www/pgadmin3/class/pgadmin_po.php    2005-05-04 14:36:38 UTC (rev 4129)
+++ trunk/www/pgadmin3/class/pgadmin_po.php    2005-05-04 15:35:28 UTC (rev 4130)
@@ -5,7 +5,7 @@
 //

 class po_status {
-    var $_cvsroot;
+    var $_svnrepo;
     var $_webroot;
     var $_content = array();
     var $_size = 0;
@@ -57,16 +57,16 @@
         $this->_webroot = $_webroot;
   }

-  function setCvsRoot ($_cvsroot) {
-    if (file_exists($_cvsroot."/CVS/Repository")) {
-    $this->_cvsroot = $_cvsroot;
+  function setSvnRoot ($_svnrepo) {
+    if (file_exists($_svnrepo."/.svn/format")) {
+    $this->_svnrepo = $_svnrepo;
     } else {
-        $this->_error = "Error: $_cvsroot is not a CVS repository.";
+        $this->_error = "Error: $_svnrepo is not a Subversion repository.";
     }
   }

   function getLanguageTemplate() {
-    return "../" .str_replace ($this->_webroot ."/", "", $this->_cvsroot) . "/pgadmin3.pot";
+    return "../" .str_replace ($this->_webroot ."/", "", $this->_svnrepo) . "/pgadmin3.pot";
   }

   function getLanguageTotal() {
@@ -88,15 +88,15 @@
     $this->_content['pot_path'][$this->_size]  = "unused";      //$_pot_path;

     $_pot_stat = array();
-    $_pot_stat = $this->getStatistics ($this->_cvsroot . "/pgadmin3.pot");
+    $_pot_stat = $this->getStatistics ($this->_svnrepo . "/pgadmin3.pot");
     $this->_content['pot_total'][$this->_size] = $_pot_stat['total'];

     $this->_content['po_name'][$this->_size]   = "unused";      //$_po_name;
     $this->_content['po_path'][$this->_size]   = "unused";      // $_po_path;

     $_po_stat = array();
-    $_po_stat = $this->getStatistics ($this->_cvsroot . "/src/ui/" . $_locale . "/pgadmin3.po");
-
+    $_po_stat = $this->getStatistics ($this->_svnrepo . "/src/ui/" . $_locale . "/pgadmin3.po");
+
     $this->_content['po_total'][$this->_size]        = $_po_stat['total'];

     $this->_content['po_translated'][$this->_size]   = $_po_stat['translated'];
@@ -285,8 +285,8 @@

       $_mo_name  = $_locale . "/pgadmin3.mo";
       $_po_name  = $_locale . "/pgadmin3.po";
-      $_mo_path = "../" .str_replace ($this->_webroot ."/", "", $this->_cvsroot) . "/src/ui/" . $_locale .
"/pgadmin3.mo";
-      $_po_path = "../" .str_replace ($this->_webroot ."/", "", $this->_cvsroot) . "/src/ui/" . $_locale .
"/pgadmin3.po";
+      $_mo_path = "../" .str_replace ($this->_webroot ."/", "", $this->_svnrepo) . "/src/ui/" . $_locale .
"/pgadmin3.mo";
+      $_po_path = "../" .str_replace ($this->_webroot ."/", "", $this->_svnrepo) . "/src/ui/" . $_locale .
"/pgadmin3.po";

       $_result = $_result . "<tr bgcolor=$_colour>" .
       "<td>$_locale</td>" .
@@ -308,7 +308,7 @@
       $_pathinfo = pathinfo($_po_file_path);
     $_dir      = $_pathinfo["dirname"];

-    $_command = "cd $_dir; export LANGUAGE=en_US; /usr/local/bin/msgfmt --statistics $_po_file_path 2>&1";
+    $_command = "cd $_dir; export LANGUAGE=en_US; /usr/bin/msgfmt --statistics $_po_file_path 2>&1";
     $_command_result = shell_exec ($_command);

     // echo $_command_result."<br>";

Modified: trunk/www/pgadmin3/cnt/cnt_translation.php
===================================================================
--- trunk/www/pgadmin3/cnt/cnt_translation.php    2005-05-04 14:36:38 UTC (rev 4129)
+++ trunk/www/pgadmin3/cnt/cnt_translation.php    2005-05-04 15:35:28 UTC (rev 4130)
@@ -4,10 +4,10 @@
   $outofdate = new po_status();

   $translated->setWebRoot($_SERVER["DOCUMENT_ROOT"]);
-  $translated->setCvsRoot($_SERVER["DOCUMENT_ROOT"]."/cvsroot/pgadmin3");
+  $translated->setSvnRoot($_SERVER["DOCUMENT_ROOT"]."/svnrepo");

   $outofdate->setWebRoot($_SERVER["DOCUMENT_ROOT"]);
-  $outofdate->setCvsRoot($_SERVER["DOCUMENT_ROOT"]."/cvsroot/pgadmin3");
+  $outofdate->setSvnRoot($_SERVER["DOCUMENT_ROOT"]."/svnrepo");

   $_cache_translated = "cache/cache_translated.txt";
   $_cache_outofdate     = "cache/cache_outofdate.txt";
@@ -31,7 +31,7 @@
      <?php  echo sprintf(_("pgAdmin III is already translated in %d languages, and translators all around the world
areadding more and more language options."), $translated->getNbLanguages() + $outofdate->getNbLanguages());?> 
      <?php  echo _("In case a language you find here isn't included in your distribution package, you can easily
upgradeyour installation to support that additional language.");?> 
      <?php  echo sprintf(_("Simply locate the appropriate language file (pgadmin3.mo) in the <A
HREF='%s'>Translation</A>section, create a subdirectory in your installation's ui directory with a name corresponding
tothe locale code,  and copy the new translation file into that directory."), "#published");?> 
-     <?php  echo sprintf(_("You might need to update the language description file from <A
HREF='%s'>ui/pgadmin3.lng</A>to let the new language appear in the language selection combobox."),
"http://cvs.pgadmin.org/cgi-bin/viewcvs.cgi/pgadmin3/src/ui/pgadmin3.lng?rev=HEAD&content-type=text/lng");?>
+     <?php  echo sprintf(_("You might need to update the language description file from <A
HREF='%s'>ui/pgadmin3.lng</A>to let the new language appear in the language selection combobox."),
"http://svn.pgadmin.org/cgi-bin/viewcvs.cgi/*checkout*/trunk/pgadmin3/src/ui/pgadmin3.lng");?>
      <br>
 </dd>
 <h1 id="contribute"><?php echo _("Contribute a translation");?></h1>

Added: trunk/www/pgadmin3/svnrepo
===================================================================
--- trunk/www/pgadmin3/svnrepo    2005-05-04 14:36:38 UTC (rev 4129)
+++ trunk/www/pgadmin3/svnrepo    2005-05-04 15:35:28 UTC (rev 4130)
@@ -0,0 +1 @@
+link ../pgadmin3-svn
\ No newline at end of file


Property changes on: trunk/www/pgadmin3/svnrepo
___________________________________________________________________
Name: svn:special
   + *


pgadmin-hackers by date:

Previous
From: svn@pgadmin.org
Date:
Subject: SVN Commit by dpage: r4129 - trunk/www/pgadmin3
Next
From: svn@pgadmin.org
Date:
Subject: SVN Commit by dpage: r4131 - trunk/www/pgadmin3/cnt