phpwebapp-commits — Automatic announcement of each commit made to phpwebapp project.

[phpwebapp-commits] CVS: web_app const.Paths.php,1.8,1.9 class.WebApp.php,1.27,1.28 WebApp.php,1.8,1.9

[Dashamir H. <das...@us...>]

Update of /cvsroot/phpwebapp/web_app
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1556

Modified Files:
	const.Paths.php class.WebApp.php WebApp.php 
Log Message:
i18n and l10n of web_app messages


Index: const.Paths.php
===================================================================
RCS file: /cvsroot/phpwebapp/web_app/const.Paths.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** const.Paths.php	26 Oct 2005 14:33:21 -0000	1.8
--- const.Paths.php	1 Nov 2005 13:24:25 -0000	1.9
***************
*** 29,33 ****
  define("PARSER_PATH",           WEBAPP_PATH."parser/");
  define("SESSION_PATH",          WEBAPP_PATH."session/");
! define("L10N_PATH",             WEBAPP_PATH."l10n/");
  define("DB_PATH",               WEBAPP_PATH."database/");
  define("APPEND_PATH",           WEBAPP_PATH."append/");
--- 29,33 ----
  define("PARSER_PATH",           WEBAPP_PATH."parser/");
  define("SESSION_PATH",          WEBAPP_PATH."session/");
! define("L10N_PATH",             WEBAPP_PATH."l10n-module/");
  define("DB_PATH",               WEBAPP_PATH."database/");
  define("APPEND_PATH",           WEBAPP_PATH."append/");

Index: class.WebApp.php
===================================================================
RCS file: /cvsroot/phpwebapp/web_app/class.WebApp.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** class.WebApp.php	6 Jul 2005 15:28:24 -0000	1.27
--- class.WebApp.php	1 Nov 2005 13:24:25 -0000	1.28
***************
*** 60,65 ****
      else
        {
!         $err_msg = "WebApp::callFreeEvent(): File '$fname' not found.";
!         print WebApp::error_msg($err_msg);
        }
    }
--- 60,66 ----
      else
        {
!         $msg = TF_("File 'v_fname' not found");
!         $msg = str_replace('v_fname', $fname, $msg);
!         print WebApp::error_msg("WebApp::callFreeEvent(): $msg.");
        }
    }
***************
*** 361,366 ****
      if ($errormsg<>'')
        {
!         $err_msg = "Evaluating expression: '\$value = $expr;' $errormsg";
!         print WebApp::error_msg($err_msg);
        }
  
--- 362,369 ----
      if ($errormsg<>'')
        {
!         $msg = T_("Evaluating expression: '\$value = v_expr;' v_errormsg");
!         $msg = str_replace('v_expr', $expr, $msg);
!         $msg = str_replace('v_errormsg', $errormsg, $msg);
!         print WebApp::error_msg($msg);
        }
  
***************
*** 491,495 ****
          break;
        default:
!         print "warning: escape_quotes: the quote '$quote' is unknown.<br />\n";
          break;
        }
--- 494,500 ----
          break;
        default:
!         $msg = TF_("the quote 'v_quote' is unknown");
!         $msg = str_replace('v_quote', $quote, $msg);
!         print WebApp::warning_msg("WebApp::escape_quotes(): $msg.<br />\n");
          break;
        }
***************
*** 541,545 ****
      if ($rs==UNDEFINED)
        {
!         print WebApp::error_msg("WebApp::execDBCmd(): dbCommand '$cmd_id' is undefined.");
          return false;
        }
--- 546,552 ----
      if ($rs==UNDEFINED)
        {
!         $msg = TF_("dbCommand 'v_cmd_id' is undefined");
!         $msg = str_replace('v_cmd_id', $cmd_id, $msg);
!         print WebApp::error_msg("WebApp::execDBCmd(): $msg.");
          return false;
        }
***************
*** 572,576 ****
      else
        {
!         print WebApp::error_msg("WebApp::openRS(): recordset '$rs_id' is undefined.");
          return UNDEFINED;
        }
--- 579,585 ----
      else
        {
!         $msg = TF_("recordset 'v_rs_id' is undefined");
!         $msg = str_replace('v_rs_id', $rs_id, $msg);
!         print WebApp::error_msg("WebApp::openRS(): $msg.");
          return UNDEFINED;
        }

Index: WebApp.php
===================================================================
RCS file: /cvsroot/phpwebapp/web_app/WebApp.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** WebApp.php	16 Jun 2005 11:34:37 -0000	1.8
--- WebApp.php	1 Nov 2005 13:24:25 -0000	1.9
***************
*** 24,27 ****
--- 24,30 ----
  include_once WEBAPP_PATH."const.Paths.php";
  
+ //include localization component
+ include_once L10N_PATH."class.L10n.php";
+ 
  //include session
  include_once SESSION_PATH."class.Request.php";
***************
*** 32,38 ****
  include_once PARSER_PATH."package.ParseRender.php";
  
- //include localization component
- include_once L10N_PATH."class.L10n.php";
- 
  //include database component
  include_once DB_PATH."package.DB.php";
--- 35,38 ----

[phpwebapp-commits] CVS: web_app/parser class.WebPage.php,1.20,1.21 class.WebObjectTpl.php,1.10,1.11 class.WebObject.php,1.11,1.12 class.Render.php,1.25,1.26 class.Parser.php,1.24,1.25

[Dashamir H. <das...@us...>]

Update of /cvsroot/phpwebapp/web_app/parser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1556/parser

Modified Files:
	class.WebPage.php class.WebObjectTpl.php class.WebObject.php 
	class.Render.php class.Parser.php 
Log Message:
i18n and l10n of web_app messages


Index: class.WebPage.php
===================================================================
RCS file: /cvsroot/phpwebapp/web_app/parser/class.WebPage.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** class.WebPage.php	7 Jul 2005 07:08:40 -0000	1.20
--- class.WebPage.php	1 Nov 2005 13:24:25 -0000	1.21
***************
*** 50,54 ****
     * with msgid as key and msgstr (translation) as value.
     */
!   var $js_i18n_messages;
  
    /** 
--- 50,54 ----
     * with msgid as key and msgstr (translation) as value.
     */
!   var $js_l10n_messages;
  
    /** 
***************
*** 85,89 ****
      $this->rs_collection = array();
  
!     $this->js_i18n_messages = array();
      $this->messages = array();
      $this->popup_windows = array();
--- 85,89 ----
      $this->rs_collection = array();
  
!     $this->js_l10n_messages = array();
      $this->messages = array();
      $this->popup_windows = array();
***************
*** 121,125 ****
      if (!isset($tpl->id))
        {
!         print "Error:WebPage:addTemplate: unidentified template.\n";
          $tpl->toText();
          return;
--- 121,126 ----
      if (!isset($tpl->id))
        {
!         $msg = TF_("unidentified template");
!         print WebApp::error_msg("WebPage::addTemplate(): $msg.\n");
          $tpl->toText();
          return;
***************
*** 172,176 ****
      if (!isset($rs->ID))
        {
!         print WebApp::error_msg("Error:WebPage::addRecordset(): unidentified recordset.\n");
          print $rs->toHtmlTable();
          return;
--- 173,178 ----
      if (!isset($rs->ID))
        {
!         $msg = TF_("unidentified recordset");
!         print WebApp::error_msg("WebPage::addRecordset(): $msg.\n");
          print $rs->toHtmlTable();
          return;
***************
*** 210,213 ****
--- 212,268 ----
  
    /**
+    * Extract translatable messages (which are denoted by T_("...")
+    * or TF_("...") ) from a JS file, and save them in the 
+    * associative array  $this->js_l10n_messages . These messages
+    * (and their translations) are later appended at the end of the page
+    * in order to enable the translation of JS messages.
+    * Called by WebObjTpl::before_render().
+    */
+   function extract_js_l10n_messages($js_filename)
+   {
+     //match patterns like this: T_("....") or TF_("....")
+     $pattern = '#(TF?_)\("([^"]+)"\)#';
+     $js_code = file_get_contents($js_filename);
+     preg_match_all($pattern, $js_code, $matches);
+     for ($i=0; $i < sizeof($matches[1]); $i++)
+       {
+         $f_name = $matches[1][$i];  //function name (T_ or TF_)
+         $msgid  = $matches[2][$i];  //the string of the message
+         $pattern = "\\\\n(\\\\ *\n)"; //replace '\n' by newline 
+         $msgid = ereg_replace($pattern, "\n\\1", $msgid);
+ 
+         //translate; either T_($msgid) or TF_($msgid)
+         $msgstr = $f_name($msgid);
+         $this->js_l10n_messages[$msgid] = $msgstr;
+       }
+   }
+ 
+   /**
+    * Convert the messages in $this->js_l10n_messages into
+    * JavaScript code that can be used to translate JS messages.
+    * Returns a JS code that is appended at the end of the page
+    * (this function is called by 'l10n-module/wbJSL10n.php').
+    */
+   function js_l10n_messages_to_js()
+     {
+       $arr_msg = array();
+       while ( list($msgid, $msgstr) = each($this->js_l10n_messages) )
+         {
+           //remove an extra slash and newline
+           $msgid = str_replace("\\\n", "", $msgid);
+ 
+           //replace newlines by '\n' (otherwise JS error will occur)
+           $msgid = str_replace("\n", "\\n", $msgid);
+           $msgstr = str_replace("\n", "\\n", $msgstr);
+ 
+           //add the translation in the list of messages
+           $arr_msg[] = "l10n.addMsg(\"$msgid\", \"$msgstr\");";
+         }
+       $js_code = implode($arr_msg, "\n  ");
+ 
+       return $js_code;
+     }
+ 
+   /**
     * Returns JS code that displays an alert for
     * each message in the messages array.

Index: class.WebObjectTpl.php
===================================================================
RCS file: /cvsroot/phpwebapp/web_app/parser/class.WebObjectTpl.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** class.WebObjectTpl.php	22 Jun 2005 12:56:28 -0000	1.10
--- class.WebObjectTpl.php	1 Nov 2005 13:24:25 -0000	1.11
***************
*** 84,88 ****
    function before_render()
    {
!     global $tplVars, $l10n;
  
      //use another translation file, if such a file exists
--- 84,88 ----
    function before_render()
    {
!     global $tplVars, $l10n, $webPage;
  
      //use another translation file, if such a file exists
***************
*** 107,111 ****
  
      //extract translatable messages in the JS code
!     $this->get_translatable_messages();
  
      //call the function onRender of this WebObject
--- 107,111 ----
  
      //extract translatable messages in the JS code
!     $this->extract_js_l10n_messages();
  
      //call the function onRender of this WebObject
***************
*** 114,139 ****
  
    /**
!    * Extract translatable messages (which are denoted by T_("...") )
!    * from a JS file, and save them in the associative array
!    * $webPage->js_i18n_messages
!    * Called by before_render()
     */
!   function get_translatable_messages()
    {
!     $fname = $this->class->path.$this->id.".js";
      if (file_exists($fname))
        {
          global $webPage;
!         $pattern = '#T_\("([^"]+)"\)#'; //match patterns like this: T_("....")
!         $js_code = file_get_contents($fname);
!         preg_match_all($pattern, $js_code, $matches);
!         for ($i=0; $i < sizeof($matches[1]); $i++)
!           {
!             $msgid = $matches[1][$i];
!             $pattern = "\\\\n(\\\\ *\n)"; //replace '\n' by newline 
!             $msgid = ereg_replace($pattern, "\n\\1", $msgid);
!             $msgstr = T_($msgid);
!             $webPage->js_i18n_messages[$msgid] = $msgstr;
!           }
        }
    }
