[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: felamimail/functions abook_database.php,1.3,1.4
From: |
Guillaume Courtois <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: felamimail/functions abook_database.php,1.3,1.4 abook_local_file.php,1.3,1.4 addressbook.php,1.3,1.4 |
Date: |
Mon, 26 May 2003 16:39:39 -0400 |
Update of /cvsroot/phpgroupware/felamimail/functions
In directory subversions:/tmp/cvs-serv26771/felamimail/functions
Modified Files:
abook_database.php abook_local_file.php addressbook.php
Log Message:
Changed all %s into %1 into lang calls and lang files, added missing english
phrases and french translations and suppressed doublons.
Index: abook_database.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/functions/abook_database.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** abook_database.php 27 Mar 2002 22:06:44 -0000 1.3
--- abook_database.php 26 May 2003 20:39:36 -0000 1.4
***************
*** 84,88 ****
if(DB::isError($dbh) || DB::isWarning($dbh))
! return $this->set_error(sprintf(lang("Database error: %s"),
DB::errorMessage($dbh)));
--- 84,88 ----
if(DB::isError($dbh) || DB::isWarning($dbh))
! return $this->set_error(sprintf(lang("Database error: %1"),
DB::errorMessage($dbh)));
***************
*** 120,124 ****
if(DB::isError($res))
! return $this->set_error(sprintf(lang("Database error: %s"),
DB::errorMessage($res)));
--- 120,124 ----
if(DB::isError($res))
! return $this->set_error(sprintf(lang("Database error: %1"),
DB::errorMessage($res)));
***************
*** 152,156 ****
if(DB::isError($res))
! return $this->set_error(sprintf(lang("Database error: %s"),
DB::errorMessage($res)));
--- 152,156 ----
if(DB::isError($res))
! return $this->set_error(sprintf(lang("Database error: %1"),
DB::errorMessage($res)));
***************
*** 181,185 ****
if(DB::isError($res))
! return $this->set_error(sprintf(lang("Database error: %s"),
DB::errorMessage($res)));
--- 181,185 ----
if(DB::isError($res))
! return $this->set_error(sprintf(lang("Database error: %1"),
DB::errorMessage($res)));
***************
*** 208,212 ****
$ret = $this->lookup($userdata['nickname']);
if(!empty($ret))
! return $this->set_error(sprintf(lang("User '%s' already exist"),
$ret['nickname']));
--- 208,212 ----
$ret = $this->lookup($userdata['nickname']);
if(!empty($ret))
! return $this->set_error(sprintf(lang("User '%1' already exist"),
$ret['nickname']));
***************
*** 227,231 ****
// Fail
! return $this->set_error(sprintf(lang("Database error: %s"),
DB::errorMessage($r)));
}
--- 227,231 ----
// Fail
! return $this->set_error(sprintf(lang("Database error: %1"),
DB::errorMessage($r)));
}
***************
*** 256,260 ****
// Fail
! return $this->set_error(sprintf(lang("Database error: %s"),
DB::errorMessage($r)));
}
--- 256,260 ----
// Fail
! return $this->set_error(sprintf(lang("Database error: %1"),
DB::errorMessage($r)));
}
***************
*** 271,275 ****
$ret = $this->lookup($alias);
if(empty($ret))
! return $this->set_error(sprintf(lang("User '%s' does not exist"),
$alias));
--- 271,275 ----
$ret = $this->lookup($alias);
if(empty($ret))
! return $this->set_error(sprintf(lang("User '%1' does not exist"),
$alias));
***************
*** 292,296 ****
// Fail
! return $this->set_error(sprintf(lang("Database error: %s"),
DB::errorMessage($r)));
}
--- 292,296 ----
// Fail
! return $this->set_error(sprintf(lang("Database error: %1"),
DB::errorMessage($r)));
}
Index: abook_local_file.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/functions/abook_local_file.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** abook_local_file.php 27 Mar 2002 22:06:44 -0000 1.3
--- abook_local_file.php 26 May 2003 20:39:36 -0000 1.4
***************
*** 230,234 ****
$ret = $this->lookup($userdata['nickname']);
if(!empty($ret))
! return $this->set_error(sprintf(lang("User '%s' already exist"),
$ret['nickname']));
--- 230,234 ----
$ret = $this->lookup($userdata['nickname']);
if(!empty($ret))
! return $this->set_error(sprintf(lang("User '%1' already exist"),
$ret['nickname']));
***************
*** 303,307 ****
$ret = $this->lookup($alias);
if(empty($ret))
! return $this->set_error(sprintf(lang("User '%s' does not exist"),
$alias));
--- 303,307 ----
$ret = $this->lookup($alias);
if(empty($ret))
! return $this->set_error(sprintf(lang("User '%1' does not exist"),
$alias));
Index: addressbook.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/functions/addressbook.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** addressbook.php 27 Mar 2002 22:06:44 -0000 1.3
--- addressbook.php 26 May 2003 20:39:36 -0000 1.4
***************
*** 29,33 ****
'create' => true));
if(!$r && $showerr) {
! printf(lang("Error opening file %s"), $filename);
exit;
}
--- 29,33 ----
'create' => true));
if(!$r && $showerr) {
! printf(lang("Error opening file %1"), $filename);
exit;
}
***************
*** 43,47 ****
$r = $abook->add_backend('ldap_server', $param);
if(!$r && $showerr) {
! printf(' ' . lang("Error initializing LDAP server %s:") .
"<BR>\n", $param['host']);
print(' ' . $abook->error);
--- 43,47 ----
$r = $abook->add_backend('ldap_server', $param);
if(!$r && $showerr) {
! printf(' ' . lang("Error initializing LDAP server %1:") .
"<BR>\n", $param['host']);
print(' ' . $abook->error);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: felamimail/functions abook_database.php,1.3,1.4 abook_local_file.php,1.3,1.4 addressbook.php,1.3,1.4,
Guillaume Courtois <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: felamimail/src addrbook_search.php,1.2,1.3 addrbook_search_html.php,1.2,1.3 help.php,1.2,1.3addressbook.php,1.2,1.3
- Next by Date:
[Phpgroupware-cvs] CVS: felamimail/setup phpgw_en.lang,1.5,1.6 phpgw_fr.lang,1.6,1.7 phpgw_fi.lang,1.1,1.2 phpgw_pl.lang,1.1,1.2 phpgw_ja.lang,1.1.1.1,1.2 phpgw_pt.lang,1.1.1.1,1.2
- Previous by thread:
[Phpgroupware-cvs] CVS: felamimail/src addrbook_search.php,1.2,1.3 addrbook_search_html.php,1.2,1.3 help.php,1.2,1.3addressbook.php,1.2,1.3
- Next by thread:
[Phpgroupware-cvs] CVS: felamimail/setup phpgw_en.lang,1.5,1.6 phpgw_fr.lang,1.6,1.7 phpgw_fi.lang,1.1,1.2 phpgw_pl.lang,1.1,1.2 phpgw_ja.lang,1.1.1.1,1.2 phpgw_pt.lang,1.1.1.1,1.2
- Index(es):