[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 ----