--- 114,127 ----
  
    /**
!    * Extract translatable messages (which are denoted by T_("...")
!    * or TF_("...") ) from a JS file. Called by before_render().
     */
!   function extract_js_l10n_messages()
    {
!     $fname = $this->class->path . $this->class->id . ".js";
      if (file_exists($fname))
        {
          global $webPage;
!         $webPage->extract_js_l10n_messages($fname);
        }
    }

Index: class.WebObject.php
===================================================================
RCS file: /cvsroot/phpwebapp/web_app/parser/class.WebObject.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** class.WebObject.php	20 Sep 2004 13:28:06 -0000	1.11
--- class.WebObject.php	1 Nov 2005 13:24:25 -0000	1.12
***************
*** 166,170 ****
          break;
        default:
!         print WebApp::warning_msg("WebObject::getSVars(): unreckognized \$type '$type'.");
        case UNDEFINED:
          $arr_vars = array_merge($session->Vars, $session->dbVars);
--- 166,172 ----
          break;
        default:
!         $msg = TF_("unreckognized \$type 'v_type'");
!         $msg = str_replace('v_type', $type, $msg);
!         print WebApp::warning_msg("WebObject::getSVars(): $msg.");
        case UNDEFINED:
          $arr_vars = array_merge($session->Vars, $session->dbVars);

Index: class.Render.php
===================================================================
RCS file: /cvsroot/phpwebapp/web_app/parser/class.Render.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** class.Render.php	6 Jul 2005 14:07:21 -0000	1.25
--- class.Render.php	1 Nov 2005 13:24:25 -0000	1.26
***************
*** 53,59 ****
    function render_string($str, $indent =true)
    {
!     //translate all T_("xyz") strings
      global $l10n;
!     if (ereg('T_\\("[^"]*"\\)', $str))  $str = $l10n->translate($str);
  
      //replace all {{tpl_vars}}
--- 53,59 ----
    function render_string($str, $indent =true)
    {
!     //translate all T_("xyz") and TF_("xyz") strings
      global $l10n;
!     if (ereg('TF?_\\("[^"]*"\\)', $str))  $str = $l10n->translate($str);
  
      //replace all {{tpl_vars}}
***************
*** 321,324 ****
--- 321,328 ----
      global $tplVars, $l10n;
      $l10n->pushState();
+     $dir = $wobj_tpl->class->path;
+     $id = $wobj_tpl->class->id;
+     $l10n->set_translation_file($dir, $id);
+ 
      $tplVars->pushScope(); //create a new variable scope
  
***************
*** 355,360 ****
      else //such a recordset does not exist
        {
!         $err_msg = WebApp::error_msg("Recordset '$rs_id' is undefined.");
!         $this->render_string($err_msg);
          $this->render_tpl($tpl);
          return;
--- 359,365 ----
      else //such a recordset does not exist
        {
!         $msg = TF_("Recordset 'v_rs_id' is undefined.");
!         $msg = str_replace('v_rs_id', $rs_id, $msg);
!         $this->render_string(WebApp::error_msg($msg));
          $this->render_tpl($tpl);
          return;
***************
*** 363,368 ****
      if ($rs->type<>"PagedRS")
        {
!         $err_msg = "Recordset '$rs_id' is not of type PagedRS.";
!         $this->render_string(WebApp::error_msg($err_msg));
          $this->render_tpl($tpl);
          return;
--- 368,374 ----
      if ($rs->type<>"PagedRS")
        {
!         $msg = TF_("Recordset 'v_rs_id' is not of type PagedRS.");
!         $msg = str_replace('v_rs_id', $rs_id, $msg);
!         $this->render_string(WebApp::error_msg($msg));
          $this->render_tpl($tpl);
          return;
***************
*** 401,406 ****
      else //such a recordset does not exist
        {
!         $err_msg = WebApp::error_msg("Recordset '$rs_id' is undefined.");
!         $this->render_string($err_msg);
          $this->render_tpl($tpl);
          return;
--- 407,413 ----
      else //such a recordset does not exist
        {
!         $msg = TF_("Recordset 'v_rs_id' is undefined.");
!         $msg = str_replace('v_rs_id', $rs_id, $msg);
!         $this->render_string(WebApp::error_msg($msg));
          $this->render_tpl($tpl);
          return;

Index: class.Parser.php
===================================================================
RCS file: /cvsroot/phpwebapp/web_app/parser/class.Parser.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** class.Parser.php	24 Jun 2005 14:50:35 -0000	1.24
--- class.Parser.php	1 Nov 2005 13:24:25 -0000	1.25
***************
*** 93,98 ****
      if (!file_exists($filename))
        {
!         $msg = "Parser::parse_file(): file '$filename' does not exist.";
!         $err_msg = WebApp::error_msg($msg);
          $this->append($err_msg);
          return UNDEFINED;  
--- 93,99 ----
      if (!file_exists($filename))
        {
!         $msg = TF_("file 'v_filename' does not exist");
!         $msg = str_replace('v_filename', $filename, $msg);
!         $err_msg = WebApp::error_msg("Parser::parse_file(): $msg.");
          $this->append($err_msg);
          return UNDEFINED;  
***************
*** 463,467 ****
    }
  
!   /** Append $data to the last element of the content of the current_tpl. */
    function append($data)
    {
--- 464,468 ----
    }
  
!   /** Append $data to the contents of the current_tpl. */
    function append($data)
    {
***************
*** 538,544 ****
    function link_template($tpl)
    {
-     //set the current_tpl as the parent of $tpl
-     $tpl->parent = &$this->current_tpl;
- 
      //set a reference from the current_tpl to the new template;
      $this->append('&&'.$tpl->id.';;');
--- 539,542 ----
***************
*** 574,577 ****
--- 572,576 ----
      //create a new file template
      $tpl = new FileTpl($tpl_filename);
+     $tpl->parent = &$this->current_tpl;
  
      //parse the file into this FileTpl
***************
*** 627,632 ****
      else
        {
!         $msg = "<IfEmpty> element can be used "
!           ."only inside a <Repeat> element";
          $err_msg = WebApp::error_msg($msg);
          $this->append($err_msg);
--- 626,630 ----
      else
        {
!         $msg = TF_("<IfEmpty> element can be used only inside a <Repeat> element");
          $err_msg = WebApp::error_msg($msg);
          $this->append($err_msg);
***************
*** 659,664 ****
      else
        {
!         $msg = "<Separator> element can be used "
!           ."only inside a <Repeat> element";
          $err_msg = WebApp::error_msg($msg);
          $this->append($err_msg);
--- 657,661 ----
      else
        {
!         $msg = TF_("<Separator> element can be used only inside a <Repeat> element");
          $err_msg = WebApp::error_msg($msg);
          $this->append($err_msg);
***************
*** 794,801 ****
      $id = $attribs['ID'];
  
      global $webPage;
!     if ($webPage->getTemplate($id)<>UNDEFINED)
        {
!         $msg = "Redeclaration of <WebClass ID=\"$id\">.";
          $warning_msg = WebApp::warning_msg($msg);
          $this->append($warning_msg);
--- 791,811 ----
      $id = $attribs['ID'];
  
+     //check that a webclass with such an id is not already loaded
      global $webPage;
!     $tpl = $webPage->getTemplate($id);
! 
!     //$reinclude is true when the same webclass is included again
!     $reinclude = ( $tpl!=UNDEFINED
!                    and $tpl->parent->id == $this->current_tpl->id );
! 
!     //$redeclaration is true if this is another webclass with the same id
!     $redeclaration = ( $tpl!=UNDEFINED
!                        and $tpl->parent->id != $this->current_tpl->id );
! 
!     if ($redeclaration)
        {
!         $msg = TF_("Redeclaration of <WebClass ID=\"v_id\"> in 'v_path'.");
!         $msg = str_replace('v_id', $id, $msg);
!         $msg = str_replace('v_path', $this->current_tpl->id, $msg);
          $warning_msg = WebApp::warning_msg($msg);
          $this->append($warning_msg);
***************
*** 807,811 ****
      $tpl->parent = &$this->current_tpl;
  
!     $tpl->before_parse();
  
      //copy the <WebClass> element into $tpl
--- 817,821 ----
      $tpl->parent = &$this->current_tpl;
  
!     if (!$reinclude)  $tpl->before_parse();
  
      //copy the <WebClass> element into $tpl
***************
*** 833,838 ****
        {
          //give an error message
!         $msg = "Parser: <parameter name='$name' default='$default'/> "
!           . "can be used only inside a <webclass> element.";
          $err_msg = WebApp::error_msg($msg);
          $this->append($err_msg);
--- 843,847 ----
        {
          //give an error message
!         $msg = TF_("<parameter/> can be used only inside a <webclass> element.");
          $err_msg = WebApp::error_msg($msg);
          $this->append($err_msg);
***************
*** 858,862 ****
        {
          $webobj_elem = '<WebObject'.$this->get_attr_list($attribs).' />';
!         $msg = "Parse: <WebClass> '$class_name' is not defined.";
          $this->append(WebApp::error_msg($webobj_elem));
          $this->append(WebApp::error_msg($msg));
--- 867,872 ----
        {
          $webobj_elem = '<WebObject'.$this->get_attr_list($attribs).' />';
!         $msg = TF_("<WebClass> 'v_class_name' is not defined.");
!         $msg = str_replace('v_class_name', $class_name, $msg);
          $this->append(WebApp::error_msg($webobj_elem));
          $this->append(WebApp::error_msg($msg));
***************
*** 929,933 ****
        {
        default:
!         $msg = "Recordset '$id': type '$type' is unknown";
          print WebApp::error_msg($msg);
        case UNDEFINED:
--- 939,945 ----
        {
        default:
!         $msg = TF_("Recordset 'v_id': type 'v_type' is unknown");
!         $msg = str_replace('v_id', $id, $msg);
!         $msg = str_replace('v_type', $type, $msg);
          print WebApp::error_msg($msg);
        case UNDEFINED:

[phpwebapp-commits] CVS: web_app/boxes/docbook/l10n docbook.po,NONE,1.1

[Dashamir H. <das...@us...>]

Update of /cvsroot/phpwebapp/web_app/boxes/docbook/l10n
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1556/boxes/docbook/l10n

Added Files:
	docbook.po 
Log Message:
i18n and l10n of web_app messages


--- NEW FILE: docbook.po ---
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2005-11-01 10:01+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"

#: ../boxes/docbook/docbook.php:62
msgid "Table Of Contents"
msgstr ""

[phpwebapp-commits] CVS: web_app/boxes/folderListing folderListing.php,1.5,1.6

[Dashamir H. <das...@us...>]

Update of /cvsroot/phpwebapp/web_app/boxes/folderListing
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1556/boxes/folderListing

Modified Files:
	folderListing.php 
Log Message:
i18n and l10n of web_app messages


Index: folderListing.php
===================================================================
RCS file: /cvsroot/phpwebapp/web_app/boxes/folderListing/folderListing.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** folderListing.php	22 Jul 2004 16:25:39 -0000	1.5
--- folderListing.php	1 Nov 2005 13:24:25 -0000	1.6
***************
*** 103,107 ****
      if (filetype($folder_path) <> 'dir')
        {
!         print WebApp::error_msg("'$folder_path' is not a folder.");
          return;
        }
--- 103,109 ----
      if (filetype($folder_path) <> 'dir')
        {
!         $msg = T_("'v_folder_path' is not a folder.");
!         $msg = str_replace('v_folder_path', $folder_path, $msg);
!         print WebApp::error_msg($msg);
          return;
        }
***************
*** 110,114 ****
      if (!$dir)
        {
!         print WebApp::error_msg("Cannot open folder '$folder_path'.");
          return;
        }
--- 112,118 ----
      if (!$dir)
        {
!         $msg = T_("Cannot open folder 'v_folder_path'.");
!         $msg = str_replace('v_folder_path', $folder_path, $msg);
!         print WebApp::error_msg($msg);
          return;
        }

[phpwebapp-commits] CVS: web_app/boxes/menu/l10n menu.po,NONE,1.1

[Dashamir H. <das...@us...>]

Update of /cvsroot/phpwebapp/web_app/boxes/menu/l10n
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1556/boxes/menu/l10n

Added Files:
	menu.po 
Log Message:
i18n and l10n of web_app messages


--- NEW FILE: menu.po ---
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2005-11-01 10:01+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"

#: ../boxes/menu/edit/edit_menu.js:36
msgid "ID cannot be empty."
msgstr ""

#: ../boxes/menu/edit/edit_menu.js:42
msgid "Caption cannot be empty."
msgstr ""

#: ../boxes/menu/edit/edit_menu.js:78
msgid "Please fill the ID field."
msgstr ""

#: ../boxes/menu/edit/edit_menu.js:84
msgid "Please fill the Caption field."
msgstr ""

[phpwebapp-commits] CVS: web_app/l10n xgettext.sh,NONE,1.1 web_app.po,NONE,1.1 msgmerge.sh,NONE,1.1 msginit.sh,NONE,1.1 msgfmt.sh,NONE,1.1 delete.sh,NONE,1.1 README,NONE,1.1

[Dashamir H. <das...@us...>]

Update of /cvsroot/phpwebapp/web_app/l10n
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1556/l10n

Added Files:
	xgettext.sh web_app.po msgmerge.sh msginit.sh msgfmt.sh 
	delete.sh README 
Log Message:
i18n and l10n of web_app messages


--- NEW FILE: xgettext.sh ---
#!/bin/bash

### go to this dir
cd $(dirname $0)

function get_translatable_strings
{
  dir=$1
  module=$2

  mkdir -p $dir/l10n/
  touch $dir/l10n/$module.po

  find $dir -name '*.php' -o -name '*.js' -o -name '*.html' \
    | xargs xgettext -C --keyword=T_ --join-existing \
                     --output-dir=$dir/l10n/ --output=$module.po

  # if it is not greater than zero, delete it
  if [ ! -s $dir/l10n/$module.po ]
  then
    rm -rf $dir/l10n/
  fi
}

### get the translatable strings of webobjects, webboxes and tools,
### from HTML, JS and PHP files
path_list="../boxes ../webobjects ../tools"
for path in $path_list
do
  module_list=$(ls $path/)
  for module in $module_list
  do
    get_translatable_strings $path/$module $module
  done
done


### get the translatable strings for the rest of the application
app_name=$(./get_app_name.sh)
touch web_app.po
find .. -path '../boxes'      -prune \
     -o -path '../webobjects' -prune \
     -o -path '../tools'      -prune \
     -o -name '*.php'  -print  \
     -o -name '*.js'   -print  \
     -o -name '*.html' -print  \
  | xargs xgettext -C --keyword=TF_ --join-existing --output=web_app.po


--- NEW FILE: web_app.po ---
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2005-11-01 10:01+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"

#: ../session/class.Session.php:200
msgid "DB var 'v_var_name' shadows an existing JS var with the same name."
msgstr ""

#: ../session/class.Session.php:210
msgid ""
"JS var 'v_var_name' is shadowed by an existing DB var with the same name."
msgstr ""

#: ../session/class.Session.php:310
msgid ""
"session DB vars saved as JS vars, there is no DB connection, make 'true' the "
"USES_DB constant in 'config/const.Settings.php'."
msgstr ""

#: ../parser/class.Parser.php:95
msgid "file 'v_filename' does not exist"
msgstr ""

#: ../parser/class.Parser.php:630 ../parser/class.Parser.php:628
msgid "<IfEmpty> element can be used only inside a <Repeat> element"
msgstr ""

#: ../parser/class.Parser.php:661 ../parser/class.Parser.php:659
msgid "<Separator> element can be used only inside a <Repeat> element"
msgstr ""

#: ../parser/class.Parser.php:798
msgid "Redeclaration of <WebClass ID=\"v_id\">."
msgstr ""

#: ../parser/class.Parser.php:835 ../parser/class.Parser.php:839
msgid "<parameter/> can be used only inside a <webclass> element."
msgstr ""

#: ../parser/class.Parser.php:859 ../parser/class.Parser.php:863
msgid "<WebClass> 'v_class_name' is not defined."
msgstr ""

#: ../parser/class.Parser.php:931 ../parser/class.Parser.php:935
msgid "Recordset 'v_id': type 'v_type' is unknown"
msgstr ""

#: ../parser/class.WebObject.php:168
msgid "unreckognized \\$type 'v_type'"
msgstr ""

#: ../parser/class.WebPage.php:123
msgid "unidentified template"
msgstr ""

#: ../parser/class.WebPage.php:175
msgid "unidentified recordset"
msgstr ""

#: ../database/class.EditableRS.php:58
msgid "pointer is at EOF"
msgstr ""

#: ../database/class.EditableRS.php:64
msgid "pointer is at BOF"
msgstr ""

#: ../database/class.EditableRS.php:244
msgid "there is already a field named 'v_fld_name'"
msgstr ""

#: ../class.WebApp.php:62
msgid "File 'v_fname' not found"
msgstr ""

#: ../class.WebApp.php:494
msgid "the quote 'v_quote' is unknown"
msgstr ""

#: ../class.WebApp.php:546
msgid "dbCommand 'v_cmd_id' is undefined"
msgstr ""

#: ../class.WebApp.php:579
msgid "recordset 'v_rs_id' is undefined"
msgstr ""

#: ../parser/class.Parser.php:800
msgid "Redeclaration of <WebClass ID=\"v_id\"> in 'v_path'."
msgstr ""

#: ../timer/class.Timer.js:68
msgid "'v_proc_id' already exists."
msgstr ""

#: ../timer/class.Timer.js:79
msgid "'v_proc_id' does not exist."
msgstr ""

#: ../session/class.Session.js:69
msgid ""
"There is a 'v_var_name' already in the list, use setVar to change its value."
msgstr ""

#: ../session/class.Session.js:85 ../session/class.Session.js:99
#: ../session/class.Session.js:112
msgid "'v_var_name' doesn't exist."
msgstr ""

#: ../timer/class.Timer.php:109
msgid "Time that spends the web-page to be transfered and loaded in browser"
msgstr ""

--- NEW FILE: msgmerge.sh ---
#!/bin/bash
### update old *.po files with new messages extracted by xgettext.sh

### go to this directory
cd $(dirname $0)

if [ "$1" = "" ]
then
  echo "Usage: $0 ll_CC"
  echo "where ll_CC is the language code, like en_US or sq_AL"
  exit 1
fi

lng=$1

### convert the *.po file of the application
dir=$lng/LC_MESSAGES
msgmerge --update $dir/web_app.po  web_app.po

### convert the *.po files of the components
path_list="../boxes ../webobjects ../tools"
for path in $path_list
do
  module_list=$(ls $path/)
  for module in $module_list
  do
    dir=$path/$module/l10n
    if [ -f $dir/$lng/LC_MESSAGES/$module.po ]
    then
      msgmerge --update $dir/$lng/LC_MESSAGES/$module.po $dir/$module.po
    fi
  done
done

--- NEW FILE: msginit.sh ---
#!/bin/bash
### create initial translation files for a language

### go to this directory
cd $(dirname $0)

if [ "$1" = "" ]
then
  echo "Usage: $0 ll_CC"
  echo "where ll_CC is the language code, like en_US or sq_AL"
  exit 1
fi

lng=$1

### create an initial *.po file for web_app
mkdir -p $lng/LC_MESSAGES/
msginit --input=web_app.po --locale=$lng --no-translator \
        --output-file=$lng/LC_MESSAGES/web_app.po

### create initial *.po files for the components
path_list="../boxes ../webobjects ../tools"
for path in $path_list
do
  module_list=$(ls $path/)
  for module in $module_list
  do
    dir=$path/$module/l10n
    if [ -f $dir/$module.po ]
    then
      mkdir -p $dir/$lng/LC_MESSAGES/
      msginit --input=$dir/$module.po --locale=$lng --no-translator \
              --output-file=$dir/$lng/LC_MESSAGES/$module.po
    fi
  done
done

--- NEW FILE: msgfmt.sh ---
#!/bin/bash
### convert translation files (*.po) to binary format (*.mo)

### go to this directory
cd $(dirname $0)

if [ "$1" = "" ]
then
  echo "Usage: $0 ll_CC"
  echo "where ll_CC is the language code, like en_US or sq_AL"
  exit 1
fi

lng=$1

### convert the *.po file of the application
dir=$lng/LC_MESSAGES
msgfmt --output-file=$dir/web_app.mo  $dir/web_app.po

### convert the *.po files of the components
path_list="../boxes ../webobjects ../tools"
for path in $path_list
do
  module_list=$(ls $path/)
  for module in $module_list
  do
    dir=$path/$module/l10n/$lng/LC_MESSAGES/
    if [ -f $dir/$module.po ]
    then
      msgfmt --output-file=$dir/$module.mo $dir/$module.po
    fi
  done
done

--- NEW FILE: delete.sh ---
#!/bin/bash
### delete translation files for the components

### go to this directory
cd $(dirname $0)

if [ "$1" = "" ]
then
  echo "Usage: $0 [ll_CC | all]"
  echo "where ll_CC is the language code, like en_US or sq_AL"
  exit 1
fi

if [ "$1" = "all" ]; then lng=""; else lng=$1; fi

path_list="../boxes ../webobjects ../tools"
for path in $path_list
do
  module_list=$(ls $path/)
  for module in $module_list
  do
    dir=$path/$module/l10n/$lng
    rm -rf $dir
  done
done

--- NEW FILE: README ---

To translate the messages for a language, first initialize the translation
files:
--scr
bash$ ./xgettext.sh
bash$ ./msginit.sh ll_CC
----
ll_CC is the language and country code, like 'en_US' or 'sq_AL'.


Then, translate the messages in the translation files:
--scr
bash$ find .. -name '*.po'
----

Finally, convert the translation files into binary format (*.mo):
--scr
bash$ ./msgfmt.sh ll_CC
----


To update the translation files (e.g. after a new release is out
and the message strings may have changed), do:
--scr
bash$ ./xgettext.sh
bash$ ./msgmerge.sh ll_CC
----
Then translate any new entries in the translation files, and then
convert again to binary format: `./msgfmt.sh ll_CC`.


Other gettext tools can be used as well, if needed. For more information
about them see `info gettext`.
 

[phpwebapp-commits] CVS: web_app/boxes/docbook/l10n - New directory

[Dashamir H. <das...@us...>]

Update of /cvsroot/phpwebapp/web_app/boxes/docbook/l10n
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1049/boxes/docbook/l10n

Log Message:
Directory /cvsroot/phpwebapp/web_app/boxes/docbook/l10n added to the repository

[phpwebapp-commits] CVS: web_app/boxes/webnotes/l10n - New directory

[Dashamir H. <das...@us...>]

Update of /cvsroot/phpwebapp/web_app/boxes/webnotes/l10n
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1049/boxes/webnotes/l10n

Log Message:
Directory /cvsroot/phpwebapp/web_app/boxes/webnotes/l10n added to the repository

[phpwebapp-commits] CVS: web_app/boxes/menu/l10n - New directory

[Dashamir H. <das...@us...>]

Update of /cvsroot/phpwebapp/web_app/boxes/menu/l10n
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1049/boxes/menu/l10n

Log Message:
Directory /cvsroot/phpwebapp/web_app/boxes/menu/l10n added to the repository

[phpwebapp-commits] CVS: web_app/boxes/folderListing/l10n - New directory

[Dashamir H. <das...@us...>]

Update of /cvsroot/phpwebapp/web_app/boxes/folderListing/l10n
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1049/boxes/folderListing/l10n

Log Message:
Directory /cvsroot/phpwebapp/web_app/boxes/folderListing/l10n added to the repository

[phpwebapp-commits] CVS: web_app/webobjects/dbTable/l10n - New directory

[Dashamir H. <das...@us...>]

Update of /cvsroot/phpwebapp/web_app/webobjects/dbTable/l10n
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1049/webobjects/dbTable/l10n

Log Message:
Directory /cvsroot/phpwebapp/web_app/webobjects/dbTable/l10n added to the repository

[phpwebapp-commits] CVS: web_app/webobjects/listbox/l10n - New directory

[Dashamir H. <das...@us...>]

Update of /cvsroot/phpwebapp/web_app/webobjects/listbox/l10n
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1049/webobjects/listbox/l10n

Log Message:
Directory /cvsroot/phpwebapp/web_app/webobjects/listbox/l10n added to the repository

[phpwebapp-commits] CVS: web_app/l10n-module wbJSL10n.php,NONE,1.1 wbJSL10n.html,NONE,1.1 class.L10n.php,NONE,1.1 class.L10n.js,NONE,1.1

[Dashamir H. <das...@us...>]

Update of /cvsroot/phpwebapp/web_app/l10n-module
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26701/l10n-module

Added Files:
	wbJSL10n.php wbJSL10n.html class.L10n.php class.L10n.js 
Log Message:
l10n renamed to l10n-module


--- NEW FILE: wbJSL10n.php ---
<?php
/*
This file is part of phpWebApp,  which is a framework for building web
application based on relational databases.

Copyright 2001,2002,2003,2004 Dashamir Hoxha, das...@us...

phpWebApp is free  software; you can redistribute it  and/or modify it
under the terms of the GNU  General Public License as published by the
Free Software Foundation; either version 2 of the License, or (at your
option) any later version.

phpWebApp  is distributed  in the  hope that  it will  be  useful, but
WITHOUT   ANY  WARRANTY;   without  even   the  implied   warranty  of
MERCHANTABILITY  or FITNESS  FOR A  PARTICULAR PURPOSE.   See  the GNU
General Public License for more details.

You  should have received  a copy  of the  GNU General  Public License
along with phpWebApp;  if not, write to the  Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/


/**
 * Includes the JS L10n messages in the HTML page.
 * @package l10n
 */
class wbJSL10n extends WebObject
{
  function onParse()
  {
    global $webPage;

    $l10n_url = WebApp::to_url(L10N_PATH);
    $include_l10n_js = 
      '  <script type="text/javascript" language="javascript" '
      . "src=\"${l10n_url}class.L10n.js\"></script>\n";
    $webPage->append_to_head($include_l10n_js);
  }

  function onRender()
  {
    global $webPage;  
    WebApp::addVar("JS_L10N_MESSAGES", $webPage->js_l10n_messages_to_js());
  }
}
?>
--- NEW FILE: wbJSL10n.html ---
<webbox id="wbJSL10n">
<!--# insert the JS l10n messages #-->
<script type="text/javascript" language="javascript">
//<![CDATA[
  l10n = new L10n();
  {{JS_L10N_MESSAGES}}
//]]>
</script>
</webbox>

--- NEW FILE: class.L10n.php ---
<?php
/*
This file is part of phpWebApp,  which is a framework for building web
application based on relational databases.

Copyright 2001,2002,2003,2004 Dashamir Hoxha, das...@us...

phpWebApp is free  software; you can redistribute it  and/or modify it
under the terms of the GNU  General Public License as published by the
Free Software Foundation; either version 2 of the License, or (at your
option) any later version.

phpWebApp  is distributed  in the  hope that  it will  be  useful, but
WITHOUT   ANY  WARRANTY;   without  even   the  implied   warranty  of
MERCHANTABILITY  or FITNESS  FOR A  PARTICULAR PURPOSE.   See  the GNU
General Public License for more details.

You  should have received  a copy  of the  GNU General  Public License
along with phpWebApp;  if not, write to the  Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/

if (USE_PHP_GETTEXT)
{
  include_once dirname(__FILE__)."/php-gettext/streams.php";
  include_once dirname(__FILE__)."/php-gettext/gettext.php";
}

/**
 * This class is used by the framework for translating messages and texts.
 * It can use either the PHP-gettext or the GNU gettext packages, since
 * both of them have some advantages or disadvantages.
 *
 * The framework allows to have separate translation (localization) files for
 * each template that is included and for each webobject. If the
 * directory that contains the template (or webbox) contains also
 * a subdirectory named 'l10n', then the framework will look inside
 * this directory for the file that contains the translations of the
 * messages of the template/webbox. It will look for the file
 * l10n/lng/LC_MESSAGES/tplname.mo (or l10n/lng/LC_MESSAGES/webboxid.mo)
 * which contains the translation messages of the template (or webbox).
 *
 * If the subdirectory 'l10n/' does not exist, the framework will 
 * look for the file tplname.mo (or webboxid.mo) in the first 'l10n/'
 * in the parent directory or in the ancestors. If even the application
 * directory does not contain a 'l10n/' subdir, then the last place 
 * to look for will be the system default (usually /usr/share/locale/).
 *
 * About the language code, if it is e.g. 'en_US', then it will search 
 * first the folder 'en_US/' and then the folder 'en/'.
 *
 * If the file tplname.mo (or webboxid.mo) is not found at all in 
 * the searched directories, then the last translation file (*.mo)
 * that was found will be used for translating messages. This is usually
 * the translation file (*.mo) of the containing template or webbox
 * (from which this template/webbox is included directly or indirectly).
 *
 * @package l10n
 */
class L10n
{
  /** path of the localization directory ('l10n/') */
  var $path;

  /** textdomain (basename of the .mo translation file) */
  var $domain;

  /** the code of the target language (e.g. en_US or sq_AL) */
  var $lng;

  /** the codeset of the target language */
  var $codeset;

  /** keeps the states of translation files */
  var $stack = array();

  /** used if the PHP-gettext is used instead of the GNU gettext */
  var $php_gettext;

  /**
   * Constructor.
   *
   * @path    is the localization (l10n) directory
   * @domain  is the name of the translation file (domain.mo)
   * @lng     is the language code, like 'en_US' or 'en', etc.
   * @codeset is the codeset of the language, like 'iso-latin-1', etc.
   */
  function L10n($path =UNDEFINED, $domain =UNDEFINED,
                     $lng =LNG, $codeset =CODESET)
    {
      if ($path==UNDEFINED)
        {
          if (file_exists(APP_PATH.'l10n'))
            $path = APP_PATH.'l10n';
          else
            $path = '/usr/share/locale';
        }

      if ($domain==UNDEFINED)
        {
          //set as domain the name of the application
          ereg('/([^/]+)/$', APP_PATH, $regs);
          $domain = $regs[1];
        }

      $this->path = $path;
      $this->domain = $domain;
      $this->lng = $lng;
      $this->codeset = $codeset;
      $this->load_translation_file();
    }

  /**
   * Search the text for strings like T_("...") or TF_("...")
   * and replace them by the translation of the
   * string inside the double quotes.  It is usually
   * called on rendering (generating html pages).
   */
  function translate($text)
  {
    while ( ereg('(TF?_)\\("([^"]*)"\\)', $text, $regs) )
      {
        $str2translate = $regs[0];
        $f_name   = $regs[1];
        $original = $regs[2];

        //replace '\n' by newline 
        $original = ereg_replace("\\\\n(\\\\ *\n)", "\n\\1", $original);

        $translation = $f_name($original);
        $text = str_replace($str2translate, $translation, $text);
      }

    return $text;
  }

  /**
   * Change the language and (optionally) the codeset of the language.
   * It can be called from the application to change the language dynamically.
   */
  function set_lng($lng, $codeset =UNDEFINED)
    {
      if ($lng==$this->lng and $codeset==$this->codeset)  return;

      $this->lng = $lng;
      if ($codeset!=UNDEFINED) $this->codeset = $codeset;

      $this->load_translation_file();
    }

  /**
   * Set the locale and the textdomain for gettext.
   * Set also the encoding, if it is defined.
   * The translation file will be looked for in:
   *    $path/$lng/LC_MESSAGES/$domain.mo
   */
  function load_translation_file()
    {
      $lng     = $this->lng;
      $codeset = $this->codeset;
      $path    = $this->path;
      $domain  = $this->domain;

      if (USE_PHP_GETTEXT)
        {
          $file = $this->find_file_mo($path, $domain);
          if ($file)
            {
              $input = new FileReader($file);
              $this->php_gettext = new gettext_reader($input);
            }
        }
      else  //use GNU gettext functions
        {
          if ($lng != UNDEFINED)
            setlocale(LC_MESSAGES, $lng);
          if ($codeset != UNDEFINED)
            bind_textdomain_codeset($domain, $codeset);

          bindtextdomain($domain, $path);
          textdomain($domain);
        }
      //WebApp::debug_msg('==== '.$this->printState());
    }

  /**
   * Push the current state of the translation on the stack.
   * This is usually called by the rendering class when it
   * starts to render a new template or webbox, since each
   * template or webbox can have its own locatization (l10n)
   * files, and after it is done, we would like to return
   * to the previous translation state.
   */
  function pushState()
    {
      $item =  array(
                     'path'    => $this->path,
                     'domain'  => $this->domain,
                     'lng'     => $this->lng,
                     'codeset' => $this->codeset
                     );
      array_push($this->stack, $item);
      //WebApp::debug_msg('>>> '.$this->printState());
    }

  function printState()
    {
      return $this->path.' '.$this->domain.' '.$this->lng.' '.$this->codeset;
    }

  /**
   * Pop the current state of translation from the stack.
   * If the previous state is different from the current state,
   * load the previous translation file.
   */
  function popState()
    {
      $item = array_pop($this->stack);

      //if the previous state is different from the current state,
      //load the previous translation file
      if ( $item['path']       != $this->path
           or $item['domain']  != $this->domain
           or $item['lng']     != $this->lng
           or $item['codeset'] != $this->codeset )
        {
          $this->path    = $item['path'];
          $this->domain  = $item['domain'];
          $this->lng     = $item['lng'];
          $this->codeset = $item['codeset'];

          $this->load_translation_file();
        }
      //WebApp::debug_msg('<<< '.$this->printState());
    }

  /**
   * Find and load the appropriate translation file (*.mo).
   * This function is usually called by the framework to load
   * the translation file of a template or webbox. If no
   * translation file is found (searching according to certain
   * rules), then nothing is changed and the existing translation
   * file will be used.
   *
   * @dir is the directory containing the template or webbox
   * @id  is the id of the webbox or the filename of the template
   */
  function set_translation_file($dir, $id)
    {
      $dir = $this->find_l10n($dir);
      $l10n = ($dir ? $dir.'l10n' : '/usr/share/locale');

      $file = $this->find_file_mo($l10n, $id);
      if (!$file)  return;

      //a translation file is found, save the parameters and load it
      if ($l10n != $this->path or $id != $this->domain)
        {
          $this->path = $l10n;
          $this->domain = $id;
          $this->load_translation_file();
        }
    }

  /**
   * Look at the given path for a 'l10n' subdirectory; if not found,
   * look also at the parent and all the ancestor paths, up to the 
   * application path. Return the first path that contains a 'l10n'
   * directory, or false if not found. Called by set_translation_file().
   */
  function find_l10n($path)
    {
      if ($path[0] != '/')  $path = APP_PATH.$path;

      while ($path != '')
        {
          if (file_exists($path.'l10n/'))  return $path;

          //get the parent directory
          $path = ereg_replace('[^/]*/?$', '', $path);
        }

      //no 'l10n' dir was found, return false
      return  false;
    }

  /**
   * Return the path of the translation file (domain.mo)
   * in the given l10n/ directory. If the language code is
   * something like 'en_US', then check also with 'en', if not
   * found in 'en_US'. If not found at all, return false.
   * Called by set_translation_file().
   */
  function find_file_mo($l10n, $domain)
    {
      $lng = $this->lng;
      $file = "$l10n/$lng/LC_MESSAGES/$domain.mo";
      if (file_exists($file))  return $file;

      //if not found for lng=en_US, check also for lng=en
      $lng = ereg_replace('_.*', '', $lng);
      $file = "$l10n/$lng/LC_MESSAGES/$domain.mo";
      if (file_exists($file))  return $file;

      //domain.mo is not found, return false
      return false;
    }
}

/**
 * This is an alias for gettext. It should be used in the PHP code to get
 * the translation of a string, like this: $var = T_("...");
 */
function T_($msgid)
{
  //remove the slash at the end of the lines (used for multiple lines)
  $msgid = ereg_replace("\\\\ *\n", "", $msgid);

  if (USE_PHP_GETTEXT)
    {
      global $l10n;
      if (isset($l10n->php_gettext))
        $msgstr = $l10n->php_gettext->translate($msgid);
      else
        $msgstr = $msgid;
    }
  else //use GNU gettext
    {
      $msgstr = gettext($msgid);
    }

  return $msgstr;
}

/**
 * This is another alias for gettext, but it is used for translating
 * framework messages. For the application components and templates
 * the framework finds out outomatically which translation file to use
 * and where it is located, depending on the location of the component
 * its id, and some conventions. However, the translations of the 
 * framework messages are in a separate translation file. So, TF_("...")
 * is used instead of T_("...") in order to distinguish that this is the
 * translation of a framework message.
 * This function is used in the PHP code of the framework classes to get
 * the translation of a string, like this: $var = TF_("...");
 */
function TF_($msgid)
{
  global $l10n;

  $l10n->pushState();

  $l10n->path = WEBAPP_PATH.'l10n';
  $l10n->domain = 'web_app';
  $l10n->load_translation_file();
  $msgstr = T_($msgid);

  $l10n->popState();

  return $msgstr;
}
?>
--- NEW FILE: class.L10n.js ---
//-*- mode: C; -*-//tells emacs to use mode C for this file
/*
Copyright 2001,2002,2003 Dashamir Hoxha, das...@us...

This file is part of phpWebApp.

phpWebApp is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.

phpWebApp is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with phpWebApp; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA  
*/


/**
 * L10n class keeps a list of translatable messages and their
 * translation. It helps to localize messages in the JS code.
 */
function L10n()
{
  this.messages = new Array();

  this.addMsg = l10n_addMsg;
  this.gettext = l10n_gettext;
}

/** Add a new message and its translation in the list. */
function l10n_addMsg(msgid, msgstr)
{
  var msg = { id:msgid, str:msgstr };
  this.messages.push(msg);
}

/** Return the translation of a message. */
function l10n_gettext(msgid)
{
  var i;

  for (i=0; i < this.messages.length; i++)
    if (this.messages[i].id == msgid)
      {
        //found, return the translation
        return this.messages[i].str;
      }

  //not found, return the msgid itself
  return msgid;
}

function T_(msgid)
{
  return l10n.gettext(msgid);
}

function TF_(msgid)
{
  return l10n.gettext(msgid);
}

[phpwebapp-commits] CVS: web_app/l10n-module/app xgettext.sh,NONE,1.1 msgmerge.sh,NONE,1.1 msginit.sh,NONE,1.1 msgfmt.sh,NONE,1.1 get_app_name.sh,NONE,1.1 README-FIRST,NONE,1.1 README,NONE,1.1

[Dashamir H. <das...@us...>]

Update of /cvsroot/phpwebapp/web_app/l10n-module/app
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26701/l10n-module/app

Added Files:
	xgettext.sh msgmerge.sh msginit.sh msgfmt.sh get_app_name.sh 
	README-FIRST README 
Log Message:
l10n renamed to l10n-module


--- NEW FILE: xgettext.sh ---
#!/bin/bash

### go to this dir
cd $(dirname $0)

### get the translatable strings of search, admin and docbook
### from HTML and PHP files
module_list="search admin docbook"
for module in $module_list
do
  dir=../templates/$module
  touch $dir/l10n/$module.po
  find $dir -name '*.php' -o -name '*.js' -o -name '*.html' \
    | xargs xgettext -C --keyword=T_ --join-existing \
                     --output-dir=$dir/l10n/ --output=$module.po
done

### get the translatable strings for the rest of the application
app_name=$(./get_app_name.sh)
touch $app_name.po
find ../templates/ -path '../templates/search'  -prune \
                -o -path '../templates/admin'   -prune \
                -o -path '../templates/docbook' -prune \
                -o -name '*.php'  -print  \
                -o -name '*.js'  -print  \
                -o -name '*.html' -print  \
  | xargs xgettext -C --keyword=T_ --join-existing --output=$app_name.po


--- NEW FILE: msgmerge.sh ---
#!/bin/bash
### update old *.po files with new messages extracted by xgettext.sh

### go to this directory
cd $(dirname $0)

if [ "$1" = "" ]
then
  echo "Usage: $0 ll_CC"
  echo "where ll_CC is the language code, like en_US or sq_AL"
  exit 1
fi

lng=$1

### convert the *.po file of the application
app_name=$(./get_app_name.sh)
dir=$lng/LC_MESSAGES
msgmerge --update $dir/$app_name.po  $app_name.po

### convert the *.po files of search, admin and docbook
module_list="search admin docbook"
for module in $module_list
do
  dir=../templates/$module/l10n
  msgmerge --update $dir/$lng/LC_MESSAGES/$module.po $dir/$module.po
done

--- NEW FILE: msginit.sh ---
#!/bin/bash
### create initial translation files for a language

### go to this directory
cd $(dirname $0)

if [ "$1" = "" ]
then
  echo "Usage: $0 ll_CC"
  echo "where ll_CC is the language code, like en_US or sq_AL"
  exit 1
fi

lng=$1

### create an initial *.po file for the application
app_name=$(./get_app_name.sh)
msginit --input=$app_name.po --locale=$lng --no-translator \
        --output-file=$lng/LC_MESSAGES/$app_name.po

### create initial *.po files for search, admin and docbook
module_list="search admin docbook"
for module in $module_list
do
  dir=../templates/$module/l10n
  mkdir -p $dir/$lng/LC_MESSAGES/
  msginit --input=$dir/$module.po --locale=$lng --no-translator \
        --output-file=$dir/$lng/LC_MESSAGES/$module.po
done

--- NEW FILE: msgfmt.sh ---
#!/bin/bash
### convert translation files (*.po) to binary format (*.mo)

### go to this directory
cd $(dirname $0)

if [ "$1" = "" ]
then
  echo "Usage: $0 ll_CC"
  echo "where ll_CC is the language code, like en_US or sq_AL"
  exit 1
fi

lng=$1

### convert the *.po file of the application
app_name=$(./get_app_name.sh)
dir=$lng/LC_MESSAGES
msgfmt --output-file=$dir/$app_name.mo  $dir/$app_name.po

### convert the *.po files of search, admin and docbook
module_list="search admin docbook"
for module in $module_list
do
  dir=../templates/$module/l10n/$lng/LC_MESSAGES/
  msgfmt --output-file=$dir/$module.mo $dir/$module.po
done

--- NEW FILE: get_app_name.sh ---
#!/bin/bash
### get and output the name of the application

cd $(dirname $0)

l10n_dir=$(pwd)
app_dir=$(dirname $l10n_dir)
app_name=$(basename $app_dir)

echo $app_name

--- NEW FILE: README-FIRST ---
These files should be copied in the folder 'l10n/' of the application,
and then they can be modified according to the application.
--- NEW FILE: README ---

To translate the messages for a language, first initialize the translation
files:
--scr
bash$ ./xgettext.sh
bash$ ./msginit.sh ll_CC
----
ll_CC is the language and country code, like 'en_US' or 'sq_AL'.


Then, translate the messages in the translation files:
 * ./ll_CC/LC_MESSAGES/book.po
 * ../templates/search/ll_CC/LC_MESSAGES/search.po
 * ../templates/admin/ll_CC/LC_MESSAGES/admin.po
 * ../templates/docbook/ll_CC/LC_MESSAGES/docbook.po


Finally, convert the translation files into binary format (*.mo):
--scr
bash$ ./msgfmt.sh ll_CC
----


To update the translation files (e.g. after a new release is out
and the message strings may have changed), do:
--scr
bash$ ./xgettext.sh
bash$ ./msgmerge.sh ll_CC
----
Then translate any new entries in the translation files, and then
convert again to binary format: `./msgfmt.sh ll_CC`.


Other gettext tools can be used as well, if needed. For more information
about them see `info gettext`.
 

[phpwebapp-commits] CVS: web_app/l10n-module/php-gettext/examples update,NONE,1.1 serbian.po,NONE,1.1 serbian.mo,NONE,1.1 pigs.php,NONE,1.1

[Dashamir H. <das...@us...>]

Update of /cvsroot/phpwebapp/web_app/l10n-module/php-gettext/examples
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26701/l10n-module/php-gettext/examples

Added Files:
	update serbian.po serbian.mo pigs.php 
Log Message:
l10n renamed to l10n-module


--- NEW FILE: update ---
#!/bin/sh
TEMPLATE=pigs.pot
xgettext -kT_ngettext:1,2 -kT_ -L PHP -o $TEMPLATE pigs.php
if [ x$1 == 'x-p' ]; then
    msgfmt --statistics $TEMPLATE
else
    if [ -f $1.po ]; then
	msgmerge -o .tmp$1.po $1.po $TEMPLATE
	mv .tmp$1.po $1.po
	msgfmt --statistics $1.po
    else
	echo "Usage: $0 [-p|<basename>]"
    fi
fi

--- NEW FILE: serbian.po ---
# Sample translation for PHP-gettext 1.0
# Copyright (c) 2003 Danilo Segan <da...@kv...>
#
msgid ""
msgstr ""
"Project-Id-Version: pigs\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-10-23 04:50+0200\n"
"PO-Revision-Date: 2003-11-01 23:40+0100\n"
"Last-Translator: Danilo Segan <da...@kv...>\n"
"Language-Team: Serbian (sr) <da...@kv...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3;    plural=n%10==1 && n%100!=11 ? 0 : (n%10>=2 && n%"
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"

#: pigs.php:19
msgid ""
"This is how the story goes.\n"
"\n"
msgstr ""
"Овако иде прича.\n"
"\n"

#: pigs.php:21
#, php-format
msgid "%d pig went to the market\n"
msgid_plural "%d pigs went to the market\n"
msgstr[0] "%d мало прасе је отишло на пијац\n"
msgstr[1] "%d мала прасета су отишла на пијац\n"
msgstr[2] "%d малих прасета је отишло на пијац\n"

--- NEW FILE: serbian.mo ---
Þ•




Report-Msgid-Bugs-To: 
POT-Creation-Date: 2003-10-23 04:50+0200
PO-Revision-Date: 2003-11-01 23:40+0100
Last-Translator: Danilo Segan <da...@kv...>
Language-Team: Serbian (sr) <da...@kv...>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Plural-Forms: nplurals=3;    plural=n%10==1 && n%100!=11 ? 0 : (n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);






--- NEW FILE: pigs.php ---
<?php
/*
   Copyright (c) 2003 Danilo Segan <da...@kv...>.

   This file is part of PHP-gettext.

   PHP-gettext is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.

   PHP-gettext is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with PHP-gettext; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

*/

require("../streams.php");
require("../gettext.php");
$input = new FileReader('serbian.mo');
$l10n = new gettext_reader($input);

// create standard wrapers, so xgettext could work
function T_($text) {
  global $l10n;
  return $l10n->translate($text);
}

function T_ngettext($single, $plural, $number) {
  global $l10n;
  return $l10n->ngettext($single, $plural, $number);
}
    
print T_("This is how the story goes.\n\n");
for ($number=6; $number>=0; $number--) {
  print sprintf( T_ngettext("%d pig went to the market\n", 
			  "%d pigs went to the market\n", $number), 
		 $number );
}

?>

[phpwebapp-commits] CVS: web_app/l10n-module/php-gettext streams.php,NONE,1.1 gettext.php,NONE,1.1 README,NONE,1.1 Makefile,NONE,1.1 ChangeLog,NONE,1.1 COPYING,NONE,1.1 AUTHORS,NONE,1.1

[Dashamir H. <das...@us...>]

Update of /cvsroot/phpwebapp/web_app/l10n-module/php-gettext
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26701/l10n-module/php-gettext

Added Files:
	streams.php gettext.php README Makefile ChangeLog COPYING 
	AUTHORS 
Log Message:
l10n renamed to l10n-module


--- NEW FILE: streams.php ---
<?php
/*
   Copyright (c) 2003, 2005 Danilo Segan <da...@kv...>.

   This file is part of PHP-gettext.

   PHP-gettext is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.

   PHP-gettext is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with PHP-gettext; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

*/


// Simple class to wrap file streams, string streams, etc.
// seek is essential, and it should be byte stream
class StreamReader {
  // should return a string [FIXME: perhaps return array of bytes?]
  function read($bytes) {
    return false;
  }
  
  // should return new position
  function seekto($position) {
    return false;
  }
  
  // returns current position
  function currentpos() {
    return false;
  }
  
  // returns length of entire stream (limit for seekto()s)
  function length() {
    return false;
  }
}

class StringReader {
  var $_pos;
  var $_str;

  function StringReader($str='') {
    $this->_str = $str;
    $this->_pos = 0;
  }

  function read($bytes) {
    $data = substr($this->_str, $this->_pos, $bytes);
    $this->_pos += $bytes;
    if (strlen($this->_str)<$this->_pos)
      $this->_pos = strlen($this->_str);

    return $data;
  }

  function seekto($pos) {
    $this->_pos = $pos;
    if (strlen($this->_str)<$this->_pos)
      $this->_pos = strlen($this->_str);
    return $this->_pos;
  }

  function currentpos() {
    return $this->_pos;
  }

  function length() {
    return strlen($this->_str);
  }

}


class FileReader {
  var $_pos;
  var $_fd;
  var $_length;

  function FileReader($filename) {
    if (file_exists($filename)) {

      $this->_length=filesize($filename);
      $this->_pos = 0;
      $this->_fd = fopen($filename,'rb');
      if (!$this->_fd) {
	$this->error = 3; // Cannot read file, probably permissions
	return false;
      }
    } else {
      $this->error = 2; // File doesn't exist
      return false;
    }
  }

  function read($bytes) {
    if ($bytes) {
      fseek($this->_fd, $this->_pos);
      $data = fread($this->_fd, $bytes);
      $this->_pos = ftell($this->_fd);
      
      return $data;
    } else return '';
  }

  function seekto($pos) {
    fseek($this->_fd, $pos);
    $this->_pos = ftell($this->_fd);
    return $this->_pos;
  }

  function currentpos() {
    return $this->_pos;
  }

  function length() {
    return $this->_length;
  }

  function close() {
    fclose($this->_fd);
  }

}

// Preloads entire file in memory first, then creates a StringReader 
// over it (it assumes knowledge of StringReader internals)
class CachedFileReader extends StringReader {
  function CachedFileReader($filename) {
    if (file_exists($filename)) {

      $length=filesize($filename);
      $fd = fopen($filename,'rb');

      if (!$fd) {
	$this->error = 3; // Cannot read file, probably permissions
	return false;
      }
      $this->_str = fread($fd, $length);
      fclose($fd);

    } else {
      $this->error = 2; // File doesn't exist
      return false;
    }
  }
}


?>
--- NEW FILE: gettext.php ---
<?php
/*
   Copyright (c) 2003 Danilo Segan <da...@kv...>.
   Copyright (c) 2005 Nico Kaiser <ni...@si...>
   
   This file is part of PHP-gettext.

   PHP-gettext is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.

   PHP-gettext is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with PHP-gettext; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

*/
 
/**
 * Provides a simple gettext replacement that works independently from
 * the system's gettext abilities.
 * It can read MO files and use them for translating strings.
 * The files are passed to gettext_reader as a Stream (see streams.php)
 * 
 * This version has the ability to cache all strings and translations to
 * speed up the string lookup.
 * While the cache is enabled by default, it can be switched off with the
 * second parameter in the constructor (e.g. whenusing very large MO files
 * that you don't want to keep in memory)
 */
class gettext_reader {
  //public:
   var $error = 0; // public variable that holds error code (0 if no error)
   
   //private:
  var $BYTEORDER = 0;        // 0: low endian, 1: big endian
  var $STREAM = NULL;
  var $short_circuit = false;
  var $enable_cache = false;
  var $originals = NULL;      // offset of original table
  var $translations = NULL;    // offset of translation table
  var $pluralheader = NULL;    // cache header field for plural forms
  var $total = 0;          // total string count
  var $table_originals = NULL;  // table for original strings (offsets)
  var $table_translations = NULL;  // table for translated strings (offsets)
  var $cache_translations = NULL;  // original -> translation mapping


  /* Methods */
  
    
  /**
   * Reads a 32bit Integer from the Stream
   * 
   * @access private
   * @return Integer from the Stream
   */
  function readint() {
      if ($this->BYTEORDER == 0) {
        // low endian
        return array_shift(unpack('V', $this->STREAM->read(4)));
      } else {
        // big endian
        return array_shift(unpack('N', $this->STREAM->read(4)));
      }
    }

  /**
   * Reads an array of Integers from the Stream
   * 
   * @param int count How many elements should be read
   * @return Array of Integers
   */
  function readintarray($count) {
    if ($this->BYTEORDER == 0) {
        // low endian
        return unpack('V'.$count, $this->STREAM->read(4 * $count));
      } else {
        // big endian
        return unpack('N'.$count, $this->STREAM->read(4 * $count));
      }
  }
  
  /**
   * Constructor
   * 
   * @param object Reader the StreamReader object
   * @param boolean enable_cache Enable or disable caching of strings (default on)
   */
  function gettext_reader($Reader, $enable_cache = true) {
    // If there isn't a StreamReader, turn on short circuit mode.
    if (! $Reader) {
      $this->short_circuit = true;
      return;
    }
    
    // Caching can be turned off
    $this->enable_cache = $enable_cache;

    // $MAGIC1 = (int)0x950412de; //bug in PHP 5
    $MAGIC1 = (int) - 1794895138;
    // $MAGIC2 = (int)0xde120495; //bug
    $MAGIC2 = (int) - 569244523;

    $this->STREAM = $Reader;
    $magic = $this->readint();
    if ($magic == $MAGIC1) {
      $this->BYTEORDER = 0;
    } elseif ($magic == $MAGIC2) {
      $this->BYTEORDER = 1;
    } else {
      $this->error = 1; // not MO file
      return false;
    }
    
    // FIXME: Do we care about revision? We should.
    $revision = $this->readint();
    
    $this->total = $this->readint();
    $this->originals = $this->readint();
    $this->translations = $this->readint();
  }
  
  /**
   * Loads the translation tables from the MO file into the cache
   * If caching is enabled, also loads all strings into a cache
   * to speed up translation lookups
   * 
   * @access private
   */
  function load_tables() {
    if (is_array($this->cache_translations) &&
      is_array($this->table_originals) &&
      is_array($this->table_translations))
      return;
    
    /* get original and translations tables */
    $this->STREAM->seekto($this->originals);
    $this->table_originals = $this->readintarray($this->total * 2);
    $this->STREAM->seekto($this->translations);
    $this->table_translations = $this->readintarray($this->total * 2);
    
    if ($this->enable_cache) {
      $this->cache_translations = array ();
      /* read all strings in the cache */
      for ($i = 0; $i < $this->total; $i++) {
        $this->STREAM->seekto($this->table_originals[$i * 2 + 2]);
        $original = $this->STREAM->read($this->table_originals[$i * 2 + 1]);
        $this->STREAM->seekto($this->table_translations[$i * 2 + 2]);
        $translation = $this->STREAM->read($this->table_translations[$i * 2 + 1]);
        $this->cache_translations[$original] = $translation;
      }
    }
  }
  
  /**
   * Returns a string from the "originals" table
   * 
   * @access private
   * @param int num Offset number of original string
   * @return string Requested string if found, otherwise ''
   */
  function get_original_string($num) {
    $length = $this->table_originals[$num * 2 + 1];
    $offset = $this->table_originals[$num * 2 + 2];
    if (! $length)
      return '';
    $this->STREAM->seekto($offset);
    $data = $this->STREAM->read($length);
    return (string)$data;
  }
  
  /**
   * Returns a string from the "translations" table
   * 
   * @access private
   * @param int num Offset number of original string
   * @return string Requested string if found, otherwise ''
   */
  function get_translation_string($num) {
    $length = $this->table_translations[$num * 2 + 1];
    $offset = $this->table_translations[$num * 2 + 2];
    if (! $length)
      return '';
    $this->STREAM->seekto($offset);
    $data = $this->STREAM->read($length);
    return (string)$data;
  }
  
  /**
   * Binary search for string
   * 
   * @access private
   * @param string string
   * @param int start (internally used in recursive function)
   * @param int end (internally used in recursive function)
   * @return int string number (offset in originals table)
   */
  function find_string($string, $start = -1, $end = -1) {
    if (($start == -1) or ($end == -1)) {
      // find_string is called with only one parameter, set start end end
      $start = 0;
      $end = $this->total;
    }
    if (abs($start - $end) <= 1) {
      // We're done, now we either found the string, or it doesn't exist
      $txt = $this->get_original_string($start);
      if ($string == $txt)
        return $start;
      else
        return -1;
    } else if ($start > $end) {
      // start > end -> turn around and start over
      return $this->find_string($string, $end, $start);
    } else {
      // Divide table in two parts
      $half = (int)(($start + $end) / 2);
      $cmp = strcmp($string, $this->get_original_string($half));
      if ($cmp == 0)
        // string is exactly in the middle => return it
        return $half;
      else if ($cmp < 0)
        // The string is in the upper half
        return $this->find_string($string, $start, $half);
      else
        // The string is in the lower half
        return $this->find_string($string, $half, $end);
    }
  }
  
  /**
   * Translates a string
   * 
   * @access public
   * @param string string to be translated
   * @return string translated string (or original, if not found)
   */
  function translate($string) {
    if ($this->short_circuit)
      return $string;
    $this->load_tables();     
    
    if ($this->enable_cache) {
      // Caching enabled, get translated string from cache
      if (array_key_exists($string, $this->cache_translations))
        return $this->cache_translations[$string];
      else
        return $string;
    } else {
      // Caching not enabled, try to find string
      $num = $this->find_string($string);
      if ($num == -1)
        return $string;
      else
        return $this->get_translation_string($num);
    }
  }

  /**
   * Get possible plural forms from MO header
   * 
   * @access private
   * @return string plural form header
   */
  function get_plural_forms() {
    // lets assume message number 0 is header  
    // this is true, right?
    $this->load_tables();
    
    // cache header field for plural forms
    if (! is_string($this->pluralheader)) {
      if ($this->enable_cache) {
        $header = $this->cache_translations[""];
      } else {
        $header = $this->get_translation_string(0);
      }
      if (eregi("plural-forms: (.*)\n", $header, $regs))
        $expr = $regs[1];
      else
        $expr = "nplurals=2; plural=n == 1 ? 0 : 1;";
      $this->pluralheader = $expr;
    }
    return $this->pluralheader;
  }

  /**
   * Detects which plural form to take
   * 
   * @access private
   * @param n count
   * @return int array index of the right plural form
   */
  function select_string($n) {
    $string = $this->get_plural_forms();
    $string = str_replace('nplurals',"\$total",$string);
    $string = str_replace("n",$n,$string);
    $string = str_replace('plural',"\$plural",$string);
    
    $total = 0;
    $plural = 0;

    eval("$string");
    if ($plural >= $total) $plural = 0;
    return $plural;
  }

  /**
   * Plural version of gettext
   * 
   * @access public
   * @param string single
   * @param string plural
   * @param string number
   * @return translated plural form
   */
  function ngettext($single, $plural, $number) {
    if ($this->short_circuit) {
      if ($number != 1)
        return $plural;
      else
        return $single;
    }

    // find out the appropriate form
    $select = $this->select_string($number); 
    
    // this should contains all strings separated by NULLs
    $key = $single.chr(0).$plural;
    
    
    if ($this->enable_cache) {
      if (! array_key_exists($key, $this->cache_translations)) {
        return ($number != 1) ? $plural : $single;
      } else {
        $result = $this->cache_translations[$key];
        $list = explode(chr(0), $result);
        return $list[$select];
      }
    } else {
      $num = $this->find_string($key);
      if ($num == -1) {
        return ($number != 1) ? $plural : $single;
      } else {
        $result = $this->get_translation_string($num);
        $list = explode(chr(0), $result);
        return $list[$select];
      }
    }
  }

}

?>

--- NEW FILE: README ---
PHP-gettext 1.0

Copyright 2003, 2005 -- Danilo "angry with PHP[1]" Segan
Licensed under GPLv2 (or any later version, see COPYING)

[1] PHP is actually cyrillic, and translates roughly to 
    "works-doesn't-work" (UTF-8: Ради-Не-Ради)


Introduction

    How many times did you look for a good translation tool, and
    found out that gettext is best for the job? Many times.

    How many times did you try to use gettext in PHP, but failed
    miserably, because either your hosting provider didn't support
    it, or the server didn't have adequate locale? Many times.

    Well, this is a solution to your needs. It allows using gettext
    tools for managing translations, yet it doesn't require gettext
    library at all. It parses generated MO files directly, and thus
    might be a bit slower than the (maybe provided) gettext library.

    PHP-gettext is a simple reader for GNU gettext MO files. Those
    are binary containers for translations, produced by GNU msgfmt.

Why?

    I got used to having gettext work even without gettext
    library. It's there in my favourite language Python, so I was
    surprised that I couldn't find it in PHP. I even Googled for it,
    but to no avail.

    So, I said, what the heck, I'm going to write it for this
    disguisting language of PHP, because I'm often constrained to it.

Features

  o Support for simple translations
    Just define a simple alias for translate() function (suggested
    use of _() or gettext(); see provided example).

  o Support for ngettext calls (plural forms, see a note under bugs)
    You may also use plural forms. Translations in MO files need to
    provide this, and they must also provide "plural-forms" header.
    Please see 'info gettext' for more details.

  o Support for reading straight files, or strings (!!!)
    Since I can imagine many different backends for reading in the MO
    file data, I used imaginary abstract class StreamReader to do all
    the input (check streams.php). For your convenience, I've already
    provided two classes for reading files: FileReader and
    StringReader (CachedFileReader is a combination of the two: it 
    loads entire file contents into a string, and then works on that). 
    See example below for usage. You can for instance use StringReader 
    when you read in data from a database, or you can create your own 
    derivative of StreamReader for anything you like. 
    

Bugs

    Plural-forms field in MO header (translation for empty string,
    i.e. "") is treated according to PHP syntactic rules (it's
    eval()ed). Since these should actually follow C syntax, there are
    some problems.

    For instance, I'm used to using this:
      Plural-Forms: nplurals=3;    plural=n%10==1 && n%100!=11 ? 0 : \
         n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;
    but it fails with PHP (it sets $plural=2 instead of 0 for $n==1).

    The fix is usually simple, but I'm lazy to go into the details of
    PHP operator precedence, and maybe try to fix it. In here, I had
    to put everything after the first ':' in parenthesis:
      Plural-Forms: nplurals=3;    plural=n%10==1 && n%100!=11 ? 0 : \
         (n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);
    That works, and I'm satisfied.

    Besides this one, there are probably a bunch of other bugs, since
    I hate PHP (did I mention it already? no? strange), and don't
    know it very well. So, feel free to fix any of those and report
    them back to me at <da...@kv...>.

Usage

    Put files streams.php and gettext.php somewhere you can load them
    from, and require 'em in where you want to use them.

    Then, create one 'stream reader' (a class that provides functions
    like read(), seekto(), currentpos() and length()) which will
    provide data for the 'gettext_reader', with eg.
      $streamer = new FileStream('data.mo');

    Then, use that as a parameter to gettext_reader constructor:
      $wohoo = new gettext_reader($streamer);

    If you want to disable pre-loading of entire message catalog in 
    memory (if, for example, you have a multi-thousand message catalog 
    which you'll use only occasionally), use "false" for second 
    parameter to gettext_reader constructor:
      $wohoo = new gettext_reader($streamer, false);

    From now on, you have all the benefits of gettext data at your
    disposal, so may run: 
      print $wohoo->translate("This is a test");
      print $wohoo->ngettext("%d bird", "%d birds", $birds);

    You might need to pass parameter "-k" to xgettext to make it
    extract all the strings. In above example, try with 
      xgettext -ktranslate -kngettext:1,2 file.php
    what should create messages.po which contains two messages for
    translation.

    I suggest creating simple aliases for these functions (see
    example/pigs.php for how do I do it, which means it's probably a
    bad way).

Example

    See in examples/ subdirectory. There are a couple of files.
    pigs.php is an example, serbian.po is a translation to Serbian
    language, and serbian.mo is generated with
       msgfmt -o serbian.mo serbian.po
    There is also simple "update" script that can be used to generate
    POT file and to update the translation using msgmerge.

Interesting TODO:

  o Try to parse "plural-forms" header field, and to follow C syntax
    rules. This won't be easy.

Boring TODO:

  o Create compatibility layer so these functions could replace
    standard gettext library completely, and as straightforward as
    possible (drop-in replacement).

  o Learn PHP and fix bugs, slowness and other stuff resulting from
    my lack of knowledge (but *maybe*, it's not my knowledge that is
    bad, but PHP itself ;-).  

    (This is mostly done thanks to Nico Kaiser.)

  o Try to use hash tables in MO files: with pre-loading, would it 
    be useful at all?

Never-asked-questions:

  o Why did you mark this as version 1.0 when this is the first code
    release?

    Well, it's quite simple. I consider that the first released thing
    should be labeled "version 1" (first, right?). Zero is there to
    indicate that there's zero improvement and/or change compared to 
    "version 1".

    I plan to use version numbers 1.0.* for small bugfixes, and to
    release 1.1 as "first stable release of version 1".

    This may trick someone that this is actually useful software, but
    as with any other free software, I take NO RESPONSIBILITY for
    creating such a masterpiece that will smoke crack, trash your
    hard disk, and make lasers in your CD device dance to the tune of
    Mozart's 40th Symphony (there is one like that, right?).

  o Can I...?
    
    Yes, you can. This is free software (as in freedom, free speech),
    and you might do whatever you wish with it, provided you do not
    limit freedom of others (GPL).

    I'm considering licensing this under LGPL, but I *do* want
    *every* PHP-gettext user to contribute and respect ideas of free
    software, so don't count on it happening anytime soon.

    I'm sorry that I'm taking away your freedom of taking others'
    freedom away, but I believe that's neglible as compared to what
    freedoms you could take away. ;-)

    Uhm, whatever.

--- NEW FILE: Makefile ---
PACKAGE = php-gettext-$(VERSION)
VERSION = 1.0.3

DIST_FILES = \
	gettext.php \
	streams.php \
	AUTHORS     \
	ChangeLog   \
	README      \
	COPYING     \
	Makefile    \
	examples/pigs.php    \
	examples/serbian.po  \
	examples/serbian.mo  \
	examples/update

dist:
	if [ -d $(PACKAGE) ]; then \
	    rm -rf $(PACKAGE); \
	fi; \
	mkdir $(PACKAGE); \
	if [ -d $(PACKAGE) ]; then \
	    cp -rp --parents $(DIST_FILES) $(PACKAGE); \
	    tar cvzf $(PACKAGE).tar.gz $(PACKAGE); \
	    rm -rf $(PACKAGE); \
	fi;


--- NEW FILE: ChangeLog ---
2005-02-28  Danilo Å egan  <ds...@gm...>

	* AUTHORS: Added Nico to the list.

	* Makefile (VERSION): Up to 1.0.3.

	* README: Updated.

2005-02-28  Danilo Å egan  <ds...@gm...>

	* gettext.php: Added pre-loading, code documentation, and many
	code clean-ups by Nico Kaiser <ni...@si...>.

2005-02-28  Danilo Å egan  <ds...@gm...>

	* streams.php (FileReader.read): Handle read($bytes = 0).

	* examples/pigs.php: Prefix gettext function names with T or T_.

	* examples/update: Use the same keywords T_ and T_ngettext.

	* streams.php: Added CachedFileReader.

2003-11-11  Danilo Å egan  <ds...@gm...>

	* gettext.php: Added hashing to find_string.

2003-11-01  Danilo Å egan  <ds...@gm...>

	* Makefile (DIST_FILES): Replaced LICENSE with COPYING.
	(VERSION): Up to 1.0.2.

	* AUTHORS: Minor edits.

	* README: Minor edits.

	* COPYING: Removed LICENSE, added this file.

	* gettext.php: Added copyright notice and disclaimer.
	* streams.php: Same.
	* examples/pigs.php: Same.

2003-10-23  Danilo Å egan  <ds...@gm...>

	* Makefile: Upped version to 1.0.1.

	* gettext.php (gettext_reader): Remove a call to set_total_plurals.
	(set_total_plurals): Removed unused function for some better days.

2003-10-23  Danilo Å egan  <ds...@gm...>

	* Makefile: Added, version 1.0.0.

	* examples/*: Added an example of usage.

	* README: Described all the crap.
	
2003-10-22  Danilo Å egan  <ds...@gm...>

	* gettext.php: Plural forms implemented too.

	* streams.php: Added FileReader for direct access to files (no
	need to keep file in memory).

	* gettext.php: It works, except for plural forms.

	* streams.php: Created abstract class StreamReader.
	Added StringReader class.

	* gettext.php: Started writing gettext_reader.


--- NEW FILE: COPYING ---
		    GNU GENERAL PUBLIC LICENSE
		       Version 2, June 1991

 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

			    Preamble

  The licenses for most software are designed to take away your
freedom to share and change it.  By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users.  This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it.  (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.)  You can apply it to
your programs, too.

  When we speak of free software, we are referring to freedom, not
price.  Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.

  To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.

  For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have.  You must make sure that they, too, receive or can get the
source code.  And you must show them these terms so they know their
rights.

  We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.

  Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software.  If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.

  Finally, any free program is threatened constantly by software
patents.  We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary.  To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.

  The precise terms and conditions for copying, distribution and
modification follow.

		    GNU GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License.  The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language.  (Hereinafter, translation is included without limitation in
the term "modification".)  Each licensee is addressed as "you".

Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope.  The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.

  1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.

You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.

  2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:

    a) You must cause the modified files to carry prominent notices
    stating that you changed the files and the date of any change.

    b) You must cause any work that you distribute or publish, that in
    whole or in part contains or is derived from the Program or any
    part thereof, to be licensed as a whole at no charge to all third
    parties under the terms of this License.

    c) If the modified program normally reads commands interactively
    when run, you must cause it, when started running for such
    interactive use in the most ordinary way, to print or display an
    announcement including an appropriate copyright notice and a
    notice that there is no warranty (or else, saying that you provide
    a warranty) and that users may redistribute the program under
    these conditions, and telling the user how to view a copy of this
    License.  (Exception: if the Program itself is interactive but
    does not normally print such an announcement, your work based on
    the Program is not required to print an announcement.)

These requirements apply to the modified work as a whole.  If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works.  But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.

Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.

In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.

  3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:

    a) Accompany it with the complete corresponding machine-readable
    source code, which must be distributed under the terms of Sections
    1 and 2 above on a medium customarily used for software interchange; or,

    b) Accompany it with a written offer, valid for at least three
    years, to give any third party, for a charge no more than your
    cost of physically performing source distribution, a complete
    machine-readable copy of the corresponding source code, to be
    distributed under the terms of Sections 1 and 2 above on a medium
    customarily used for software interchange; or,

    c) Accompany it with the information you received as to the offer
    to distribute corresponding source code.  (This alternative is
    allowed only for noncommercial distribution and only if you
    received the program in object code or executable form with such
    an offer, in accord with Subsection b above.)

The source code for a work means the preferred form of the work for
making modifications to it.  For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable.  However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.

If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.

  4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License.  Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.

  5. You are not required to accept this License, since you have not
signed it.  However, nothing else grants you permission to modify or
distribute the Program or its derivative works.  These actions are
prohibited by law if you do not accept this License.  Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.

  6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions.  You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.

  7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License.  If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all.  For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.

If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.

It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices.  Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.

This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.

  8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded.  In such case, this License incorporates
the limitation as if written in the body of this License.

  9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time.  Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.

Each version is given a distinguishing version number.  If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation.  If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.

  10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission.  For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this.  Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.

			    NO WARRANTY

  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.

  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.

		     END OF TERMS AND CONDITIONS

	    How to Apply These Terms to Your New Programs

  If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.

  To do so, attach the following notices to the program.  It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.

    <one line to give the program's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA


Also add information on how to contact you by electronic and paper mail.

If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:

    Gnomovision version 69, Copyright (C) year name of author
    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.

The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License.  Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.

You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary.  Here is a sample; alter the names:

  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
  `Gnomovision' (which makes passes at compilers) written by James Hacker.

  <signature of Ty Coon>, 1 April 1989
  Ty Coon, President of Vice

This General Public License does not permit incorporating your program into
proprietary programs.  If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library.  If this is what you want to do, use the GNU Library General
Public License instead of this License.

--- NEW FILE: AUTHORS ---
Danilo Segan <da...@kv...>
Nico Kaiser <ni...@si...> (contributed most changes between 1.0.2 and 1.0.3)

[phpwebapp-commits] CVS: web_app/l10n-module/php-gettext/examples - New directory

[Dashamir H. <das...@us...>]

Update of /cvsroot/phpwebapp/web_app/l10n-module/php-gettext/examples
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24216/l10n-module/php-gettext/examples

Log Message:
Directory /cvsroot/phpwebapp/web_app/l10n-module/php-gettext/examples added to the repository

[phpwebapp-commits] CVS: web_app/l10n-module/php-gettext - New directory

[Dashamir H. <das...@us...>]

Update of /cvsroot/phpwebapp/web_app/l10n-module/php-gettext
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23557/l10n-module/php-gettext

Log Message:
Directory /cvsroot/phpwebapp/web_app/l10n-module/php-gettext added to the repository

[phpwebapp-commits] CVS: web_app/l10n-module/app - New directory

[Dashamir H. <das...@us...>]

Update of /cvsroot/phpwebapp/web_app/l10n-module/app
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23557/l10n-module/app

Log Message:
Directory /cvsroot/phpwebapp/web_app/l10n-module/app added to the repository

[phpwebapp-commits] CVS: web_app/l10n-module - New directory

[Dashamir H. <das...@us...>]

Update of /cvsroot/phpwebapp/web_app/l10n-module
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22937/l10n-module

Log Message:
Directory /cvsroot/phpwebapp/web_app/l10n-module added to the repository

[phpwebapp-commits] CVS: web_app/l10n wbJSL10n.php,1.2,NONE wbJSL10n.html,1.1,NONE class.L10n.php,1.5,NONE class.L10n.js,1.1,NONE

[Dashamir H. <das...@us...>]

Update of /cvsroot/phpwebapp/web_app/l10n
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21690/l10n

Removed Files:
	wbJSL10n.php wbJSL10n.html class.L10n.php class.L10n.js 
Log Message:
l10n renamed to l10n-module


--- wbJSL10n.php DELETED ---

--- wbJSL10n.html DELETED ---

--- class.L10n.php DELETED ---

--- class.L10n.js DELETED ---

[phpwebapp-commits] CVS: web_app/l10n/php-gettext streams.php,1.1,NONE gettext.php,1.1,NONE README,1.1,NONE Makefile,1.1,NONE ChangeLog,1.1,NONE COPYING,1.1,NONE AUTHORS,1.1,NONE

[Dashamir H. <das...@us...>]

Update of /cvsroot/phpwebapp/web_app/l10n/php-gettext
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21690/l10n/php-gettext

Removed Files:
	streams.php gettext.php README Makefile ChangeLog COPYING 
	AUTHORS 
Log Message:
l10n renamed to l10n-module


--- streams.php DELETED ---

--- gettext.php DELETED ---

--- README DELETED ---

--- Makefile DELETED ---

--- ChangeLog DELETED ---

--- COPYING DELETED ---

--- AUTHORS DELETED ---

[phpwebapp-commits] CVS: web_app/l10n/php-gettext/examples update,1.1,NONE serbian.po,1.1,NONE serbian.mo,1.1,NONE pigs.php,1.1,NONE

[Dashamir H. <das...@us...>]

Update of /cvsroot/phpwebapp/web_app/l10n/php-gettext/examples
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21690/l10n/php-gettext/examples

Removed Files:
	update serbian.po serbian.mo pigs.php 
Log Message:
l10n renamed to l10n-module


--- update DELETED ---

--- serbian.po DELETED ---

--- serbian.mo DELETED ---

--- pigs.php DELETED ---

[phpwebapp-commits] CVS: web_app/l10n/app xgettext.sh,1.1,NONE msgmerge.sh,1.1,NONE msginit.sh,1.1,NONE msgfmt.sh,1.1,NONE get_app_name.sh,1.1,NONE README-FIRST,1.1,NONE README,1.1,NONE

[Dashamir H. <das...@us...>]

Update of /cvsroot/phpwebapp/web_app/l10n/app
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21690/l10n/app

Removed Files:
	xgettext.sh msgmerge.sh msginit.sh msgfmt.sh get_app_name.sh 
	README-FIRST README 
Log Message:
l10n renamed to l10n-module


--- xgettext.sh DELETED ---

--- msgmerge.sh DELETED ---

--- msginit.sh DELETED ---

--- msgfmt.sh DELETED ---

--- get_app_name.sh DELETED ---

--- README-FIRST DELETED ---

--- README DELETED ---

[phpwebapp-commits] CVS: documentation/templates/user_manual/manual_pages webox.txt,1.3,NONE webclass.txt,1.1,NONE variables.txt,1.3,NONE transitions.txt,1.3,NONE templates.txt,1.3,NONE session.txt,1.3,NONE recordset.txt,1.1,NONE new_app.txt,1.3,NONE misc.txt,1.2,NONE intro.txt,1.2,NONE events.txt,1.4,NONE database.txt,1.3,NONE

[Dashamir H. <das...@us...>]

Update of /cvsroot/phpwebapp/documentation/templates/user_manual/manual_pages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2024/templates/user_manual/manual_pages

Removed Files:
	webox.txt webclass.txt variables.txt transitions.txt 
	templates.txt session.txt recordset.txt new_app.txt misc.txt 
	intro.txt events.txt database.txt 
Log Message:
new user manual, using DocBookWiki cache (HTML) files


--- webox.txt DELETED ---

--- webclass.txt DELETED ---

--- variables.txt DELETED ---

--- transitions.txt DELETED ---

--- templates.txt DELETED ---

--- session.txt DELETED ---

--- recordset.txt DELETED ---

--- new_app.txt DELETED ---

--- misc.txt DELETED ---

--- intro.txt DELETED ---

--- events.txt DELETED ---

--- database.txt DELETED ---