extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-21 23:43:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

moving to new translation system

Browse Source
This commit is contained in:
seek3r 2000-09-07 20:49:55 +00:00
parent 9f00336800
commit ba68c71ebb
44 changed files with 376 additions and 359 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addressbook/add.php
View File

@ -73,7 +73,7 @@
<INPUT name=reset type=reset value="Clear"> <INPUT name=reset type=reset value="Clear">
</TD> </TD>
<TD align=left> <TD align=left>
<a href="<?php echo $phpgw->link($phpgw_info["server"]["webserver_url"] . "/addressbook/") . "\">" . lang_common("Cancel"); ?></a> <a href="<?php echo $phpgw->link($phpgw_info["server"]["webserver_url"] . "/addressbook/") . "\">" . lang("Cancel"); ?></a>
</TD> </TD>
</TR> </TR>
</TBODY> </TBODY>

6
addressbook/delete.php
View File

@ -32,12 +32,12 @@
?> ?>
<body bgcolor=FFFFFF aLink=0000EE link=0000EE vlink=0000EE> <body bgcolor=FFFFFF aLink=0000EE link=0000EE vlink=0000EE>
<center><?php echo lang_common("Are you sure you want to delete this entry ?"); ?><center> <center><?php echo lang("Are you sure you want to delete this entry ?"); ?><center>
<br><center><a href="<?php <br><center><a href="<?php
echo $phpgw->link("view.php","&con=$con&order=$order&sort=$sort&filter=$filter&start=$start&query=$query"); echo $phpgw->link("view.php","&con=$con&order=$order&sort=$sort&filter=$filter&start=$start&query=$query");
?>"><?php echo lang_common("NO"); ?></a> &nbsp; &nbsp; &nbsp; &nbsp; ?>"><?php echo lang("NO"); ?></a> &nbsp; &nbsp; &nbsp; &nbsp;
<a href="<?php echo $phpgw->link("delete.php","con=$con&confirm=true&order=$order&sort=$sort&filter=$filter&start=$start&query=$query"); <a href="<?php echo $phpgw->link("delete.php","con=$con&confirm=true&order=$order&sort=$sort&filter=$filter&start=$start&query=$query");
?>"><?php echo lang_common("YES"); ?></a><center> ?>"><?php echo lang("YES"); ?></a><center>
<?php <?php
//exit; //exit;

6
addressbook/edit.php
View File

@ -95,13 +95,13 @@
<TBODY> <TBODY>
<tr> <tr>
<TD align=left width=7%> <TD align=left width=7%>
<input type="submit" name="submit" value="<?php echo lang_common("Submit"); ?>"> <input type="submit" name="submit" value="<?php echo lang("Submit"); ?>">
</TD> </TD>
<TD align=left width=7%> <TD align=left width=7%>
<a href="<?php echo $phpgw->link("view.php","con=$con") . "\">" . lang_common("Cancel"); ?></a> <a href="<?php echo $phpgw->link("view.php","con=$con") . "\">" . lang("Cancel"); ?></a>
</TD> </TD>
<TD align=right> <TD align=right>
<a href="<?php echo $phpgw->link("delete.php","con=$con") . "\">" . lang_common("Delete"); ?></a> <a href="<?php echo $phpgw->link("delete.php","con=$con") . "\">" . lang("Delete"); ?></a>
</TD> </TD>
</TR> </TR>
</TBODY> </TBODY>

24
addressbook/index.php
View File

@ -16,7 +16,7 @@
include("../header.inc.php"); include("../header.inc.php");
echo "<center>" . lang_addressbook("Address book"); echo "<center>" . lang("Address book");
if (! $start) if (! $start)
$start = 0; $start = 0;
@ -53,9 +53,9 @@
$phpgw->db->next_record(); $phpgw->db->next_record();
if ($phpgw->db->f(0) == 1) if ($phpgw->db->f(0) == 1)
echo "<br>" . lang_common("your search returned 1 match"); echo "<br>" . lang("your search returned 1 match");
else else
echo "<br>" . lang_common("your search returned x matchs",$phpgw->db->f(0)); echo "<br>" . lang("your search returned x matchs",$phpgw->db->f(0));
} else { } else {
$phpgw->db->query("select count(*) from addressbook where $filtermethod"); $phpgw->db->query("select count(*) from addressbook where $filtermethod");
} }
@ -63,10 +63,10 @@
$phpgw->db->next_record(); $phpgw->db->next_record();
if ($phpgw->db->f(0) > $phpgw_info["user"]["preferences"]["maxmatchs"]) if ($phpgw->db->f(0) > $phpgw_info["user"]["preferences"]["maxmatchs"])
echo "<br>" . lang_common("showing x - x of x",($start + 1), echo "<br>" . lang("showing x - x of x",($start + 1),
($start + $phpgw_info["user"]["preferences"]["maxmatchs"]),$phpgw->db->f(0)); ($start + $phpgw_info["user"]["preferences"]["maxmatchs"]),$phpgw->db->f(0));
else else
echo "<br>" . lang_common("showing x",$phpgw->db->f(0)); echo "<br>" . lang("showing x",$phpgw->db->f(0));
?> ?>
<?php <?php
@ -80,25 +80,25 @@
<td width=29% height="21"> <td width=29% height="21">
<font size="-1" face="Arial, Helvetica, sans-serif"> <font size="-1" face="Arial, Helvetica, sans-serif">
<?php echo $phpgw->nextmatchs->show_sort_order($sort,"lastname",$order,"index.php", <?php echo $phpgw->nextmatchs->show_sort_order($sort,"lastname",$order,"index.php",
lang_common("Last Name")); lang("Last Name"));
?> ?>
</font> </font>
</td> </td>
<td width="63%" height="21" bgcolor="<?php echo $phpgw_info["theme"][th_bg]; ?>"> <td width="63%" height="21" bgcolor="<?php echo $phpgw_info["theme"][th_bg]; ?>">
<font face="Arial, Helvetica, sans-serif" size="-1"> <font face="Arial, Helvetica, sans-serif" size="-1">
<?php echo $phpgw->nextmatchs->show_sort_order($sort,"firstname",$order,"index.php", <?php echo $phpgw->nextmatchs->show_sort_order($sort,"firstname",$order,"index.php",
lang_common("First Name")); lang("First Name"));
?> ?>
</font> </font>
</td> </td>
<td width="3%" height="21"> <td width="3%" height="21">
<font face="Arial, Helvetica, sans-serif" size="-1"> <font face="Arial, Helvetica, sans-serif" size="-1">
<?php echo lang_common("View"); ?> <?php echo lang("View"); ?>
</font> </font>
</td> </td>
<td width="5%" height="21"> <td width="5%" height="21">
<font face="Arial, Helvetica, sans-serif" size="-1"> <font face="Arial, Helvetica, sans-serif" size="-1">
<?php echo lang_common("Edit"); ?> <?php echo lang("Edit"); ?>
</font> </font>
</td> </td>
</tr> </tr>
@ -151,12 +151,12 @@
<font face=Arial, Helvetica, sans-serif size=2> <font face=Arial, Helvetica, sans-serif size=2>
<a href="<?php echo $phpgw->link("view.php","con=$con&start=$start&order=$order&filter=" <a href="<?php echo $phpgw->link("view.php","con=$con&start=$start&order=$order&filter="
. "$filter&query=$query&sort=$sort"); . "$filter&query=$query&sort=$sort");
?>"> <?php echo lang_common("View"); ?> </a> ?>"> <?php echo lang("View"); ?> </a>
</font> </font>
</td> </td>
<td valign=top width=5%> <td valign=top width=5%>
<font face=Arial, Helvetica, sans-serif size=2> <font face=Arial, Helvetica, sans-serif size=2>
<?php echo $phpgw->common->check_owner($phpgw->db->f("owner"),"edit.php",lang_common("edit"),"con=" . $phpgw->db->f("con")); ?> <?php echo $phpgw->common->check_owner($phpgw->db->f("owner"),"edit.php",lang("edit"),"con=" . $phpgw->db->f("con")); ?>
</font> </font>
</td> </td>
</tr> </tr>
@ -176,7 +176,7 @@
<tr> <tr>
<td width="4%"> <td width="4%">
<div align="right"> <div align="right">
<input type="submit" name="Add" value="<?php echo lang_common("Add"); ?>"> <input type="submit" name="Add" value="<?php echo lang("Add"); ?>">
</div> </div>
</td> </td>
<td width="72%">&nbsp;</td> <td width="72%">&nbsp;</td>

16
admin/accesslog.php
View File

@ -24,13 +24,13 @@
$show_maxlog = 30; $show_maxlog = 30;
$t->set_var("th_bg",$phpgw_info["theme"]["th_bg"]); $t->set_var("th_bg",$phpgw_info["theme"]["th_bg"]);
$t->set_var("lang_last_x_logins",lang_admin("Last x logins",$show_maxlog)); $t->set_var("lang_last_x_logins",lang("Last x logins",$show_maxlog));
$t->set_var("lang_loginid",lang_admin("LoginID")); $t->set_var("lang_loginid",lang("LoginID"));
$t->set_var("lang_ip",lang_admin("IP")); $t->set_var("lang_ip",lang("IP"));
$t->set_var("lang_login",lang_common("Login")); $t->set_var("lang_login",lang("Login"));
$t->set_var("lang_logout",lang_common("Logout")); $t->set_var("lang_logout",lang("Logout"));
$t->set_var("lang_total",lang_common("Total")); $t->set_var("lang_total",lang("Total"));
$t->parse("out","header"); $t->parse("out","header");
@ -90,8 +90,8 @@
$percent = round((10000 * ($loggedout / $total)) / 100); $percent = round((10000 * ($loggedout / $total)) / 100);
$t->set_var("bg_color",$phpgw_info["themes"]["bg_color"]); $t->set_var("bg_color",$phpgw_info["themes"]["bg_color"]);
$t->set_var("footer_total",lang_admin("Total records") . ": $total"); $t->set_var("footer_total",lang("Total records") . ": $total");
$t->set_var("lang_percent",lang_admin("Percent of users that logged out") . ": $percent%"); $t->set_var("lang_percent",lang("Percent of users that logged out") . ": $percent%");
$t->pparse("out","footer"); $t->pparse("out","footer");

22
admin/accounts.php
View File

@ -47,15 +47,15 @@
$t->set_var("th_bg",$phpgw_info["theme"]["th_bg"]); $t->set_var("th_bg",$phpgw_info["theme"]["th_bg"]);
$t->set_var("left_next_matchs",$phpgw->nextmatchs->left("accounts.php",$start,$total)); $t->set_var("left_next_matchs",$phpgw->nextmatchs->left("accounts.php",$start,$total));
$t->set_var("lang_user_accounts",lang_admin("user accounts")); $t->set_var("lang_user_accounts",lang("user accounts"));
$t->set_var("right_next_matchs",$phpgw->nextmatchs->right("accounts.php",$start,$total)); $t->set_var("right_next_matchs",$phpgw->nextmatchs->right("accounts.php",$start,$total));
$t->set_var("lang_lastname",$phpgw->nextmatchs->show_sort_order($sort,"lastname",$order,"accounts.php",lang_common("last name"))); $t->set_var("lang_lastname",$phpgw->nextmatchs->show_sort_order($sort,"lastname",$order,"accounts.php",lang("last name")));
$t->set_var("lang_firstname",$phpgw->nextmatchs->show_sort_order($sort,"firstname",$order,"accounts.php",lang_common("first name"))); $t->set_var("lang_firstname",$phpgw->nextmatchs->show_sort_order($sort,"firstname",$order,"accounts.php",lang("first name")));
$t->set_var("lang_edit",lang_common("Edit")); $t->set_var("lang_edit",lang("Edit"));
$t->set_var("lang_delete",lang_common("Delete")); $t->set_var("lang_delete",lang("Delete"));
$t->set_var("lang_view",lang_common("View")); $t->set_var("lang_view",lang("View"));
$t->parse("out","header"); $t->parse("out","header");
@ -75,17 +75,17 @@
$t->set_var("row_firstname",$firstname); $t->set_var("row_firstname",$firstname);
$t->set_var("row_lastname",$lastname); $t->set_var("row_lastname",$lastname);
$t->set_var("row_edit",'<a href="'.$phpgw->link("editaccount.php","con=" $t->set_var("row_edit",'<a href="'.$phpgw->link("editaccount.php","con="
. $phpgw->db->f("con")) . '"> ' . lang_common("Edit") . ' </a>'); . $phpgw->db->f("con")) . '"> ' . lang("Edit") . ' </a>');
if ($phpgw_info["user"]["userid"] != $phpgw->db->f("loginid")) { if ($phpgw_info["user"]["userid"] != $phpgw->db->f("loginid")) {
$t->set_var("row_delete",'<a href="' . $phpgw->link("deleteaccount.php",'con=' $t->set_var("row_delete",'<a href="' . $phpgw->link("deleteaccount.php",'con='
. $phpgw->db->f("con")) . '"> '.lang_common("Delete").' </a>'); . $phpgw->db->f("con")) . '"> '.lang("Delete").' </a>');
} else { } else {
$t->set_var("row_delete","&nbsp;"); $t->set_var("row_delete","&nbsp;");
} }
$t->set_var("row_view",'<a href="' . $phpgw->link("viewaccount.php", "con=" $t->set_var("row_view",'<a href="' . $phpgw->link("viewaccount.php", "con="
. $phpgw->db->f("con")) . '"> ' . lang_common("View") . ' </a>'); . $phpgw->db->f("con")) . '"> ' . lang("View") . ' </a>');
if ($phpgw->db->num_rows() == 1) { if ($phpgw->db->num_rows() == 1) {
$t->set_var("output",""); $t->set_var("output","");
@ -97,8 +97,8 @@
} }
$t->set_var("actionurl",$phpgw->link("newaccount.php")); $t->set_var("actionurl",$phpgw->link("newaccount.php"));
$t->set_var("lang_add",lang_common("add")); $t->set_var("lang_add",lang("add"));
$t->set_var("lang_search",lang_common("search")); $t->set_var("lang_search",lang("search"));
$t->pparse("out","footer"); $t->pparse("out","footer");

18
admin/applications.php
View File

@ -24,13 +24,13 @@
echo '<p><table border="0" width="45%" align="center"><tr bgcolor="' echo '<p><table border="0" width="45%" align="center"><tr bgcolor="'
. $phpgw_info["theme"][bg_color] . '">' . $phpgw_info["theme"][bg_color] . '">'
. '<td align="center" colspan=4><b>' . lang_admin("Installed applications") . '</b></td></tr>' . '<td align="center" colspan=4><b>' . lang("Installed applications") . '</b></td></tr>'
. '<tr><td colspan=4>&nbsp;</td></tr>'; . '<tr><td colspan=4>&nbsp;</td></tr>';
echo "<tr bgcolor=" . $phpgw_info["theme"]["th_bg"] . "><td>" echo "<tr bgcolor=" . $phpgw_info["theme"]["th_bg"] . "><td>"
. $phpgw->nextmatchs->show_sort_order($sort,"app_title",$order,"applications.php",lang_admin("title")) . "</td><td>" . $phpgw->nextmatchs->show_sort_order($sort,"app_title",$order,"applications.php",lang("title")) . "</td><td>"
. lang_common("Edit") . "</td> <td> " . lang_common("Delete") . " </td> <td> " . lang("Edit") . "</td> <td> " . lang("Delete") . " </td> <td> "
. lang_admin("Enabled") . " </td> <td></tr>"; . lang("Enabled") . " </td> <td></tr>";
$phpgw->db->query("select * from applications $ordermethod"); $phpgw->db->query("select * from applications $ordermethod");
@ -43,23 +43,23 @@
echo "<tr bgcolor=$tr_color><td>$name</td><td width=5%><a href=\"" echo "<tr bgcolor=$tr_color><td>$name</td><td width=5%><a href=\""
. $phpgw->link("editapplication.php","app_name=" . urlencode($phpgw->db->f("app_name"))) . $phpgw->link("editapplication.php","app_name=" . urlencode($phpgw->db->f("app_name")))
. "\"> " . lang_common("Edit") . " </a></td>"; . "\"> " . lang("Edit") . " </a></td>";
echo "<td width=5%><a href=\"" . $phpgw->link("deleteapplication.php", echo "<td width=5%><a href=\"" . $phpgw->link("deleteapplication.php",
"app_name=" . urlencode($phpgw->db->f("app_name"))) . "\"> " . lang_common("Delete") "app_name=" . urlencode($phpgw->db->f("app_name"))) . "\"> " . lang("Delete")
. " </a></td>"; . " </a></td>";
echo "<td width=5%>"; echo "<td width=5%>";
if ($phpgw->db->f("app_enabled") == 1) { if ($phpgw->db->f("app_enabled") == 1) {
echo lang_common("Yes"); echo lang("Yes");
} else { } else {
echo "<b>" . lang_common("No") . "</b>"; echo "<b>" . lang("No") . "</b>";
} }
echo "</td></tr>\n"; echo "</td></tr>\n";
} }
echo "</form></table><form method=POST action=\"".$phpgw->link("newapplication.php")."\">" echo "</form></table><form method=POST action=\"".$phpgw->link("newapplication.php")."\">"
. "<table border=0 width=45% align=center><tr><td align=left><input type=\"submit\" " . "<table border=0 width=45% align=center><tr><td align=left><input type=\"submit\" "
. "value=\"" . lang_common("Add") . "\"></td></tr></table></form>"; . "value=\"" . lang("Add") . "\"></td></tr></table></form>";
include($phpgw_info["server"]["api_dir"] . "/footer.inc.php"); include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");

14
admin/currentusers.php
View File

@ -31,21 +31,21 @@
$total = $phpgw->db->f(0); $total = $phpgw->db->f(0);
$limit = $phpgw->nextmatchs->sql_limit($start); $limit = $phpgw->nextmatchs->sql_limit($start);
$t->set_var("lang_current_users",lang_admin("List of current users")); $t->set_var("lang_current_users",lang("List of current users"));
$t->set_var("bg_color",$phpgw_info["theme"][bg_color]); $t->set_var("bg_color",$phpgw_info["theme"][bg_color]);
$t->set_var("left_next_matchs",$phpgw->nextmatchs->left("currentusers.php",$start,$total)); $t->set_var("left_next_matchs",$phpgw->nextmatchs->left("currentusers.php",$start,$total));
$t->set_var("right_next_matchs",$phpgw->nextmatchs->right("currentusers.php",$start,$total)); $t->set_var("right_next_matchs",$phpgw->nextmatchs->right("currentusers.php",$start,$total));
$t->set_var("th_bg",$phpgw_info["theme"]["th_bg"]); $t->set_var("th_bg",$phpgw_info["theme"]["th_bg"]);
$t->set_var("sort_loginid",$phpgw->nextmatchs->show_sort_order($sort,"loginid",$order, $t->set_var("sort_loginid",$phpgw->nextmatchs->show_sort_order($sort,"loginid",$order,
"currentusers.php",lang_admin("LoginID"))); "currentusers.php",lang("LoginID")));
$t->set_var("sort_ip",$phpgw->nextmatchs->show_sort_order($sort,"ip",$order, $t->set_var("sort_ip",$phpgw->nextmatchs->show_sort_order($sort,"ip",$order,
"currentusers.php",lang_admin("IP"))); "currentusers.php",lang("IP")));
$t->set_var("sort_login_time",$phpgw->nextmatchs->show_sort_order($sort,"logintime",$order, $t->set_var("sort_login_time",$phpgw->nextmatchs->show_sort_order($sort,"logintime",$order,
"currentusers.php",lang_admin("Login Time"))); "currentusers.php",lang("Login Time")));
$t->set_var("sort_idle",$phpgw->nextmatchs->show_sort_order($sort,"dla",$order, $t->set_var("sort_idle",$phpgw->nextmatchs->show_sort_order($sort,"dla",$order,
"currentusers.php",lang_admin("idle"))); "currentusers.php",lang("idle")));
$t->set_var("lang_kill",lang_admin("Kill")); $t->set_var("lang_kill",lang("Kill"));
$t->parse("out","header"); $t->parse("out","header");
@ -69,7 +69,7 @@
if ($phpgw->db->f("sessionid") != $phpgw_info["user"]["sessionid"]) { if ($phpgw->db->f("sessionid") != $phpgw_info["user"]["sessionid"]) {
$t->set_var("row_kill",'<a href="' . $phpgw->link("killsession.php","ksession=" $t->set_var("row_kill",'<a href="' . $phpgw->link("killsession.php","ksession="
. $phpgw->db->f("sessionid") . "&kill=true\">" . lang_admin("Kill")).'</a>'); . $phpgw->db->f("sessionid") . "&kill=true\">" . lang("Kill")).'</a>');
} else { } else {
$t->set_var("row_kill","&nbsp;"); $t->set_var("row_kill","&nbsp;");
} }

8
admin/deleteaccount.php
View File

@ -30,20 +30,20 @@
<table border=0 with=65%> <table border=0 with=65%>
<tr colspan=2> <tr colspan=2>
<td align=center> <td align=center>
<?php echo lang_admin("Are you sure you want to delete this account ?"); ?> <?php echo lang("Are you sure you want to delete this account ?"); ?>
<td> <td>
</tr> </tr>
<tr colspan=2> <tr colspan=2>
<td align=center> <td align=center>
<?php echo lang_admin("All records and account information will be lost!"); ?> <?php echo lang("All records and account information will be lost!"); ?>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<a href="<?php echo $phpgw->link("accounts.php") . "\">" . lang_common("No"); ?></a> <a href="<?php echo $phpgw->link("accounts.php") . "\">" . lang("No"); ?></a>
</td> </td>
<td> <td>
<a href="<?php echo $phpgw->link("deleteaccount.php","con=$con&confirm=true") . "\">" . lang_common("Yes"); ?></a> <a href="<?php echo $phpgw->link("deleteaccount.php","con=$con&confirm=true") . "\">" . lang("Yes"); ?></a>
</td> </td>
</tr> </tr>
</table> </table>

6
admin/deleteapplication.php
View File

@ -33,15 +33,15 @@
<table border=0 with=65%> <table border=0 with=65%>
<tr colspan=2> <tr colspan=2>
<td align=center> <td align=center>
<?php echo lang_admin("Are you sure you want to delete this application ?"); ?> <?php echo lang("Are you sure you want to delete this application ?"); ?>
<td> <td>
</tr> </tr>
<tr> <tr>
<td> <td>
<a href="<?php echo $phpgw->link("applications.php") . "\">" . lang_common("No") . "</a>"; ?> <a href="<?php echo $phpgw->link("applications.php") . "\">" . lang("No") . "</a>"; ?>
</td> </td>
<td> <td>
<a href="<?php echo $phpgw->link("deleteapplication.php","app_name=" . urlencode($app_name) . "&confirm=True") . "\">" . lang_common("Yes") . "</a>"; ?> <a href="<?php echo $phpgw->link("deleteapplication.php","app_name=" . urlencode($app_name) . "&confirm=True") . "\">" . lang("Yes") . "</a>"; ?>
</td> </td>
</tr> </tr>
</table> </table>

12
admin/deletegroup.php
View File

@ -47,8 +47,8 @@
$phpgw->common->navbar(); $phpgw->common->navbar();
echo '<p><center>'; echo '<p><center>';
echo lang_admin("Sorry, the follow users are still a member of the group x",$group_name) echo lang("Sorry, the follow users are still a member of the group x",$group_name)
. '<br>' . lang_admin("They must be removed before you can continue") . '<br>' . lang("They must be removed before you can continue")
. '</td></tr>'; . '</td></tr>';
echo '<table border="0"><tr><td>'; echo '<table border="0"><tr><td>';
@ -58,7 +58,7 @@
} }
echo "</table></center>"; echo "</table></center>";
echo "<a href=\"" . $phpgw->link("deletegroup.php","group_id=" . $group_id . "&removeusers=True") echo "<a href=\"" . $phpgw->link("deletegroup.php","group_id=" . $group_id . "&removeusers=True")
. "\">" . lang_admin("Remove all users from this group") . "</a>"; . "\">" . lang("Remove all users from this group") . "</a>";
exit; exit;
} }
@ -90,15 +90,15 @@
<table border=0 with=65%> <table border=0 with=65%>
<tr colspan=2> <tr colspan=2>
<td align=center> <td align=center>
<?php echo lang_admin("Are you sure you want to delete this group ?"); ?> <?php echo lang("Are you sure you want to delete this group ?"); ?>
<td> <td>
</tr> </tr>
<tr> <tr>
<td> <td>
<a href="<?php echo $phpgw->link("groups.php") . "\">" . lang_common("No") . "</a>"; ?> <a href="<?php echo $phpgw->link("groups.php") . "\">" . lang("No") . "</a>"; ?>
</td> </td>
<td> <td>
<a href="<?php echo $phpgw->link("deletegroup.php","group_id=$group_id&confirm=true") . "\">" . lang_common("Yes") . "</a>"; ?> <a href="<?php echo $phpgw->link("deletegroup.php","group_id=$group_id&confirm=true") . "\">" . lang("Yes") . "</a>"; ?>
</td> </td>
</tr> </tr>
</table> </table>

8
admin/deleteheadline.php
View File

@ -30,20 +30,20 @@
<table border=0 with=65%> <table border=0 with=65%>
<tr colspan=2> <tr colspan=2>
<td align=center> <td align=center>
<?php echo lang_admin("Are you sure you want to delete this news site ?"); ?> <?php echo lang("Are you sure you want to delete this news site ?"); ?>
<td> <td>
</tr> </tr>
<tr colspan=2> <tr colspan=2>
<td align=center> <td align=center>
<?php echo lang_admin("All records and account information will be lost!"); ?> <?php echo lang("All records and account information will be lost!"); ?>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<a href="<?php echo $phpgw->link("headlines.php") . "\">" . lang_common("No"); ?></a> <a href="<?php echo $phpgw->link("headlines.php") . "\">" . lang("No"); ?></a>
</td> </td>
<td> <td>
<a href="<?php echo $phpgw->link("deleteheadline.php","con=$con&confirm=true") . "\">" . lang_common("Yes"); ?></a> <a href="<?php echo $phpgw->link("deleteheadline.php","con=$con&confirm=true") . "\">" . lang("Yes"); ?></a>
</td> </td>
</tr> </tr>
</table> </table>

34
admin/editaccount.php
View File

@ -34,22 +34,22 @@
if ($n_passwd || $n_passwd_2) { if ($n_passwd || $n_passwd_2) {
if ($n_passwd != $n_passwd_2){ if ($n_passwd != $n_passwd_2){
$error .= lang_admin("The two passwords are not the same"); $error .= lang("The two passwords are not the same");
} }
if (! $n_passwd){ if (! $n_passwd){
$error .= lang_admin("You must enter a password"); $error .= lang("You must enter a password");
} }
} }
if ($lid != $n_loginid) { if ($lid != $n_loginid) {
$phpgw->db->query("select loginid from accounts where loginid='$n_loginid'"); $phpgw->db->query("select loginid from accounts where loginid='$n_loginid'");
if ($phpgw->db->num_rows() != 0) { if ($phpgw->db->num_rows() != 0) {
$error .= "<br>" . lang_admin("That loginid has already been taken"); $error .= "<br>" . lang("That loginid has already been taken");
} }
} }
if (count($new_permissions) == 0){ if (count($new_permissions) == 0){
$error .= "<br>" . lang_admin("You must add at least 1 permission to this account"); $error .= "<br>" . lang("You must add at least 1 permission to this account");
} }
if (! $error) { if (! $error) {
$phpgw->db->lock(array('accounts','preferences','sessions')); $phpgw->db->lock(array('accounts','preferences','sessions'));
@ -125,25 +125,25 @@
<input type="hidden" name="con" value="<? echo $con; ?>"> <input type="hidden" name="con" value="<? echo $con; ?>">
<?php <?php
if ($error) { if ($error) {
echo "<center>" . lang_common("Error") . ":$error</center>"; echo "<center>" . lang("Error") . ":$error</center>";
} }
?> ?>
<center> <center>
<table border=0 width=65%> <table border=0 width=65%>
<tr> <tr>
<td><?php echo lang_admin("LoginID"); ?></td> <td><?php echo lang("LoginID"); ?></td>
<td><input name="n_loginid" value="<? echo $phpgw->db->f("loginid"); ?>"></td> <td><input name="n_loginid" value="<? echo $phpgw->db->f("loginid"); ?>"></td>
</tr> </tr>
<tr> <tr>
<td><?php echo lang_common("First Name"); ?></td> <td><?php echo lang("First Name"); ?></td>
<td><input name="n_firstname" value="<?echo $phpgw->db->f("firstname"); ?>"></td> <td><input name="n_firstname" value="<?echo $phpgw->db->f("firstname"); ?>"></td>
</tr> </tr>
<tr> <tr>
<td><?php echo lang_common("Last Name"); ?></td> <td><?php echo lang("Last Name"); ?></td>
<td><input name="n_lastname" value="<? echo $phpgw->db->f("lastname"); ?>"></td> <td><input name="n_lastname" value="<? echo $phpgw->db->f("lastname"); ?>"></td>
</tr> </tr>
<tr> <tr>
<td><?php echo lang_common("Groups"); ?></td> <td><?php echo lang("Groups"); ?></td>
<td><select name="n_groups[]" multiple size="5"> <td><select name="n_groups[]" multiple size="5">
<?php <?php
$user_groups = $phpgw->accounts->read_group_names($phpgw->db->f("loginid")); $user_groups = $phpgw->accounts->read_group_names($phpgw->db->f("loginid"));
@ -173,7 +173,7 @@
for ($i=0;$i<200;) { // The $i<200 is only used for a brake for ($i=0;$i<200;) { // The $i<200 is only used for a brake
if (! $perm_display[$i][1]) break; if (! $perm_display[$i][1]) break;
echo '<tr><td>' . lang_common($perm_display[$i][1]) . '</td>' echo '<tr><td>' . lang($perm_display[$i][1]) . '</td>'
. '<td><input type="checkbox" name="new_permissions[' . '<td><input type="checkbox" name="new_permissions['
. $perm_display[$i][0] . ']" value="True"'; . $perm_display[$i][0] . ']" value="True"';
if ($new_permissions[$perm_display[$i][0]] || $db_perms[$perm_display[$i][0]]) { if ($new_permissions[$perm_display[$i][0]] || $db_perms[$perm_display[$i][0]]) {
@ -182,7 +182,7 @@
echo "></td>"; echo "></td>";
$i++; $i++;
if (! $perm_display[$i][1]) break; if (! $perm_display[$i][1]) break;
echo '<td>' . lang_common($perm_display[$i][1]) . '</td>' echo '<td>' . lang($perm_display[$i][1]) . '</td>'
. '<td><input type="checkbox" name="new_permissions[' . '<td><input type="checkbox" name="new_permissions['
. $perm_display[$i][0] . ']" value="True"'; . $perm_display[$i][0] . ']" value="True"';
if ($new_permissions[$perm_display[$i][0]] || $db_perms[$perm_display[$i][0]]) { if ($new_permissions[$perm_display[$i][0]] || $db_perms[$perm_display[$i][0]]) {
@ -193,13 +193,13 @@
} }
/* /*
echo "<tr><td>" . lang_admin("Anonymous user") . "</td><td><input type=\"" echo "<tr><td>" . lang("Anonymous user") . "</td><td><input type=\""
. "checkbox\" name=\"new_permissions[anonymous]\" value=\"True\""; . "checkbox\" name=\"new_permissions[anonymous]\" value=\"True\"";
if ($db_perms["anonymous"] || $new_permissions[anonymous]) if ($db_perms["anonymous"] || $new_permissions[anonymous])
echo " checked"; echo " checked";
echo "></td>"; echo "></td>";
echo "<td>" . lang_admin("Manager") . "</td><td><input type=\"" echo "<td>" . lang("Manager") . "</td><td><input type=\""
. "checkbox\" name=\"new_permissions[manager]\" value=\"True\""; . "checkbox\" name=\"new_permissions[manager]\" value=\"True\"";
if ($db_perms["manager"] || $new_permissions[manager]) if ($db_perms["manager"] || $new_permissions[manager])
echo " checked"; echo " checked";
@ -207,20 +207,20 @@
*/ */
?> ?>
<tr> <tr>
<td><?php echo lang_admin("Account active"); ?></td> <td><?php echo lang("Account active"); ?></td>
<td><input type="checkbox" name="n_account_status" value="A" <?php if ($account_status == "A") { echo " checked"; } ?>> <td><input type="checkbox" name="n_account_status" value="A" <?php if ($account_status == "A") { echo " checked"; } ?>>
</td> </td>
</tr> </tr>
<tr> <tr>
<td><?php echo lang_admin("New password [ Leave blank for no change ]"); ?></td> <td><?php echo lang("New password [ Leave blank for no change ]"); ?></td>
<td><input type=password name="n_passwd"></td> <td><input type=password name="n_passwd"></td>
</tr> </tr>
<tr> <tr>
<td><?php echo lang_admin("Re-enter password"); ?></td> <td><?php echo lang("Re-enter password"); ?></td>
<td><input type=password name="n_passwd_2"></td> <td><input type=password name="n_passwd_2"></td>
</tr> </tr>
<tr> <tr>
<td colspan=2><input type="submit" name="submit" value="<?php echo lang_common("submit"); ?>"></td> <td colspan=2><input type="submit" name="submit" value="<?php echo lang("submit"); ?>"></td>
</tr> </tr>
</table> </table>
</center> </center>

12
admin/editapplication.php
View File

@ -23,7 +23,7 @@
if ($submit) { if ($submit) {
if (! $n_app_name || ! $n_app_title) { if (! $n_app_name || ! $n_app_title) {
$error = lang_admin("You must enter an application name and title."); $error = lang("You must enter an application name and title.");
} else { } else {
$phpgw->db->query("update applications set app_name='" . addslashes($n_app_name) . "'," $phpgw->db->query("update applications set app_name='" . addslashes($n_app_name) . "',"
. "app_title='" . addslashes($n_app_title) . "', app_enabled='" . "app_title='" . addslashes($n_app_title) . "', app_enabled='"
@ -41,7 +41,7 @@
$phpgw->common->navbar(); $phpgw->common->navbar();
} }
$t->set_var("lang_header",lang_admin("Add new application")); $t->set_var("lang_header",lang("Add new application"));
if ($error) { if ($error) {
$t->set_var("error","<p><center>$error</center><br>"); $t->set_var("error","<p><center>$error</center><br>");
@ -51,10 +51,10 @@
$t->set_var("hidden_vars",'<input type="hidden" name="old_app_name" value="' . $phpgw->db->f("app_name") . '">'); $t->set_var("hidden_vars",'<input type="hidden" name="old_app_name" value="' . $phpgw->db->f("app_name") . '">');
$t->set_var("form_action",$phpgw->link("editapplication.php")); $t->set_var("form_action",$phpgw->link("editapplication.php"));
$t->set_var("lang_app_name",lang_admin("application name")); $t->set_var("lang_app_name",lang("application name"));
$t->set_var("lang_app_title",lang_admin("application title")); $t->set_var("lang_app_title",lang("application title"));
$t->set_var("lang_enabled",lang_admin("enabled")); $t->set_var("lang_enabled",lang("enabled"));
$t->set_var("lang_submit_button",lang_common("edit")); $t->set_var("lang_submit_button",lang("edit"));
$t->set_var("app_name_value",$phpgw->db->f("app_name")); $t->set_var("app_name_value",$phpgw->db->f("app_name"));
$t->set_var("app_title_value",$phpgw->db->f("app_title")); $t->set_var("app_title_value",$phpgw->db->f("app_title"));

10
admin/editgroup.php
View File

@ -36,7 +36,7 @@
$phpgw->db->next_record(); $phpgw->db->next_record();
if ($phpgw->db->f(0) != 0 && $n_group != $old_group_name) { if ($phpgw->db->f(0) != 0 && $n_group != $old_group_name) {
$error = lang_admin("Sorry, that group name has already been taking."); $error = lang("Sorry, that group name has already been taking.");
} }
if (! $error) { if (! $error) {
@ -124,7 +124,7 @@
$t->set_var("form_action",$phpgw->link("editgroup.php")); $t->set_var("form_action",$phpgw->link("editgroup.php"));
$t->set_var("hidden_vars","<input type=\"hidden\" name=\"group_id\" value=\"" . $group_id . "\">"); $t->set_var("hidden_vars","<input type=\"hidden\" name=\"group_id\" value=\"" . $group_id . "\">");
$t->set_var("lang_group_name",lang_admin("group name")); $t->set_var("lang_group_name",lang("group name"));
$t->set_var("group_name_value",$phpgw->db->f("group_name")); $t->set_var("group_name_value",$phpgw->db->f("group_name"));
$phpgw->db->query("select count(*) from accounts where status !='L'"); $phpgw->db->query("select count(*) from accounts where status !='L'");
@ -136,7 +136,7 @@
$t->set_var("select_size","5"); $t->set_var("select_size","5");
} }
$t->set_var("lang_include_user",lang_admin("Select users for inclusion")); $t->set_var("lang_include_user",lang("Select users for inclusion"));
$phpgw->db->query("SELECT con,firstname,lastname, loginid FROM accounts where " $phpgw->db->query("SELECT con,firstname,lastname, loginid FROM accounts where "
. "status != 'L' ORDER BY lastname,firstname,loginid asc"); . "status != 'L' ORDER BY lastname,firstname,loginid asc");
while ($phpgw->db->next_record()) { while ($phpgw->db->next_record()) {
@ -148,7 +148,7 @@
} }
$t->set_var("user_list",$user_list); $t->set_var("user_list",$user_list);
$t->set_var("lang_permissions",lang_admin("Permissions this group has")); $t->set_var("lang_permissions",lang("Permissions this group has"));
while ($permission = each($phpgw_info["apps"])) { while ($permission = each($phpgw_info["apps"])) {
if ($permission[1]["enabled"]) { if ($permission[1]["enabled"]) {
$permissions_list .= "<option value=\"" . $permission[0] . "\"" $permissions_list .= "<option value=\"" . $permission[0] . "\""
@ -157,7 +157,7 @@
} }
} }
$t->set_var("permissions_list",$permissions_list); $t->set_var("permissions_list",$permissions_list);
$t->set_var("lang_submit_button",lang_admin("submit changes")); $t->set_var("lang_submit_button",lang("submit changes"));
$t->pparse("out","form"); $t->pparse("out","form");

14
admin/editheadline.php
View File

@ -33,27 +33,27 @@
<center> <center>
<table border=0 width=65%> <table border=0 width=65%>
<tr> <tr>
<td><?php echo lang_admin("Display"); ?></td> <td><?php echo lang("Display"); ?></td>
<td><input name="n_display" value="<?echo $phpgw->db->f("display"); ?>"></td> <td><input name="n_display" value="<?echo $phpgw->db->f("display"); ?>"></td>
</tr> </tr>
<tr> <tr>
<td><?php echo lang_admin("Base URL"); ?></td> <td><?php echo lang("Base URL"); ?></td>
<td><input name="n_base_url" value="<? echo $phpgw->db->f("base_url"); ?>"></td> <td><input name="n_base_url" value="<? echo $phpgw->db->f("base_url"); ?>"></td>
</tr> </tr>
<tr> <tr>
<td><?php echo lang_admin("News File"); ?></td> <td><?php echo lang("News File"); ?></td>
<td><input name="n_newsfile" value="<? echo $phpgw->db->f("newsfile"); ?>"></td> <td><input name="n_newsfile" value="<? echo $phpgw->db->f("newsfile"); ?>"></td>
</tr> </tr>
<tr> <tr>
<td><?php echo lang_admin("Minutes between Reloads"); ?></td> <td><?php echo lang("Minutes between Reloads"); ?></td>
<td><input name="n_cachetime" value="<? echo $phpgw->db->f("cachetime"); ?>"></td> <td><input name="n_cachetime" value="<? echo $phpgw->db->f("cachetime"); ?>"></td>
</tr> </tr>
<tr> <tr>
<td><?php echo lang_admin("Listings Displayed"); ?></td> <td><?php echo lang("Listings Displayed"); ?></td>
<td><input name="n_listings" value="<? echo $phpgw->db->f("listings"); ?>"></td> <td><input name="n_listings" value="<? echo $phpgw->db->f("listings"); ?>"></td>
</tr> </tr>
<tr> <tr>
<td><?php echo lang_admin("News Type"); ?></td> <td><?php echo lang("News Type"); ?></td>
<td> <td>
<? <?
$news_type = array('rdf','fm','lt','sf','rdf-chan'); $news_type = array('rdf','fm','lt','sf','rdf-chan');
@ -66,7 +66,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan=2><input type="submit" name="submit" value="<?php echo lang_common("submit"); ?>"></td> <td colspan=2><input type="submit" name="submit" value="<?php echo lang("submit"); ?>"></td>
</tr> </tr>
</table> </table>
</center> </center>

14
admin/groups.php
View File

@ -38,15 +38,15 @@
echo '<p><table border="0" width="45%" align="center"><tr bgcolor="' echo '<p><table border="0" width="45%" align="center"><tr bgcolor="'
. $phpgw_info["theme"][bg_color] . '">' . $phpgw_info["theme"][bg_color] . '">'
. '<td align="left">' . $phpgw->nextmatchs->left("groups.php",$start,$total) . '</td>' . '<td align="left">' . $phpgw->nextmatchs->left("groups.php",$start,$total) . '</td>'
. '<td align="center">' . lang_admin("user groups") . '</td>' . '<td align="center">' . lang("user groups") . '</td>'
. '<td align="right">' . $phpgw->nextmatchs->right("groups.php",$start,$total) . '</td>' . '<td align="right">' . $phpgw->nextmatchs->right("groups.php",$start,$total) . '</td>'
. '</tr></table>'; . '</tr></table>';
echo "<table border=0 width=45% align=center>" echo "<table border=0 width=45% align=center>"
. "<tr bgcolor=" . $phpgw_info["theme"]["th_bg"] . "><td>" . "<tr bgcolor=" . $phpgw_info["theme"]["th_bg"] . "><td>"
. $phpgw->nextmatchs->show_sort_order($sort,"group_name",$order,"groups.php", . $phpgw->nextmatchs->show_sort_order($sort,"group_name",$order,"groups.php",
lang_common("name")) . "</td>" lang("name")) . "</td>"
. "<td> " . lang_common("Edit") . " </td> <td> " . lang_common("Delete") . "<td> " . lang("Edit") . " </td> <td> " . lang("Delete")
. " </td> </tr>"; . " </td> </tr>";
$phpgw->db->query("select * from groups $querymethod $ordermethod limit $limit"); $phpgw->db->query("select * from groups $querymethod $ordermethod limit $limit");
@ -59,16 +59,16 @@
echo "<tr bgcolor=$tr_color><td>$group_name</td>" echo "<tr bgcolor=$tr_color><td>$group_name</td>"
. "<td width=5%><a href=\"" . $phpgw->link("editgroup.php","group_id=" . $phpgw->db->f("group_id")) . "<td width=5%><a href=\"" . $phpgw->link("editgroup.php","group_id=" . $phpgw->db->f("group_id"))
. "\"> " . lang_common("Edit") . " </a></td>" . "<td width=5%><a href=\"" . "\"> " . lang("Edit") . " </a></td>" . "<td width=5%><a href=\""
. $phpgw->link("deletegroup.php","group_id=" . $phpgw->db->f("group_id")) . $phpgw->link("deletegroup.php","group_id=" . $phpgw->db->f("group_id"))
. "\"> " . lang_common("Delete") . " </a></td>"; . "\"> " . lang("Delete") . " </a></td>";
} }
echo "\n<form method=POST action=\"".$phpgw->link("newgroup.php")."\">" echo "\n<form method=POST action=\"".$phpgw->link("newgroup.php")."\">"
. "</table></center>" . "</table></center>"
. "<table border=0 width=45% align=center><tr><td align=left><input type=\"submit\" " . "<table border=0 width=45% align=center><tr><td align=left><input type=\"submit\" "
. "value=\"" . lang_common("Add") . "\"></form><form action=\"".$phpgw->link("groups.php")."\"></td>" . "value=\"" . lang("Add") . "\"></form><form action=\"".$phpgw->link("groups.php")."\"></td>"
. "<td align=right>" . lang_common("search") . "&nbsp;" . "<td align=right>" . lang("search") . "&nbsp;"
. "<input name=\"query\"></td></tr></form></table>"; . "<input name=\"query\"></td></tr></form></table>";
include($phpgw_info["server"]["api_dir"] . "/footer.inc.php"); include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");

16
admin/headlines.php
View File

@ -14,10 +14,10 @@
$phpgw_info["flags"]["currentapp"] = "admin"; $phpgw_info["flags"]["currentapp"] = "admin";
include("../header.inc.php"); include("../header.inc.php");
echo "<p><center>" . lang_admin("Headline Sites") . "<br><table border=0 width=65%>" echo "<p><center>" . lang("Headline Sites") . "<br><table border=0 width=65%>"
. "<tr bgcolor=" . $theme["th_bg"] . "><td>" . lang_admin("Site") . "</td>" . "<tr bgcolor=" . $theme["th_bg"] . "><td>" . lang("Site") . "</td>"
. "<td> " . lang_common("Edit") . " </td> <td> " . lang_common("Delete") . " </td> <td> " . "<td> " . lang("Edit") . " </td> <td> " . lang("Delete") . " </td> <td> "
. lang_common("View") . " </td></tr>"; . lang("View") . " </td></tr>";
$phpgw->db->query("select con,display from news_site order by " $phpgw->db->query("select con,display from news_site order by "
. "display"); . "display");
@ -31,15 +31,15 @@
echo "<tr bgcolor=$tr_color><td>$display</td>" echo "<tr bgcolor=$tr_color><td>$display</td>"
. "<td width=5%><a href=\"".$phpgw->link("editheadline.php", . "<td width=5%><a href=\"".$phpgw->link("editheadline.php",
"con=".$phpgw->db->f("con"))."\"> ".lang_common("Edit")." </a></td>"; "con=".$phpgw->db->f("con"))."\"> ".lang("Edit")." </a></td>";
echo "<td width=5%><a href=\"".$phpgw->link("deleteheadline.php", echo "<td width=5%><a href=\"".$phpgw->link("deleteheadline.php",
"con=".$phpgw->db->f("con"))."\"> ".lang_common("Delete")." </a></td>"; "con=".$phpgw->db->f("con"))."\"> ".lang("Delete")." </a></td>";
echo "<td width=5%><a href=\"".$phpgw->link("viewheadline.php", echo "<td width=5%><a href=\"".$phpgw->link("viewheadline.php",
"con=".$phpgw->db->f("con"))."\"> ".lang_common("View")." </a> </td></tr>\n"; "con=".$phpgw->db->f("con"))."\"> ".lang("View")." </a> </td></tr>\n";
} }
echo "<form method=POST action=\"".$phpgw->link("newheadline.php")."\">" echo "<form method=POST action=\"".$phpgw->link("newheadline.php")."\">"
. "<tr><td colspan=\"5\"><input type=\"submit\" value=\"".lang_common("Add") . "<tr><td colspan=\"5\"><input type=\"submit\" value=\"".lang("Add")
. "\"></td></tr></form></table></center>"; . "\"></td></tr></form></table></center>";
include($phpgw_info["server"]["api_dir"] . "/footer.inc.php"); include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");

14
admin/index.php
View File

@ -19,13 +19,13 @@
?> ?>
<p> <p>
<br><a href="<?php echo $phpgw->link("accounts.php") . "\">" . lang_admin("User accounts"); ?></a> <br><a href="<?php echo $phpgw->link("accounts.php") . "\">" . lang("User accounts"); ?></a>
<br><a href="<?php echo $phpgw->link("groups.php") . "\">" . lang_admin("User groups"); ?></a> <br><a href="<?php echo $phpgw->link("groups.php") . "\">" . lang("User groups"); ?></a>
<br><a href="<?php echo $phpgw->link("applications.php") . "\">" . lang_admin("Applications"); ?></a> <br><a href="<?php echo $phpgw->link("applications.php") . "\">" . lang("Applications"); ?></a>
<p><a href="<?php echo $phpgw->link("currentusers.php") . "\">" . lang_admin("View sessions"); ?></a> <p><a href="<?php echo $phpgw->link("currentusers.php") . "\">" . lang("View sessions"); ?></a>
<br><a href="<?php echo $phpgw->link("accesslog.php") . "\">" . lang_admin("View Access Log"); ?></a> <br><a href="<?php echo $phpgw->link("accesslog.php") . "\">" . lang("View Access Log"); ?></a>
<p><a href="<?php echo $phpgw->link("headlines.php") . "\">" . lang_admin("Headline Sites"); ?></a> <p><a href="<?php echo $phpgw->link("headlines.php") . "\">" . lang("Headline Sites"); ?></a>
<p><a href="<?php echo $phpgw->link("nntp.php") . "\">" . lang_admin("Network News"); ?></a> <p><a href="<?php echo $phpgw->link("nntp.php") . "\">" . lang("Network News"); ?></a>
<?php <?php
if ( $SHOW_INFO > 0 ) { if ( $SHOW_INFO > 0 ) {
echo "<p><a href=\"".$phpgw->link($PHP_SELF, "SHOW_INFO=0")."\">Hide PHP Information</a>"; echo "<p><a href=\"".$phpgw->link($PHP_SELF, "SHOW_INFO=0")."\">Hide PHP Information</a>";

6
admin/killsession.php
View File

@ -32,16 +32,16 @@
<table border=0 with=65%> <table border=0 with=65%>
<tr colspan=2> <tr colspan=2>
<td align=center> <td align=center>
<?php echo lang_admin("Are you sure you want to kill this session ?"); ?> <?php echo lang("Are you sure you want to kill this session ?"); ?>
<td> <td>
</tr> </tr>
<tr> <tr>
<td> <td>
<a href="<?php echo $phpgw->link("currentusers.php") . "\">" . lang_common("No"); ?></a> <a href="<?php echo $phpgw->link("currentusers.php") . "\">" . lang("No"); ?></a>
</td> </td>
<td> <td>
<a href="<?php echo $phpgw->link("killsession.php","ksession=$ksession&confirm=true") <a href="<?php echo $phpgw->link("killsession.php","ksession=$ksession&confirm=true")
. "\">" . lang_common("Yes"); ?></a> . "\">" . lang("Yes"); ?></a>
</td> </td>
</tr> </tr>
</table> </table>

36
admin/newaccount.php
View File

@ -17,24 +17,24 @@
include("../header.inc.php"); include("../header.inc.php");
if ($submit) { if ($submit) {
if (! $n_loginid) if (! $n_loginid)
$error = "<br>" . lang_admin("You must enter a loginid"); $error = "<br>" . lang("You must enter a loginid");
if (! $n_passwd) if (! $n_passwd)
$error .= "<br>" . lang_admin("You must enter a password"); $error .= "<br>" . lang("You must enter a password");
if ($n_passwd == $n_loginid) if ($n_passwd == $n_loginid)
$error = "<br>" . lang_admin("The login and password can not be the same"); $error = "<br>" . lang("The login and password can not be the same");
if ($n_passwd != $n_passwd_2) if ($n_passwd != $n_passwd_2)
$error .= "<br>" . lang_admin("The two passwords are not the same"); $error .= "<br>" . lang("The two passwords are not the same");
if (count($new_permissions) == 0) if (count($new_permissions) == 0)
$error .= "<br>" . lang_admin("You must add at least 1 permission to this account"); $error .= "<br>" . lang("You must add at least 1 permission to this account");
$phpgw->db->query("select loginid from accounts where loginid='$n_loginid'"); $phpgw->db->query("select loginid from accounts where loginid='$n_loginid'");
$phpgw->db->next_record(); $phpgw->db->next_record();
if ($phpgw->db->f("loginid")) if ($phpgw->db->f("loginid"))
$error .= "<br>" . lang_admin("That loginid has already been taken"); $error .= "<br>" . lang("That loginid has already been taken");
if (! $error) { if (! $error) {
$phpgw->db->lock(array("accounts","preferences")); $phpgw->db->lock(array("accounts","preferences"));
@ -93,33 +93,33 @@
<form method="POST" action="<?php echo $phpgw->link("newaccount.php"); ?>"> <form method="POST" action="<?php echo $phpgw->link("newaccount.php"); ?>">
<?php <?php
if ($error) { if ($error) {
echo "<center>" . lang_common("Error") . ":$error</center>"; echo "<center>" . lang("Error") . ":$error</center>";
} }
?> ?>
<center> <center>
<table border=0 width=65%> <table border=0 width=65%>
<tr> <tr>
<td><?php echo lang_admin("LoginID"); ?></td> <td><?php echo lang("LoginID"); ?></td>
<td><input name="n_loginid" value="<?php echo $n_loginid; ?>"></td> <td><input name="n_loginid" value="<?php echo $n_loginid; ?>"></td>
</tr> </tr>
<tr> <tr>
<td><?php echo lang_common("Password"); ?></td> <td><?php echo lang("Password"); ?></td>
<td><input type="password" name="n_passwd" value="<?php echo $n_passwd; ?>"></td> <td><input type="password" name="n_passwd" value="<?php echo $n_passwd; ?>"></td>
</tr> </tr>
<tr> <tr>
<td><?php echo lang_admin("Re-Enter Password"); ?></td> <td><?php echo lang("Re-Enter Password"); ?></td>
<td><input type="password" name="n_passwd_2" value="<?php echo $n_passwd_2; ?>"></td> <td><input type="password" name="n_passwd_2" value="<?php echo $n_passwd_2; ?>"></td>
</tr> </tr>
<tr> <tr>
<td><?php echo lang_common("First Name"); ?></td> <td><?php echo lang("First Name"); ?></td>
<td><input name="n_firstname" value="<?php echo $n_firstname; ?>"></td> <td><input name="n_firstname" value="<?php echo $n_firstname; ?>"></td>
</tr> </tr>
<tr> <tr>
<td><?php echo lang_common("Last Name"); ?></td> <td><?php echo lang("Last Name"); ?></td>
<td><input name="n_lastname" value="<?php echo $n_lastname; ?>"></td> <td><input name="n_lastname" value="<?php echo $n_lastname; ?>"></td>
</tr> </tr>
<tr> <tr>
<td><?php echo lang_common("Groups"); ?></td> <td><?php echo lang("Groups"); ?></td>
<td><select name="n_groups[]" multiple><?php <td><select name="n_groups[]" multiple><?php
$phpgw->db->query("select * from groups"); $phpgw->db->query("select * from groups");
while ($phpgw->db->next_record()) { while ($phpgw->db->next_record()) {
@ -145,7 +145,7 @@
for ($i=0;$i<200;) { // The $i<200 is only used for a brake for ($i=0;$i<200;) { // The $i<200 is only used for a brake
if (! $perm_display[$i][1]) break; if (! $perm_display[$i][1]) break;
echo '<tr><td>' . lang_common($perm_display[$i][1]) . '</td>' echo '<tr><td>' . lang($perm_display[$i][1]) . '</td>'
. '<td><input type="checkbox" name="new_permissions[' . '<td><input type="checkbox" name="new_permissions['
. $perm_display[$i][0] . ']" value="True"'; . $perm_display[$i][0] . ']" value="True"';
if ($new_permissions[$perm_display[$i][0]]) { if ($new_permissions[$perm_display[$i][0]]) {
@ -157,7 +157,7 @@
if (! $perm_display[$i][1]) break; if (! $perm_display[$i][1]) break;
echo '<td>' . lang_common($perm_display[$i][1]) . '</td>' echo '<td>' . lang($perm_display[$i][1]) . '</td>'
. '<td><input type="checkbox" name="new_permissions[' . '<td><input type="checkbox" name="new_permissions['
. $perm_display[$i][0] . ']" value="True"'; . $perm_display[$i][0] . ']" value="True"';
if ($new_permissions[$perm_display[$i][0]]) { if ($new_permissions[$perm_display[$i][0]]) {
@ -170,17 +170,17 @@
/* /*
// Just until we can get thing the $phpgw_info["apps"] then figured out // Just until we can get thing the $phpgw_info["apps"] then figured out
echo "<tr><td>" . lang_admin("Anonymous user") . "</td> <td><input type=\"" echo "<tr><td>" . lang("Anonymous user") . "</td> <td><input type=\""
. "checkbox\" name=\"new_permissions[anonymous]\" value=\"Y\"></td>"; . "checkbox\" name=\"new_permissions[anonymous]\" value=\"Y\"></td>";
echo "<td>" . lang_admin("Manager") . "</td> <td><input type=\"" echo "<td>" . lang("Manager") . "</td> <td><input type=\""
. "checkbox\" name=\"new_permissions[manager]\" value=\"Y\"></td></tr>"; . "checkbox\" name=\"new_permissions[manager]\" value=\"Y\"></td></tr>";
*/ */
?> ?>
<tr> <tr>
<td colspan=2> <td colspan=2>
<input type="submit" name="submit" value="<?php echo lang_common("submit"); ?>"> <input type="submit" name="submit" value="<?php echo lang("submit"); ?>">
</td> </td>
</tr> </tr>
</table> </table>

12
admin/newapplication.php
View File

@ -24,7 +24,7 @@
if ($submit) { if ($submit) {
if (! $n_app_name || ! $n_app_title) { if (! $n_app_name || ! $n_app_title) {
$error = lang_admin("You must enter an application name and title."); $error = lang("You must enter an application name and title.");
} else { } else {
$phpgw->db->query("insert into applications (app_name,app_title,app_enabled) values('" $phpgw->db->query("insert into applications (app_name,app_title,app_enabled) values('"
. addslashes($n_app_name) . "','" . addslashes($n_app_title) . "','" . addslashes($n_app_name) . "','" . addslashes($n_app_title) . "','"
@ -39,7 +39,7 @@
$phpgw->common->navbar(); $phpgw->common->navbar();
} }
$t->set_var("lang_header",lang_admin("Add new application")); $t->set_var("lang_header",lang("Add new application"));
if ($error) { if ($error) {
$t->set_var("error","<p><center>$error</center><br>"); $t->set_var("error","<p><center>$error</center><br>");
@ -49,10 +49,10 @@
$t->set_var("session_hidden_var",""); $t->set_var("session_hidden_var","");
$t->set_var("form_action",$phpgw->link("newapplication.php")); $t->set_var("form_action",$phpgw->link("newapplication.php"));
$t->set_var("lang_app_name",lang_admin("application name")); $t->set_var("lang_app_name",lang("application name"));
$t->set_var("lang_app_title",lang_admin("application title")); $t->set_var("lang_app_title",lang("application title"));
$t->set_var("lang_enabled",lang_admin("enabled")); $t->set_var("lang_enabled",lang("enabled"));
$t->set_var("lang_submit_button",lang_common("add")); $t->set_var("lang_submit_button",lang("add"));
$t->set_var("app_name_value",""); $t->set_var("app_name_value","");
$t->set_var("app_title_value",""); $t->set_var("app_title_value","");

12
admin/newgroup.php
View File

@ -26,10 +26,10 @@
$phpgw->db->next_record(); $phpgw->db->next_record();
if ($phpgw->db->f(0) != 0) { if ($phpgw->db->f(0) != 0) {
$error = "<br>" . lang_admin("Sorry, that group name has already been taking."); $error = "<br>" . lang("Sorry, that group name has already been taking.");
} }
if (! $n_group) { if (! $n_group) {
$error = "<br>" . lang_admin("You must enter a group name."); $error = "<br>" . lang("You must enter a group name.");
} }
if (! $error) { if (! $error) {
@ -75,7 +75,7 @@
} }
$t->set_var("form_action",$phpgw->link("newgroup.php")); $t->set_var("form_action",$phpgw->link("newgroup.php"));
$t->set_var("lang_group_name",lang_admin("New group name")); $t->set_var("lang_group_name",lang("New group name"));
$t->set_var("group_name_value",""); $t->set_var("group_name_value","");
$phpgw->db->query("select count(*) from accounts where status !='L'"); $phpgw->db->query("select count(*) from accounts where status !='L'");
@ -87,7 +87,7 @@
$t->set_var("select_size","5"); $t->set_var("select_size","5");
} }
$t->set_var("lang_include_user",lang_admin("Select users for inclusion")); $t->set_var("lang_include_user",lang("Select users for inclusion"));
for ($i=0; $i<count($n_users); $i++) { for ($i=0; $i<count($n_users); $i++) {
$selected_users[$n_users[$i]] = " selected"; $selected_users[$n_users[$i]] = " selected";
} }
@ -103,7 +103,7 @@
} }
$t->set_var("user_list",$user_list); $t->set_var("user_list",$user_list);
$t->set_var("lang_permissions",lang_admin("Select permissions this group will have")); $t->set_var("lang_permissions",lang("Select permissions this group will have"));
for ($i=0; $i<count($n_group_permissions); $i++) { for ($i=0; $i<count($n_group_permissions); $i++) {
$selected_permissions[$n_group_permissions[$i]] = " selected"; $selected_permissions[$n_group_permissions[$i]] = " selected";
} }
@ -116,7 +116,7 @@
} }
} }
$t->set_var("permissions_list",$permissions_list); $t->set_var("permissions_list",$permissions_list);
$t->set_var("lang_submit_button",lang_admin("Create Group")); $t->set_var("lang_submit_button",lang("Create Group"));
$t->pparse("out","form"); $t->pparse("out","form");

28
admin/newheadline.php
View File

@ -22,27 +22,27 @@
<center> <center>
<table border=0 width=65%> <table border=0 width=65%>
<tr> <tr>
<td><?php echo lang_admin("Display"); ?></td> <td><?php echo lang("Display"); ?></td>
<td><input name="n_display"></td> <td><input name="n_display"></td>
</tr> </tr>
<tr> <tr>
<td><?php echo lang_admin("Base URL"); ?></td> <td><?php echo lang("Base URL"); ?></td>
<td><input name="n_base_url"></td> <td><input name="n_base_url"></td>
</tr> </tr>
<tr> <tr>
<td><?php echo lang_admin("News File"); ?></td> <td><?php echo lang("News File"); ?></td>
<td><input name="n_newsfile"></td> <td><input name="n_newsfile"></td>
</tr> </tr>
<tr> <tr>
<td><?php echo lang_admin("Minutes between Reloads"); ?></td> <td><?php echo lang("Minutes between Reloads"); ?></td>
<td><input name="n_cachetime"></td> <td><input name="n_cachetime"></td>
</tr> </tr>
<tr> <tr>
<td><?php echo lang_admin("Listings Displayed"); ?></td> <td><?php echo lang("Listings Displayed"); ?></td>
<td><input name="n_listings"></td> <td><input name="n_listings"></td>
</tr> </tr>
<tr> <tr>
<td><?php echo lang_admin("News Type"); ?></td> <td><?php echo lang("News Type"); ?></td>
<td> <td>
<? <?
$news_type = array('rdf','fm','lt','sf','rdf-chan'); $news_type = array('rdf','fm','lt','sf','rdf-chan');
@ -55,7 +55,7 @@
</tr> </tr>
<tr> <tr>
<td colspan=2> <td colspan=2>
<input type="submit" name="submit" value="<?php echo lang_common("submit"); ?>"> <input type="submit" name="submit" value="<?php echo lang("submit"); ?>">
</td> </td>
</tr> </tr>
</table> </table>
@ -66,22 +66,22 @@
} else { } else {
if (! $n_display) if (! $n_display)
$error = "<br>" . lang_admin("You must enter a display"); $error = "<br>" . lang("You must enter a display");
if (! $n_base_url) if (! $n_base_url)
$error = "<br>" . lang_admin("You must enter a base url"); $error = "<br>" . lang("You must enter a base url");
if (! $n_newsfile) if (! $n_newsfile)
$error = "<br>" . lang_admin("You must enter a news url"); $error = "<br>" . lang("You must enter a news url");
if (! $n_cachetime) if (! $n_cachetime)
$error = "<br>" . lang_admin("You must enter the number of minutes between reload"); $error = "<br>" . lang("You must enter the number of minutes between reload");
if (! $n_listings) if (! $n_listings)
$error = "<br>" . lang_admin("You must enter the number of listings display"); $error = "<br>" . lang("You must enter the number of listings display");
if (! $n_newstype) if (! $n_newstype)
$error = "<br>" . lang_admin("You must select a file type"); $error = "<br>" . lang("You must select a file type");
if ($error) if ($error)
exit; exit;
@ -92,7 +92,7 @@
$phpgw->db->next_record(); $phpgw->db->next_record();
if ($phpgw->db->f("display")) { if ($phpgw->db->f("display")) {
navigation_bar(); navigation_bar();
echo "<center>" . lang_admin("That site has already been entered") . "</center>"; echo "<center>" . lang("That site has already been entered") . "</center>";
exit; exit;
} }

2
admin/nntp.php
View File

@ -101,7 +101,7 @@
. "<input type=\"hidden\" name=\"query_result\" value=\"".$query_result."\">\n"; . "<input type=\"hidden\" name=\"query_result\" value=\"".$query_result."\">\n";
$t->set_var("search_value",$query); $t->set_var("search_value",$query);
$t->set_var("search",lang_common("search")); $t->set_var("search",lang("search"));
$t->set_var("next",lang_nntp("next")); $t->set_var("next",lang_nntp("next"));
$t->set_var("nml",$phpgw->nextmatchs->left($urlname,$start,$tg, $t->set_var("nml",$phpgw->nextmatchs->left($urlname,$start,$tg,

16
admin/viewaccount.php
View File

@ -34,28 +34,28 @@
</tr> </tr>
<tr bgcolor="<?php echo $phpgw_info["theme"]["row_on"]; ?>"> <tr bgcolor="<?php echo $phpgw_info["theme"]["row_on"]; ?>">
<td width="40%"><?php echo lang_admin("LoginID"); ?></td> <td width="40%"><?php echo lang("LoginID"); ?></td>
<td width="60%"><?php echo $phpgw->db->f("loginid"); ?></td> <td width="60%"><?php echo $phpgw->db->f("loginid"); ?></td>
</tr> </tr>
<tr bgcolor="<?php echo $phpgw_info["theme"]["row_off"]; ?>"> <tr bgcolor="<?php echo $phpgw_info["theme"]["row_off"]; ?>">
<td width="40%"><?php echo lang_common("First Name"); ?></td> <td width="40%"><?php echo lang("First Name"); ?></td>
<td width="60%"><?php echo $phpgw->db->f("firstname"); ?></td> <td width="60%"><?php echo $phpgw->db->f("firstname"); ?></td>
</tr> </tr>
<tr bgcolor="<?php echo $phpgw_info["theme"]["row_on"]; ?>"> <tr bgcolor="<?php echo $phpgw_info["theme"]["row_on"]; ?>">
<td width="40%"><?php echo lang_common("Last Name"); ?></td> <td width="40%"><?php echo lang("Last Name"); ?></td>
<td width="60%"><?php echo $phpgw->db->f("lastname"); ?></td> <td width="60%"><?php echo $phpgw->db->f("lastname"); ?></td>
</tr> </tr>
<tr bgcolor="<?php echo $phpgw_info["theme"]["row_off"]; ?>"> <tr bgcolor="<?php echo $phpgw_info["theme"]["row_off"]; ?>">
<td width="40%"><?php echo lang_admin("permissions"); ?></td> <td width="40%"><?php echo lang("permissions"); ?></td>
<?php <?php
$i = 0; $i = 0;
while ($permission = each($db_perms)) { while ($permission = each($db_perms)) {
if ($phpgw_info["apps"][$permission[0]]["enabled"]) { if ($phpgw_info["apps"][$permission[0]]["enabled"]) {
$perm_display[$i] = lang_common($phpgw_info["apps"][$permission[0]]["title"]); $perm_display[$i] = lang($phpgw_info["apps"][$permission[0]]["title"]);
$i++; $i++;
} }
} }
@ -63,11 +63,11 @@
echo "<td>" . implode(", ", $perm_display) . "</td></tr>"; echo "<td>" . implode(", ", $perm_display) . "</td></tr>";
echo "<tr bgcolor=\"" . $phpgw_info["theme"]["row_on"] . "\"><td>" echo "<tr bgcolor=\"" . $phpgw_info["theme"]["row_on"] . "\"><td>"
. lang_admin("account active") . "</td> <td>"; . lang("account active") . "</td> <td>";
if ($phpgw->db->f("status") == "A") if ($phpgw->db->f("status") == "A")
echo lang_common("yes"); echo lang("yes");
else else
echo "<b>" . lang_common("no") . "</b>"; echo "<b>" . lang("no") . "</b>";
?></td></tr> ?></td></tr>
<tr bgcolor="<?php echo $phpgw_info["theme"]["row_off"]; ?>"> <tr bgcolor="<?php echo $phpgw_info["theme"]["row_off"]; ?>">

14
admin/viewheadline.php
View File

@ -24,13 +24,13 @@
?> ?>
<center> <center>
<table border=0 width=65%> <table border=0 width=65%>
<tr><td><?php echo lang_admin("Display"); ?></td> <td><?php echo $phpgw->db->f("display"); ?></td></tr> <tr><td><?php echo lang("Display"); ?></td> <td><?php echo $phpgw->db->f("display"); ?></td></tr>
<tr><td><?php echo lang_admin("Base Url"); ?></td> <td><?php echo $phpgw->db->f("base_url"); ?></td></tr> <tr><td><?php echo lang("Base Url"); ?></td> <td><?php echo $phpgw->db->f("base_url"); ?></td></tr>
<tr><td><?php echo lang_admin("News File"); ?></td> <td><?php echo $phpgw->db->f("newsfile"); ?></td></tr> <tr><td><?php echo lang("News File"); ?></td> <td><?php echo $phpgw->db->f("newsfile"); ?></td></tr>
<tr><td><?php echo lang_admin("Last Time Read"); ?></td> <td><?php echo $phpgw->common->show_date($phpgw->db->f("lastread")); ?></td></tr> <tr><td><?php echo lang("Last Time Read"); ?></td> <td><?php echo $phpgw->common->show_date($phpgw->db->f("lastread")); ?></td></tr>
<tr><td><?php echo lang_admin("minutes between reloads"); ?></td> <td><?php echo $phpgw->db->f("cachetime"); ?></td></tr> <tr><td><?php echo lang("minutes between reloads"); ?></td> <td><?php echo $phpgw->db->f("cachetime"); ?></td></tr>
<tr><td><?php echo lang_admin("Listings Displayed"); ?></td> <td><?php echo $phpgw->db->f("listings"); ?></td></tr> <tr><td><?php echo lang("Listings Displayed"); ?></td> <td><?php echo $phpgw->db->f("listings"); ?></td></tr>
<tr><td><?php echo lang_admin("News Type"); ?></td> <td><?php echo $phpgw->db->f("newstype"); ?></td></tr> <tr><td><?php echo lang("News Type"); ?></td> <td><?php echo $phpgw->db->f("newstype"); ?></td></tr>
<?php <?php
$phpgw->db->query("select title,link from news_headlines where site=$con"); $phpgw->db->query("select title,link from news_headlines where site=$con");

2
calendar/day.php
View File

@ -174,7 +174,7 @@ for ($i = $wkstart; date("Ymd", $i) <= date("Ymd", $monthend); $i += (24 * 3600
if ($thisyear) if ($thisyear)
echo "&year=$thisyear&month=$thismonth&day=$thisday"; echo "&year=$thisyear&month=$thismonth&day=$thisday";
?>&friendly=1" TARGET="cal_printer_friendly" onMouseOver="window.status = '<?php echo lang_calendar("Generate printer-friendly version") . "'\">[" . lang_calendar("Printer Friendly"); ?>]</A> ?>&friendly=1" TARGET="cal_printer_friendly" onMouseOver="window.status = '<?php echo lang("Generate printer-friendly version") . "'\">[" . lang("Printer Friendly"); ?>]</A>
<?php <?php
include($phpgw_info["server"]["api_dir"] . "/footer.inc.php"); include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");

90
calendar/edit_entry.php
View File

@ -93,13 +93,13 @@ if ($id > 0) {
// do a little form verifying // do a little form verifying
function validate_and_submit() { function validate_and_submit() {
if (document.addform.name.value == "") { if (document.addform.name.value == "") {
alert("<?php echo lang_calendar("You have not entered a\\nBrief Description"); ?>."); alert("<?php echo lang("You have not entered a\\nBrief Description"); ?>.");
return false; return false;
} }
h = parseInt(document.addform.hour.value); h = parseInt(document.addform.hour.value);
m = parseInt(document.addform.minute.value); m = parseInt(document.addform.minute.value);
if (h > 23 || m > 59) { if (h > 23 || m > 59) {
alert ("<?php echo lang_calendar("You have not entered a\\nvalid time of day."); ?>"); alert ("<?php echo lang("You have not entered a\\nvalid time of day."); ?>");
return false; return false;
} }
// would be nice to also check date to not allow Feb 31, etc... // would be nice to also check date to not allow Feb 31, etc...
@ -112,9 +112,9 @@ function validate_and_submit() {
<H2><FONT COLOR="<?php echo $H2COLOR;?>"><?php <H2><FONT COLOR="<?php echo $H2COLOR;?>"><?php
if ($id) if ($id)
echo lang_calendar("Calendar - Edit"); echo lang("Calendar - Edit");
else else
echo lang_calendar("Calendar - Add"); echo lang("Calendar - Add");
?></FONT></H2> ?></FONT></H2>
@ -127,14 +127,14 @@ function validate_and_submit() {
<TABLE BORDER=0> <TABLE BORDER=0>
<TR> <TR>
<TD><B><?php echo lang_calendar("Brief Description"); ?>:</B></TD> <TD><B><?php echo lang("Brief Description"); ?>:</B></TD>
<TD> <TD>
<INPUT NAME="name" SIZE=25 VALUE="<?php echo ($name); ?>"> <INPUT NAME="name" SIZE=25 VALUE="<?php echo ($name); ?>">
</TD> </TD>
</TR> </TR>
<TR> <TR>
<TD VALIGN="top"><B><?php echo lang_calendar("Full Description"); ?>:</B></TD> <TD VALIGN="top"><B><?php echo lang("Full Description"); ?>:</B></TD>
<TD> <TD>
<TEXTAREA NAME="description" ROWS=5 COLS=40 WRAP="virtual"><?php <TEXTAREA NAME="description" ROWS=5 COLS=40 WRAP="virtual"><?php
echo ($description); ?></TEXTAREA> echo ($description); ?></TEXTAREA>
@ -142,7 +142,7 @@ function validate_and_submit() {
</TR> </TR>
<TR> <TR>
<TD><B><?php echo lang_common("Date"); ?>:</B></TD> <TD><B><?php echo lang("Date"); ?>:</B></TD>
<TD> <TD>
<?php <?php
$day_html = "<SELECT NAME=\"day\">"; $day_html = "<SELECT NAME=\"day\">";
@ -159,7 +159,7 @@ function validate_and_submit() {
if ($year == 0) if ($year == 0)
$year = date("Y"); $year = date("Y");
for ($i = 1; $i <= 12; $i++) { for ($i = 1; $i <= 12; $i++) {
$m = lang_common(date("F", mktime(0,0,0,$i,1,$year))); $m = lang(date("F", mktime(0,0,0,$i,1,$year)));
$month_html .= "<OPTION VALUE=\"$i\"" . ($i == $month ? " SELECTED" : "") . ">$m" $month_html .= "<OPTION VALUE=\"$i\"" . ($i == $month ? " SELECTED" : "") . ">$m"
. "</option>\n"; . "</option>\n";
} }
@ -180,7 +180,7 @@ function validate_and_submit() {
</TR> </TR>
<TR> <TR>
<TD><B><?php echo lang_common("Time"); ?>:</B></TD> <TD><B><?php echo lang("Time"); ?>:</B></TD>
<?php <?php
$h12 = $hour; $h12 = $hour;
$amsel = "CHECKED"; $pmsel = ""; $amsel = "CHECKED"; $pmsel = "";
@ -209,37 +209,37 @@ function validate_and_submit() {
</TD></TR> </TD></TR>
<TR> <TR>
<TD><B><?php echo lang_calendar("Duration"); ?>:</B></TD> <TD><B><?php echo lang("Duration"); ?>:</B></TD>
<TD><INPUT NAME="duration" SIZE=3 VALUE="<?php <TD><INPUT NAME="duration" SIZE=3 VALUE="<?php
echo $duration;?>"> <?php echo lang_calendar("minutes"); ?></TD> echo $duration;?>"> <?php echo lang("minutes"); ?></TD>
</TR> </TR>
<TR> <TR>
<TD><B><?php echo lang_common("Priority"); ?>:</B></TD> <TD><B><?php echo lang("Priority"); ?>:</B></TD>
<TD><SELECT NAME="priority"> <TD><SELECT NAME="priority">
<OPTION VALUE="1"<?php if ($priority == 1) echo " SELECTED";?>><?php echo lang_common("Low"); ?> </option> <OPTION VALUE="1"<?php if ($priority == 1) echo " SELECTED";?>><?php echo lang("Low"); ?> </option>
<OPTION VALUE="2"<?php if ($priority == 2 || $priority == 0 ) echo " SELECTED";?>><?php echo lang_common("Medium"); ?></option> <OPTION VALUE="2"<?php if ($priority == 2 || $priority == 0 ) echo " SELECTED";?>><?php echo lang("Medium"); ?></option>
<OPTION VALUE="3"<?php if ($priority == 3) echo " SELECTED";?>><?php echo lang_common("High"); ?></option> <OPTION VALUE="3"<?php if ($priority == 3) echo " SELECTED";?>><?php echo lang("High"); ?></option>
</SELECT></TD> </SELECT></TD>
</TR> </TR>
<TR> <TR>
<TD><B><?php echo lang_common("Access"); ?>:</B></TD> <TD><B><?php echo lang("Access"); ?>:</B></TD>
<TD><SELECT NAME="access"> <TD><SELECT NAME="access">
<OPTION VALUE="private"<?php <OPTION VALUE="private"<?php
if ($access == "private" || ! $id) echo " SELECTED";?>><?php echo lang_common("Private"); ?></option> if ($access == "private" || ! $id) echo " SELECTED";?>><?php echo lang("Private"); ?></option>
<OPTION VALUE="group"<?php <OPTION VALUE="group"<?php
if ($access == "public" || strlen($access)) echo " SELECTED";?>><?php echo lang_common("Group Public"); ?></option> if ($access == "public" || strlen($access)) echo " SELECTED";?>><?php echo lang("Group Public"); ?></option>
<OPTION VALUE="public"<?php <OPTION VALUE="public"<?php
if ($access == "public") echo " SELECTED"; ?>><?php echo lang_common("Global Public"); ?></option> if ($access == "public") echo " SELECTED"; ?>><?php echo lang("Global Public"); ?></option>
</SELECT> </SELECT>
</TD> </TD>
</tr> </tr>
<tr> <tr>
<TD><B><?php echo lang_common("group access"); ?>:</B></TD> <TD><B><?php echo lang("group access"); ?>:</B></TD>
<TD><SELECT NAME="n_groups[]" multiple size="5"> <TD><SELECT NAME="n_groups[]" multiple size="5">
<?php <?php
if ($id > 0) { if ($id > 0) {
@ -274,7 +274,7 @@ function validate_and_submit() {
else else
$size = $phpgw->db->num_rows(); $size = $phpgw->db->num_rows();
echo "<TR><TD VALIGN=\"top\"><B>" . lang_calendar("Participants") . ":</B></TD>" echo "<TR><TD VALIGN=\"top\"><B>" . lang("Participants") . ":</B></TD>"
. "<TD>\n<SELECT NAME=\"participants[]\" multiple size=\"$size\">\n"; . "<TD>\n<SELECT NAME=\"participants[]\" multiple size=\"$size\">\n";
while ($phpgw->db->next_record()) { while ($phpgw->db->next_record()) {
@ -298,33 +298,33 @@ function validate_and_submit() {
?> ?>
<tr> <tr>
<td><b><?php echo lang_calendar("Repeat type"); ?>:</b></td> <td><b><?php echo lang("Repeat type"); ?>:</b></td>
<td><select name="rpt_type"> <td><select name="rpt_type">
<?php <?php
echo "<option value=\"none\"" . (strcmp($rpt_type,'none')==0?"selected":"") . ">" echo "<option value=\"none\"" . (strcmp($rpt_type,'none')==0?"selected":"") . ">"
. lang_calendar("None") . "</option>"; . lang("None") . "</option>";
echo "<option value=\"daily\"" . (strcmp($rpt_type,'daily')==0?"selected":"") . ">" echo "<option value=\"daily\"" . (strcmp($rpt_type,'daily')==0?"selected":"") . ">"
. lang_calendar("Daily") . "</option>"; . lang("Daily") . "</option>";
echo "<option value=\"weekly\"" . (strcmp($rpt_type,'weekly')==0?"selected":"") . ">" echo "<option value=\"weekly\"" . (strcmp($rpt_type,'weekly')==0?"selected":"") . ">"
. lang_calendar("Weekly") . "</option>"; . lang("Weekly") . "</option>";
echo "<option value=\"monthlyByDay\"".(strcmp($rpt_type,'monthlyByDay')==0?"selected":"") echo "<option value=\"monthlyByDay\"".(strcmp($rpt_type,'monthlyByDay')==0?"selected":"")
. ">" . lang_calendar("Monthly (by day)") . "</option>"; . ">" . lang("Monthly (by day)") . "</option>";
echo "<option value=\"monthlyByDate\"".(strcmp($rpt_type,'monthlyByDate')==0?"checked":"") echo "<option value=\"monthlyByDate\"".(strcmp($rpt_type,'monthlyByDate')==0?"checked":"")
. "> " . lang_calendar("Monthly (by date)") . "</option>"; . "> " . lang("Monthly (by date)") . "</option>";
echo "<option value=\"yearly\"" . (strcmp($rpt_type,'yearly')==0?"checked":"") . ">" echo "<option value=\"yearly\"" . (strcmp($rpt_type,'yearly')==0?"checked":"") . ">"
. lang_calendar("Yearly") . "</option>"; . lang("Yearly") . "</option>";
?> ?>
</select> </select>
</td> </td>
<tr> <tr>
<td><b><?php echo lang_calendar("Repeat End date"); ?>:</b></td> <td><b><?php echo lang("Repeat End date"); ?>:</b></td>
<td><input type=checkbox name=rpt_end_use value=y <?php <td><input type=checkbox name=rpt_end_use value=y <?php
echo ($rpt_end?"checked":""); ?>> <?php echo lang_calendar("Use End date"); ?> echo ($rpt_end?"checked":""); ?>> <?php echo lang("Use End date"); ?>
<?php <?php
if ($rpt_end) { if ($rpt_end) {
@ -346,7 +346,7 @@ function validate_and_submit() {
$month_html = "<select name=\"rpt_month\">"; $month_html = "<select name=\"rpt_month\">";
for ($i = 1; $i <= 12; $i++) { for ($i = 1; $i <= 12; $i++) {
$m = lang_common(date("F", mktime(0,0,0,$i,1,$rpt_year))); $m = lang(date("F", mktime(0,0,0,$i,1,$rpt_year)));
$month_html .= "<OPTION VALUE=\"$i\"" . ($i == $rpt_month ? " SELECTED" : "") $month_html .= "<OPTION VALUE=\"$i\"" . ($i == $rpt_month ? " SELECTED" : "")
. ">$m</option>\n"; . ">$m</option>\n";
} }
@ -366,27 +366,27 @@ function validate_and_submit() {
</td> </td>
</tr> </tr>
<tr> <tr>
<td><b><?php echo lang_calendar("Repeat day"); ?>: </b><?php echo lang_calendar("(for Weekly)"); ?></td> <td><b><?php echo lang("Repeat day"); ?>: </b><?php echo lang("(for Weekly)"); ?></td>
<td><?php <td><?php
echo "<input type=checkbox name=rpt_sun value=y " echo "<input type=checkbox name=rpt_sun value=y "
. ($rpt_sun?"checked":"") . "> " . lang_common("Sunday"); . ($rpt_sun?"checked":"") . "> " . lang("Sunday");
echo "<input type=checkbox name=rpt_mon value=y " echo "<input type=checkbox name=rpt_mon value=y "
. ($rpt_mon?"checked":"") . "> " . lang_common("Monday"); . ($rpt_mon?"checked":"") . "> " . lang("Monday");
echo "<input type=checkbox name=rpt_tue value=y " echo "<input type=checkbox name=rpt_tue value=y "
. ($rpt_tue?"checked":"") . "> " . lang_common("Tuesday"); . ($rpt_tue?"checked":"") . "> " . lang("Tuesday");
echo "<input type=checkbox name=rpt_wed value=y " echo "<input type=checkbox name=rpt_wed value=y "
. ($rpt_wed?"checked":"") . "> " . lang_common("Wednesday"); . ($rpt_wed?"checked":"") . "> " . lang("Wednesday");
echo "<input type=checkbox name=rpt_thu value=y " echo "<input type=checkbox name=rpt_thu value=y "
. ($rpt_thu?"checked":"") . "> " . lang_common("Thursday"); . ($rpt_thu?"checked":"") . "> " . lang("Thursday");
echo "<input type=checkbox name=rpt_fri value=y " echo "<input type=checkbox name=rpt_fri value=y "
. ($rpt_fri?"checked":"") . "> " . lang_common("Friday"); . ($rpt_fri?"checked":"") . "> " . lang("Friday");
echo "<input type=checkbox name=rpt_sat value=y " echo "<input type=checkbox name=rpt_sat value=y "
. ($rpt_sat?"checked":"") . "> " . lang_common("Saturday"); . ($rpt_sat?"checked":"") . "> " . lang("Saturday");
?></td> ?></td>
</tr> </tr>
<tr> <tr>
<td><b><?php echo lang_calendar("Frequency"); ?>: </b></td> <td><b><?php echo lang("Frequency"); ?>: </b></td>
<td> <td>
<input name="rpt_freq" size="4" maxlength="4" value="<?php <input name="rpt_freq" size="4" maxlength="4" value="<?php
echo $rpt_freq; ?>"> echo $rpt_freq; ?>">
@ -395,11 +395,11 @@ function validate_and_submit() {
</TABLE> </TABLE>
<SCRIPT LANGUAGE="JavaScript"> <SCRIPT LANGUAGE="JavaScript">
document.writeln ( '<INPUT TYPE="button" VALUE="<?php echo lang_common("Submit"); ?>" ONCLICK="validate_and_submit()">' ); document.writeln ( '<INPUT TYPE="button" VALUE="<?php echo lang("Submit"); ?>" ONCLICK="validate_and_submit()">' );
/* document.writeln ( '<INPUT TYPE="button" VALUE="<?php echo lang_common("Help"); ?>" ONCLICK="window.open ( \'help_edit_entry.php\', \'cal_help\', \'dependent,menubar,height=365,width=650,innerHeight=365,outerWidth=420,resizable=1\');">' ); */ /* document.writeln ( '<INPUT TYPE="button" VALUE="<?php echo lang("Help"); ?>" ONCLICK="window.open ( \'help_edit_entry.php\', \'cal_help\', \'dependent,menubar,height=365,width=650,innerHeight=365,outerWidth=420,resizable=1\');">' ); */
</SCRIPT> </SCRIPT>
<NOSCRIPT> <NOSCRIPT>
<INPUT TYPE="submit" VALUE="<?php echo lang_common("Submit"); ?>"> <INPUT TYPE="submit" VALUE="<?php echo lang("Submit"); ?>">
</NOSCRIPT> </NOSCRIPT>
<INPUT TYPE="hidden" NAME="participant_list" VALUE=""> <INPUT TYPE="hidden" NAME="participant_list" VALUE="">
@ -409,8 +409,8 @@ function validate_and_submit() {
<?php <?php
if ($id > 0) { if ($id > 0) {
echo "<A HREF=\"" . $phpgw->link("delete.php","id=$id") . "\" onClick=\"return confirm('" echo "<A HREF=\"" . $phpgw->link("delete.php","id=$id") . "\" onClick=\"return confirm('"
. lang_calendar("Are you sure\\nyou want to\\ndelete this entry ?") . "');\">" . lang("Are you sure\\nyou want to\\ndelete this entry ?") . "');\">"
. lang_common("Delete") . "</A><BR>"; . lang("Delete") . "</A><BR>";
} }
} // ***** This might be out of place. I was getting tons of parse errors } // ***** This might be out of place. I was getting tons of parse errors
// from if ($can_edit) { This needs to be rewritten, because if you do // from if ($can_edit) { This needs to be rewritten, because if you do

4
calendar/edit_entry_handler.php
View File

@ -110,7 +110,7 @@
} }
if ($overlap) if ($overlap)
$error = lang_calendar("The following conflicts with the suggested time:<ul>x</ul>", $error = lang("The following conflicts with the suggested time:<ul>x</ul>",
$overlap); $overlap);
if (! $error) { if (! $error) {
@ -221,7 +221,7 @@ $phpgw->common->header();
<H2><FONT COLOR="<?php echo $H2COLOR;?>">Scheduling Conflict</H2></FONT> <H2><FONT COLOR="<?php echo $H2COLOR;?>">Scheduling Conflict</H2></FONT>
<?php <?php
$time = sprintf("%d:%02d",$hour,$minute); $time = sprintf("%d:%02d",$hour,$minute);
echo lang_calendar("Your suggested time of <B> x - x </B> conflicts with the following existing calendar entries:", display_time($time),display_time(add_duration($time,$duration))); ?> echo lang("Your suggested time of <B> x - x </B> conflicts with the following existing calendar entries:", display_time($time),display_time(add_duration($time,$duration))); ?>
?> ?>

18
calendar/inc/footer.inc.php
View File

@ -25,7 +25,7 @@
<FORM ACTION="<?php echo $phpgw->link("index.php"); ?>" method="post" name="SelectMonth"> <FORM ACTION="<?php echo $phpgw->link("index.php"); ?>" method="post" name="SelectMonth">
<TR><TD VALIGN="top" WIDTH=33%><FONT SIZE="-1"> <TR><TD VALIGN="top" WIDTH=33%><FONT SIZE="-1">
<B><?php echo lang_calendar("Month"); ?>:</B> <B><?php echo lang("Month"); ?>:</B>
<SELECT NAME="date" ONCHANGE="document.SelectMonth.submit()"> <SELECT NAME="date" ONCHANGE="document.SelectMonth.submit()">
<?php <?php
@ -49,19 +49,19 @@
echo "<OPTION VALUE=\"" . date("Ymd", $d) . "\""; echo "<OPTION VALUE=\"" . date("Ymd", $d) . "\"";
if (date("Ymd", $d) == $thisdate) if (date("Ymd", $d) == $thisdate)
echo " SELECTED"; echo " SELECTED";
echo ">" . lang_common(date("F", $d)) . strftime(" %Y", $d) . "</option>\n"; echo ">" . lang(date("F", $d)) . strftime(" %Y", $d) . "</option>\n";
} }
?> ?>
</SELECT> </SELECT>
<NOSCRIPT><INPUT TYPE="submit" VALUE="<?php echo lang_calendar("Go!"); ?>"></NOSCRIPT> <NOSCRIPT><INPUT TYPE="submit" VALUE="<?php echo lang("Go!"); ?>"></NOSCRIPT>
</FONT></TD> </FONT></TD>
</FORM> </FORM>
<FORM ACTION="<?php echo $phpgw->link("week.php"); ?>" method="post" name="SelectWeek"> <FORM ACTION="<?php echo $phpgw->link("week.php"); ?>" method="post" name="SelectWeek">
<TD VALIGN="top" align="center" WIDTH=33%><FONT SIZE="-1"> <TD VALIGN="top" align="center" WIDTH=33%><FONT SIZE="-1">
<B><?php echo lang_calendar("Week"); ?>:</B> <B><?php echo lang("Week"); ?>:</B>
<SELECT NAME="date" ONCHANGE="document.SelectWeek.submit()"> <SELECT NAME="date" ONCHANGE="document.SelectWeek.submit()">
<?php <?php
@ -88,14 +88,14 @@
if (date("Ymd", $tsun) <= $thisdate && if (date("Ymd", $tsun) <= $thisdate &&
date("Ymd", $tsat) >= $thisdate) date("Ymd", $tsat) >= $thisdate)
echo " SELECTED"; echo " SELECTED";
echo ">" . lang_common(date("F",$tsun)) . strftime(" %d", $tsun) . "-" echo ">" . lang(date("F",$tsun)) . strftime(" %d", $tsun) . "-"
. lang_common(date("F",$tsat)) . strftime(" %d", $tsat); . lang(date("F",$tsat)) . strftime(" %d", $tsat);
echo "</option>\n"; echo "</option>\n";
} }
?> ?>
</SELECT> </SELECT>
<NOSCRIPT><INPUT TYPE="submit" VALUE="<?php echo lang_calendar("Go!"); ?>"></NOSCRIPT> <NOSCRIPT><INPUT TYPE="submit" VALUE="<?php echo lang("Go!"); ?>"></NOSCRIPT>
</FONT></TD> </FONT></TD>
</FORM> </FORM>
@ -104,7 +104,7 @@
<FORM ACTION="<?php echo $phpgw->link("year.php"); ?>" method="post" name="SelectYear"> <FORM ACTION="<?php echo $phpgw->link("year.php"); ?>" method="post" name="SelectYear">
<TD VALIGN="top" align="right" WIDTH=33%><FONT SIZE="-1"> <TD VALIGN="top" align="right" WIDTH=33%><FONT SIZE="-1">
<B><?php echo lang_calendar("Year"); ?>:</B> <B><?php echo lang("Year"); ?>:</B>
<SELECT NAME="year" ONCHANGE="document.SelectYear.submit()"> <SELECT NAME="year" ONCHANGE="document.SelectYear.submit()">
<?php <?php
@ -122,7 +122,7 @@
?> ?>
</SELECT> </SELECT>
<NOSCRIPT><INPUT TYPE="submit" VALUE="<?php echo lang_calendar("Go!"); ?>"></NOSCRIPT> <NOSCRIPT><INPUT TYPE="submit" VALUE="<?php echo lang("Go!"); ?>"></NOSCRIPT>
</FONT></TD> </FONT></TD>
</FORM> </FORM>

84
calendar/inc/functions.inc.php
View File

@ -25,18 +25,18 @@
$TODAYCELLBG = "#E0E0E0";// color of table cells of current day in month view $TODAYCELLBG = "#E0E0E0";// color of table cells of current day in month view
$month_names = array("01" => lang_common("January"), "07" => lang_common("July"), $month_names = array("01" => lang("January"), "07" => lang("July"),
"02" => lang_common("February"),"08" => lang_common("August"), "02" => lang("February"),"08" => lang("August"),
"03" => lang_common("March"), "09" => lang_common("September"), "03" => lang("March"), "09" => lang("September"),
"04" => lang_common("April"), "10" => lang_common("October"), "04" => lang("April"), "10" => lang("October"),
"05" => lang_common("May"), "11" => lang_common("November"), "05" => lang("May"), "11" => lang("November"),
"06" => lang_common("June"), "12" => lang_common("December") "06" => lang("June"), "12" => lang("December")
); );
$weekday_names = array( "0" => lang_common("Sunday"), "1" => lang_common("Monday"), $weekday_names = array( "0" => lang("Sunday"), "1" => lang("Monday"),
"2" => lang_common("Tuesday"), "3" => lang_common("Wednesday"), "2" => lang("Tuesday"), "3" => lang("Wednesday"),
"4" => lang_common("Thursday"),"5" => lang_common("Friday"), "4" => lang("Thursday"),"5" => lang("Friday"),
"6" => lang_common("Saturday") "6" => lang("Saturday")
); );
@ -60,19 +60,19 @@
} }
if ($showyear) { if ($showyear) {
echo lang_common(date("F",$monthstart)) . " $thisyear" . "</a></font></td></tr>"; echo lang(date("F",$monthstart)) . " $thisyear" . "</a></font></td></tr>";
} else { } else {
echo lang_common(date("F",$monthstart)) . "</A></FONT></TD></TR>"; echo lang(date("F",$monthstart)) . "</A></FONT></TD></TR>";
} }
echo "<tr>" echo "<tr>"
. "<td>" . lang_calendar("Su") . "</td>" . "<td>" . lang("Su") . "</td>"
. "<td>" . lang_calendar("Mo") . "</td>" . "<td>" . lang("Mo") . "</td>"
. "<td>" . lang_calendar("Tu") . "</td>" . "<td>" . lang("Tu") . "</td>"
. "<td>" . lang_calendar("We") . "</td>" . "<td>" . lang("We") . "</td>"
. "<td>" . lang_calendar("Th") . "</td>" . "<td>" . lang("Th") . "</td>"
. "<td>" . lang_calendar("Fr") . "</td>" . "<td>" . lang("Fr") . "</td>"
. "<td>" . lang_calendar("Sa") . "</td>" . "<td>" . lang("Sa") . "</td>"
. "</tr>"; . "</tr>";
for ($i = $sun; date("Ymd",$i) <= date ("Ymd",$monthend); for ($i = $sun; date("Ymd",$i) <= date ("Ymd",$monthend);
@ -101,32 +101,32 @@
function weekday_short_name($w) { function weekday_short_name($w) {
switch($w) switch($w)
{ {
case 0: return lang_calendar("Sun"); case 0: return lang("Sun");
case 1: return lang_calendar("Mon"); case 1: return lang("Mon");
case 2: return lang_calendar("Tue"); case 2: return lang("Tue");
case 3: return lang_calendar("Wed"); case 3: return lang("Wed");
case 4: return lang_calendar("Thu"); case 4: return lang("Thu");
case 5: return lang_calendar("Fri"); case 5: return lang("Fri");
case 6: return lang_calendar("Sat"); case 6: return lang("Sat");
case 7: return lang_calendar("Jul"); case 7: return lang("Jul");
} }
return "unknown-weekday($w)"; return "unknown-weekday($w)";
} }
function month_name ( $m ) { function month_name ( $m ) {
switch ( $m ) { switch ( $m ) {
case 0: return lang_calendar("January"); case 0: return lang("January");
case 1: return lang_calendar("February"); case 1: return lang("February");
case 2: return lang_calendar("March"); case 2: return lang("March");
case 3: return lang_calendar("April"); case 3: return lang("April");
case 4: return lang_calendar("May"); case 4: return lang("May");
case 5: return lang_calendar("June"); case 5: return lang("June");
case 6: return lang_calendar("July"); case 6: return lang("July");
case 7: return lang_calendar("August"); case 7: return lang("August");
case 8: return lang_calendar("September"); case 8: return lang("September");
case 9: return lang_calendar("October"); case 9: return lang("October");
case 10: return lang_calendar("November"); case 10: return lang("November");
case 11: return lang_calendar("December"); case 11: return lang("December");
} }
return "unknown-month($m)"; return "unknown-month($m)";
} }
@ -439,7 +439,7 @@ function month_name ( $m ) {
."&day=".date("d",$date)) ."&day=".date("d",$date))
. "\">" . "\">"
. "<IMG SRC=\"".$phpgw_info["server"]["app_images"]."/new.gif\" WIDTH=10 HEIGHT=10 ALT=\"" . "<IMG SRC=\"".$phpgw_info["server"]["app_images"]."/new.gif\" WIDTH=10 HEIGHT=10 ALT=\""
. lang_calendar("New Entry") . "\" BORDER=0 ALIGN=right></A>"; . lang("New Entry") . "\" BORDER=0 ALIGN=right></A>";
echo "[ " . "<a href=\"".$phpgw->link("day.php","month=".date("m",$date) echo "[ " . "<a href=\"".$phpgw->link("day.php","month=".date("m",$date)
."&day=".date("d",$date)."&year=".date("Y",$date)) ."&day=".date("d",$date)."&year=".date("Y",$date))
. "\">" . date("d", $date) . "</a> ]<BR>\n"; . "\">" . date("d", $date) . "</a> ]<BR>\n";
@ -487,7 +487,7 @@ function month_name ( $m ) {
if (! $hide_icons) { if (! $hide_icons) {
echo "<A HREF=\"".$phpgw->link("view.php","id=".$phpgw->db->f(0)) echo "<A HREF=\"".$phpgw->link("view.php","id=".$phpgw->db->f(0))
. "\" onMouseOver=\"window.status='" . "\" onMouseOver=\"window.status='"
. lang_calendar("View this entry") . "'; return true;\"><IMG SRC=\"".$phpgw_info["server"]["app_images"]."/" . lang("View this entry") . "'; return true;\"><IMG SRC=\"".$phpgw_info["server"]["app_images"]."/"
. "circle.gif\" WIDTH=5 HEIGHT=7 ALT=\"" . $phpgw->db->f("cal_description") . "circle.gif\" WIDTH=5 HEIGHT=7 ALT=\"" . $phpgw->db->f("cal_description")
. "\" BORDER=0></A>"; . "\" BORDER=0></A>";
} }
@ -575,7 +575,7 @@ function month_name ( $m ) {
$class = "entry"; $class = "entry";
if (! $hide_icons) { if (! $hide_icons) {
$hour_arr[$ind] .= "<A HREF=\"".$phpgw->link("view.php","id=$id"); $hour_arr[$ind] .= "<A HREF=\"".$phpgw->link("view.php","id=$id");
$hour_arr[$ind] .= "\" onMouseOver=\"window.status='" . lang_calendar("View this entry") $hour_arr[$ind] .= "\" onMouseOver=\"window.status='" . lang("View this entry")
. "'; return true;\">"; . "'; return true;\">";
} }

8
calendar/inc/header.inc.php
View File

@ -5,17 +5,17 @@
</td> </td>
<td width="2%"> <td width="2%">
<a href="<?php echo $phpgw->link("day.php","year=".$phpgw->common->show_date(time(),"Y")."&month=".$phpgw->common->show_date(time(),"m")."&day=".$phpgw->common->show_date(time(),"d")); ?>"> <a href="<?php echo $phpgw->link("day.php","year=".$phpgw->common->show_date(time(),"Y")."&month=".$phpgw->common->show_date(time(),"m")."&day=".$phpgw->common->show_date(time(),"d")); ?>">
<img src="<?php echo $phpgw_info["server"]["app_images"]; ?>/today.gif" alt="<?php echo lang_calendar("Today"); ?>" border="0"> <img src="<?php echo $phpgw_info["server"]["app_images"]; ?>/today.gif" alt="<?php echo lang("Today"); ?>" border="0">
</a> </a>
</td> </td>
<td width="2%" align="left"> <td width="2%" align="left">
<a href="<?php echo $phpgw->link("week.php","date=".$phpgw->common->show_date(time(),"Ymd")); ?>"> <a href="<?php echo $phpgw->link("week.php","date=".$phpgw->common->show_date(time(),"Ymd")); ?>">
<img src="<?php echo $phpgw_info["server"]["app_images"]; ?>/week.gif" alt="<?php echo lang_calendar("This week"); ?>" border="0"> <img src="<?php echo $phpgw_info["server"]["app_images"]; ?>/week.gif" alt="<?php echo lang("This week"); ?>" border="0">
</a> </a>
</td> </td>
<td width="2%" align="left"> <td width="2%" align="left">
<a href="<?php echo $phpgw->link("index.php","date=".$phpgw->common->show_date(time(),"Ymd")); ?>"> <a href="<?php echo $phpgw->link("index.php","date=".$phpgw->common->show_date(time(),"Ymd")); ?>">
<img src="<?php echo $phpgw_info["server"]["app_images"]; ?>/month.gif" alt="<?php echo lang_calendar("This month"); ?>" border="0"> <img src="<?php echo $phpgw_info["server"]["app_images"]; ?>/month.gif" alt="<?php echo lang("This month"); ?>" border="0">
</a> </a>
</td> </td>
<td align="right"> <td align="right">
@ -26,7 +26,7 @@
<input type="hidden" name="day" value="<?php echo $thisday; ?>"> <input type="hidden" name="day" value="<?php echo $thisday; ?>">
<input type="hidden" name="year" value="<?php echo $thisyear; ?>"> <input type="hidden" name="year" value="<?php echo $thisyear; ?>">
<input name="keywords"> <input name="keywords">
<input type="submit" name="submit" value="<?php echo lang_common("Search"); ?>"> <input type="submit" name="submit" value="<?php echo lang("Search"); ?>">
</form> </form>
</td> </td>
</tr> </tr>

20
calendar/index.php
View File

@ -78,7 +78,7 @@
<TD ALIGN="middle"><FONT SIZE="+2" COLOR="<?php echo $H2COLOR;?>"><B> <TD ALIGN="middle"><FONT SIZE="+2" COLOR="<?php echo $H2COLOR;?>"><B>
<?php <?php
$m = mktime(2,0,0,$thismonth,1,$thisyear); $m = mktime(2,0,0,$thismonth,1,$thisyear);
print lang_common(strftime("%B",$m)) . " " . $thisyear; print lang(strftime("%B",$m)) . " " . $thisyear;
?> ?>
</B></FONT> </B></FONT>
<FONT COLOR="<?php echo $H2COLOR;?>" SIZE="+1"> <FONT COLOR="<?php echo $H2COLOR;?>" SIZE="+1">
@ -99,13 +99,13 @@
<TABLE WIDTH=100% BORDER=0 bordercolor=FFFFFF cellspacing=2 cellpadding=2> <TABLE WIDTH=100% BORDER=0 bordercolor=FFFFFF cellspacing=2 cellpadding=2>
<TR> <TR>
<TH WIDTH=14% BGCOLOR="<?php echo $phpgw_info["theme"]["th_bg"]; ?>"><FONT COLOR="<?php echo $phpgw_info["theme"]["th_text"]; ?>"><?php echo lang_calendar("Sun"); ?></FONT></TH> <TH WIDTH=14% BGCOLOR="<?php echo $phpgw_info["theme"]["th_bg"]; ?>"><FONT COLOR="<?php echo $phpgw_info["theme"]["th_text"]; ?>"><?php echo lang("Sun"); ?></FONT></TH>
<TH WIDTH=14% BGCOLOR="<?php echo $phpgw_info["theme"]["th_bg"]; ?>"><FONT COLOR="<?php echo $phpgw_info["theme"]["th_text"]; ?>"><?php echo lang_calendar("Mon"); ?></FONT></TH> <TH WIDTH=14% BGCOLOR="<?php echo $phpgw_info["theme"]["th_bg"]; ?>"><FONT COLOR="<?php echo $phpgw_info["theme"]["th_text"]; ?>"><?php echo lang("Mon"); ?></FONT></TH>
<TH WIDTH=14% BGCOLOR="<?php echo $phpgw_info["theme"]["th_bg"]; ?>"><FONT COLOR="<?php echo $phpgw_info["theme"]["th_text"]; ?>"><?php echo lang_calendar("Tue"); ?></FONT></TH> <TH WIDTH=14% BGCOLOR="<?php echo $phpgw_info["theme"]["th_bg"]; ?>"><FONT COLOR="<?php echo $phpgw_info["theme"]["th_text"]; ?>"><?php echo lang("Tue"); ?></FONT></TH>
<TH WIDTH=14% BGCOLOR="<?php echo $phpgw_info["theme"]["th_bg"]; ?>"><FONT COLOR="<?php echo $phpgw_info["theme"]["th_text"]; ?>"><?php echo lang_calendar("Wed"); ?></FONT></TH> <TH WIDTH=14% BGCOLOR="<?php echo $phpgw_info["theme"]["th_bg"]; ?>"><FONT COLOR="<?php echo $phpgw_info["theme"]["th_text"]; ?>"><?php echo lang("Wed"); ?></FONT></TH>
<TH WIDTH=14% BGCOLOR="<?php echo $phpgw_info["theme"]["th_bg"]; ?>"><FONT COLOR="<?php echo $phpgw_info["theme"]["th_text"]; ?>"><?php echo lang_calendar("Thu"); ?></FONT></TH> <TH WIDTH=14% BGCOLOR="<?php echo $phpgw_info["theme"]["th_bg"]; ?>"><FONT COLOR="<?php echo $phpgw_info["theme"]["th_text"]; ?>"><?php echo lang("Thu"); ?></FONT></TH>
<TH WIDTH=14% BGCOLOR="<?php echo $phpgw_info["theme"]["th_bg"]; ?>"><FONT COLOR="<?php echo $phpgw_info["theme"]["th_text"]; ?>"><?php echo lang_calendar("Fri"); ?></FONT></TH> <TH WIDTH=14% BGCOLOR="<?php echo $phpgw_info["theme"]["th_bg"]; ?>"><FONT COLOR="<?php echo $phpgw_info["theme"]["th_text"]; ?>"><?php echo lang("Fri"); ?></FONT></TH>
<TH WIDTH=14% BGCOLOR="<?php echo $phpgw_info["theme"]["th_bg"]; ?>"><FONT COLOR="<?php echo $phpgw_info["theme"]["th_text"]; ?>"><?php echo lang_calendar("Sat"); ?></FONT></TH> <TH WIDTH=14% BGCOLOR="<?php echo $phpgw_info["theme"]["th_bg"]; ?>"><FONT COLOR="<?php echo $phpgw_info["theme"]["th_text"]; ?>"><?php echo lang("Sat"); ?></FONT></TH>
</TR> </TR>
<?php <?php
@ -163,8 +163,8 @@
$param .= "year=$thisyear&month=$thismonth&"; $param .= "year=$thisyear&month=$thismonth&";
$param .= "friendly=1\" TARGET=\"cal_printer_friendly\" onMouseOver=\"window." $param .= "friendly=1\" TARGET=\"cal_printer_friendly\" onMouseOver=\"window."
. "status = '" . lang_calendar("Generate printer-friendly version"). "'"; . "status = '" . lang("Generate printer-friendly version"). "'";
echo "<a href=\"".$phpgw->link($PHP_SELF,$param)."\">"; echo "<a href=\"".$phpgw->link($PHP_SELF,$param)."\">";
echo "[". lang_calendar("Printer Friendly") . "]</A>"; echo "[". lang("Printer Friendly") . "]</A>";
include($phpgw_info["server"]["api_dir"] . "/footer.inc.php"); include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
} }

10
calendar/search.php
View File

@ -27,20 +27,20 @@
$error = ""; $error = "";
if (strlen($keywords) == 0) if (strlen($keywords) == 0)
$error = lang_calendar("You must enter one or more search keywords."); $error = lang("You must enter one or more search keywords.");
$matches = 0; $matches = 0;
?> ?>
<H2><FONT COLOR="<?php echo $H2COLOR . "\">" . lang_calendar("Search Results"); ?></FONT></H2> <H2><FONT COLOR="<?php echo $H2COLOR . "\">" . lang("Search Results"); ?></FONT></H2>
<?php <?php
// There is currently a problem searching in with repeated events. // There is currently a problem searching in with repeated events.
// It spits back out the date it was entered. I would like to to say that // It spits back out the date it was entered. I would like to to say that
// it is a repeated event. // it is a repeated event.
if (strlen($error)) { if (strlen($error)) {
echo "<B>" . lang_common("Error") . ":</B> $error"; echo "<B>" . lang("Error") . ":</B> $error";
} else { } else {
$ids = array(); $ids = array();
$words = split(" ", $keywords); $words = split(" ", $keywords);
@ -70,9 +70,9 @@
if ($matches == 1) if ($matches == 1)
echo "<B>1 match found.</B><P>"; echo "<B>1 match found.</B><P>";
else if ($matches > 0) else if ($matches > 0)
echo "<B>" . lang_calendar("x matches found",$matches) . ".</B><P>"; echo "<B>" . lang("x matches found",$matches) . ".</B><P>";
else else
$error = lang_calendar("no matches found."); $error = lang("no matches found.");
// now sort by number of hits // now sort by number of hits
if (! strlen($error)) { if (! strlen($error)) {

52
calendar/view.php
View File

@ -28,14 +28,14 @@
if ($year) $thisyear = $year; if ($year) $thisyear = $year;
if ($month) $thismonth = $month; if ($month) $thismonth = $month;
$pri[1] = lang_common("Low"); $pri[1] = lang("Low");
$pri[2] = lang_common("Medium"); $pri[2] = lang("Medium");
$pri[3] = lang_common("High"); $pri[3] = lang("High");
$unapproved = FALSE; $unapproved = FALSE;
if ($id < 1) { if ($id < 1) {
echo lang_calendar("Invalid entry id."); echo lang("Invalid entry id.");
exit; exit;
} }
@ -76,14 +76,14 @@
// Some browser add a \n when its entered in the database. Not a big deal // Some browser add a \n when its entered in the database. Not a big deal
// this will be printed even though its not needed. // this will be printed even though its not needed.
if ($description) { if ($description) {
echo "<tr><td VALIGN=\"top\"><b>" . lang_calendar("Description") . ":</B></TD><td>" echo "<tr><td VALIGN=\"top\"><b>" . lang("Description") . ":</B></TD><td>"
. "$description</TD></TR>"; . "$description</TD></TR>";
} }
?> ?>
<tr> <tr>
<TD VALIGN="top"><b><?php echo lang_common("Date"); ?>:</B></TD> <TD VALIGN="top"><b><?php echo lang("Date"); ?>:</B></TD>
<td><?php echo date_to_str($phpgw->db->f(1)); ?></TD> <td><?php echo date_to_str($phpgw->db->f(1)); ?></TD>
</TR> </TR>
@ -97,30 +97,30 @@
if ($phpgw->db->f(2) > 0) { if ($phpgw->db->f(2) > 0) {
?> ?>
<tr> <tr>
<TD VALIGN="top"><b><?php echo lang_common("Time"); ?>:</B></TD> <TD VALIGN="top"><b><?php echo lang("Time"); ?>:</B></TD>
<td><?php echo display_time($phpgw->db->f(2)); ?></TD> <td><?php echo display_time($phpgw->db->f(2)); ?></TD>
</TR> </TR>
<?php <?php
} }
if ($phpgw->db->f(5) > 0) { if ($phpgw->db->f(5) > 0) {
echo "<tr><TD VALIGN=\"top\"><b>" . lang_calendar("Duration") . ":</B></TD><td>" echo "<tr><TD VALIGN=\"top\"><b>" . lang("Duration") . ":</B></TD><td>"
. $phpgw->db->f(5) . " " . lang_calendar("minutes") . "</TD></TR>"; . $phpgw->db->f(5) . " " . lang("minutes") . "</TD></TR>";
} }
?> ?>
<tr> <tr>
<TD VALIGN="top"><b><?php echo lang_common("Priority"); ?>:</B></TD> <TD VALIGN="top"><b><?php echo lang("Priority"); ?>:</B></TD>
<td><?php echo $pri[$phpgw->db->f(6)]; ?></TD> <td><?php echo $pri[$phpgw->db->f(6)]; ?></TD>
</TR> </TR>
<?php <?php
echo "<tr><TD VALIGN=\"top\"><b>" . lang_common("Created by") . ":</B></TD>\n"; echo "<tr><TD VALIGN=\"top\"><b>" . lang("Created by") . ":</B></TD>\n";
echo "<td>" . $phpgw_info["user"]["fullname"] . "</td></tr>\n"; echo "<td>" . $phpgw_info["user"]["fullname"] . "</td></tr>\n";
?> ?>
<tr> <tr>
<TD VALIGN="top"><b><?php echo lang_common("Updated"); ?>:</B></TD> <TD VALIGN="top"><b><?php echo lang("Updated"); ?>:</B></TD>
<td><?php echo date_to_str($phpgw->db->f(3)) . " " . display_time($phpgw->db->f(4)); <td><?php echo date_to_str($phpgw->db->f(3)) . " " . display_time($phpgw->db->f(4));
?></TD> ?></TD>
</TR> </TR>
@ -131,11 +131,11 @@
$cal_groups .= $cal_groups_temp[$i][1] . "<br>\n"; $cal_groups .= $cal_groups_temp[$i][1] . "<br>\n";
} }
if ($cal_groups) if ($cal_groups)
echo "<tr><td><b>" . lang_common("Groups") . ":</b></td><td>".$cal_groups."</td></tr>"; echo "<tr><td><b>" . lang("Groups") . ":</b></td><td>".$cal_groups."</td></tr>";
?> ?>
<tr> <tr>
<TD VALIGN="top"><b><?php echo lang_calendar("Participants"); ?>:</B></TD> <TD VALIGN="top"><b><?php echo lang("Participants"); ?>:</B></TD>
<td><?php <td><?php
$phpgw->db->query("SELECT webcal_entry_user.cal_login, accounts.lastname, " $phpgw->db->query("SELECT webcal_entry_user.cal_login, accounts.lastname, "
@ -159,33 +159,33 @@
</TD> </TD>
</TR> </TR>
<tr> <tr>
<TD VALIGN="top"><b><?php echo lang_calendar("Repetition"); ?>:</B></TD> <TD VALIGN="top"><b><?php echo lang("Repetition"); ?>:</B></TD>
<td> <td>
<?php <?php
$phpgw->db->query("SELECT * from webcal_entry_repeats WHERE cal_id=$id"); $phpgw->db->query("SELECT * from webcal_entry_repeats WHERE cal_id=$id");
$phpgw->db->next_record(); $phpgw->db->next_record();
if (substr($phpgw->db->f(5),0,1) == 'y') if (substr($phpgw->db->f(5),0,1) == 'y')
$t_repeat_days = lang_common("Sunday "); $t_repeat_days = lang("Sunday ");
if (substr($phpgw->db->f(5),1,1) == 'y') if (substr($phpgw->db->f(5),1,1) == 'y')
$t_repeat_days .= lang_common("Monday "); $t_repeat_days .= lang("Monday ");
if (substr($phpgw->db->f(5),2,1) == 'y') if (substr($phpgw->db->f(5),2,1) == 'y')
$t_repeat_days .= lang_common("Tuesday "); $t_repeat_days .= lang("Tuesday ");
if (substr($phpgw->db->f(5),3,1) == 'y') if (substr($phpgw->db->f(5),3,1) == 'y')
$t_repeat_days .= lang_common("Wednesday "); $t_repeat_days .= lang("Wednesday ");
if (substr($phpgw->db->f(5),4,1) == 'y') if (substr($phpgw->db->f(5),4,1) == 'y')
$t_repeat_days .= lang_common("Thursday "); $t_repeat_days .= lang("Thursday ");
if (substr($phpgw->db->f(5),5,1) == 'y') if (substr($phpgw->db->f(5),5,1) == 'y')
$t_repeat_days .= lang_common("Friday "); $t_repeat_days .= lang("Friday ");
if (substr($phpgw->db->f(5),6,1) == 'y') if (substr($phpgw->db->f(5),6,1) == 'y')
$t_repeat_days .= lang_common("Saturday "); $t_repeat_days .= lang("Saturday ");
echo $phpgw->db->f(2) . " ("; echo $phpgw->db->f(2) . " (";
if ($phpgw->db->f(3)) if ($phpgw->db->f(3))
echo "ends: " . $phpgw->db->f(3) . ", "; echo "ends: " . $phpgw->db->f(3) . ", ";
if ($phpgw->db->f(2) == 'weekly') if ($phpgw->db->f(2) == 'weekly')
echo lang_calendar("days repeated") . ": " . $t_repeat_days . ", "; echo lang("days repeated") . ": " . $t_repeat_days . ", ";
echo lang_calendar("frequency") . ": " . $phpgw->db->f(4) . ")"; echo lang("frequency") . ": " . $phpgw->db->f(4) . ")";
?> ?>
@ -196,8 +196,8 @@
<?php <?php
if ($phpgw_info["user"]["userid"] == $create_by) { if ($phpgw_info["user"]["userid"] == $create_by) {
echo "<A HREF=\"" . $phpgw->link("edit_entry.php","id=$id") . "\">" echo "<A HREF=\"" . $phpgw->link("edit_entry.php","id=$id") . "\">"
. lang_common("Edit") . "</A><BR>\n<A HREF=\"" . $phpgw->link("delete.php","id=$id") . "\" onClick=\"return confirm('" . lang("Edit") . "</A><BR>\n<A HREF=\"" . $phpgw->link("delete.php","id=$id") . "\" onClick=\"return confirm('"
. lang_calendar("Are you sure\\nyou want to\\ndelete this entry ?\\n\\nThis will delete\\nthis entry for all users.") . "');\">" . lang_common("Delete") . "</A><BR>\n"; . lang("Are you sure\\nyou want to\\ndelete this entry ?\\n\\nThis will delete\\nthis entry for all users.") . "');\">" . lang("Delete") . "</A><BR>\n";
} }
?> ?>

16
calendar/week.php
View File

@ -123,13 +123,13 @@
<TABLE WIDTH=100% BORDER=0 bordercolor=FFFFFF cellspacing=2 cellpadding=2> <TABLE WIDTH=100% BORDER=0 bordercolor=FFFFFF cellspacing=2 cellpadding=2>
<TR> <TR>
<TH WIDTH=14% BGCOLOR="<?php echo $phpgw_info["theme"]["th_bg"]; ?>"><FONT COLOR="#000000"><?php echo lang_calendar("Sun"); ?></FONT></TH> <TH WIDTH=14% BGCOLOR="<?php echo $phpgw_info["theme"]["th_bg"]; ?>"><FONT COLOR="#000000"><?php echo lang("Sun"); ?></FONT></TH>
<TH WIDTH=14% BGCOLOR="<?php echo $phpgw_info["theme"]["th_bg"]; ?>"><FONT COLOR="#000000"><?php echo lang_calendar("Mon"); ?></FONT></TH> <TH WIDTH=14% BGCOLOR="<?php echo $phpgw_info["theme"]["th_bg"]; ?>"><FONT COLOR="#000000"><?php echo lang("Mon"); ?></FONT></TH>
<TH WIDTH=14% BGCOLOR="<?php echo $phpgw_info["theme"]["th_bg"]; ?>"><FONT COLOR="#000000"><?php echo lang_calendar("Tue"); ?></FONT></TH> <TH WIDTH=14% BGCOLOR="<?php echo $phpgw_info["theme"]["th_bg"]; ?>"><FONT COLOR="#000000"><?php echo lang("Tue"); ?></FONT></TH>
<TH WIDTH=14% BGCOLOR="<?php echo $phpgw_info["theme"]["th_bg"]; ?>"><FONT COLOR="#000000"><?php echo lang_calendar("Wed"); ?></FONT></TH> <TH WIDTH=14% BGCOLOR="<?php echo $phpgw_info["theme"]["th_bg"]; ?>"><FONT COLOR="#000000"><?php echo lang("Wed"); ?></FONT></TH>
<TH WIDTH=14% BGCOLOR="<?php echo $phpgw_info["theme"]["th_bg"]; ?>"><FONT COLOR="#000000"><?php echo lang_calendar("Thu"); ?></FONT></TH> <TH WIDTH=14% BGCOLOR="<?php echo $phpgw_info["theme"]["th_bg"]; ?>"><FONT COLOR="#000000"><?php echo lang("Thu"); ?></FONT></TH>
<TH WIDTH=14% BGCOLOR="<?php echo $phpgw_info["theme"]["th_bg"]; ?>"><FONT COLOR="#000000"><?php echo lang_calendar("Fri"); ?></FONT></TH> <TH WIDTH=14% BGCOLOR="<?php echo $phpgw_info["theme"]["th_bg"]; ?>"><FONT COLOR="#000000"><?php echo lang("Fri"); ?></FONT></TH>
<TH WIDTH=14% BGCOLOR="<?php echo $phpgw_info["theme"]["th_bg"]; ?>"><FONT COLOR="#000000"><?php echo lang_calendar("Sat"); ?></FONT></TH> <TH WIDTH=14% BGCOLOR="<?php echo $phpgw_info["theme"]["th_bg"]; ?>"><FONT COLOR="#000000"><?php echo lang("Sat"); ?></FONT></TH>
</TR> </TR>
<TR> <TR>
@ -167,7 +167,7 @@
echo "<P>&nbsp;<A HREF=\"" . $phpgw->link("week.php","$yeartext&friendly=1"); echo "<P>&nbsp;<A HREF=\"" . $phpgw->link("week.php","$yeartext&friendly=1");
} }
?>" TARGET="cal_printer_friendly" ?>" TARGET="cal_printer_friendly"
onMouseOver="window.status = '<?php echo lang_calendar("Generate printer-friendly version"); ?>'">[<?php echo lang_calendar("Printer Friendly"); ?>]</A> onMouseOver="window.status = '<?php echo lang("Generate printer-friendly version"); ?>'">[<?php echo lang("Printer Friendly"); ?>]</A>
<?php <?php
include($phpgw_info["server"]["api_dir"] . "/footer.inc.php"); include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");

4
calendar/year.php
View File

@ -65,8 +65,8 @@
if (! $friendly) { if (! $friendly) {
echo "&nbsp;<A HREF=\"" . $phpgw->link("year.php","friendly=1&" echo "&nbsp;<A HREF=\"" . $phpgw->link("year.php","friendly=1&"
. "&year=$year") . "\"TARGET=\"cal_printer_friendly\" onMouseOver=\"window." . "&year=$year") . "\"TARGET=\"cal_printer_friendly\" onMouseOver=\"window."
. "status = '" . lang_calendar("Generate printer-friendly version") . "'\">[" . "status = '" . lang("Generate printer-friendly version") . "'\">["
. lang_calendar("Printer Friendly") . "]</A>"; . lang("Printer Friendly") . "]</A>";
} }
include($phpgw_info["server"]["api_dir"] . "/footer.inc.php"); include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");

2
doc/RELEASE-NOTES
View File

@ -2,3 +2,5 @@ This release requires you to resubmit all of your user accounts. The format of
has changed. has changed.
The inventory program has a new field called mstock. The inventory program has a new field called mstock.
There is a new translation support system, you need to add the lang table, which can be found at the end of the create_table script

7
doc/create_tables.mysql
View File

@ -184,3 +184,10 @@ CREATE TABLE users_newsgroups (
newsgroup int(11) NOT NULL newsgroup int(11) NOT NULL
); );
CREATE TABLE lang (
message_id varchar(150) DEFAULT '' NOT NULL,
app_name varchar(100) DEFAULT 'common' NOT NULL,
lang varchar(5) DEFAULT '' NOT NULL,
content text NOT NULL,
PRIMARY KEY (message_id,app_name,lang)
);

8
doc/create_tables.pgsql
View File

@ -175,4 +175,12 @@ CREATE TABLE users_newsgroups (
newsgroup int NOT NULL newsgroup int NOT NULL
); );
CREATE TABLE lang (
message_id varchar(150) DEFAULT '' NOT NULL,
app_name varchar(100) DEFAULT 'common' NOT NULL,
lang varchar(5) DEFAULT '' NOT NULL,
content text NOT NULL,
unique(message_id,app_name,lang)
);
COMMIT; COMMIT;

10
index.php
View File

@ -82,11 +82,11 @@
$mailbox_status = $phpgw->msg->status($mbox,"{" . $phpgw_info["server"]["mail_server"] . ":" . $phpgw_info["server"]["mail_port"] . "}INBOX",SA_UNSEEN); $mailbox_status = $phpgw->msg->status($mbox,"{" . $phpgw_info["server"]["mail_server"] . ":" . $phpgw_info["server"]["mail_port"] . "}INBOX",SA_UNSEEN);
if ($mailbox_status->unseen == 1) { if ($mailbox_status->unseen == 1) {
echo "<tr><td><A href=\"" . $phpgw->link("email/") . "\"> " echo "<tr><td><A href=\"" . $phpgw->link("email/") . "\"> "
. lang_common("You have 1 new message!") . "</A></td></tr>\n"; . lang("You have 1 new message!") . "</A></td></tr>\n";
} }
if ($mailbox_status->unseen > 1) { if ($mailbox_status->unseen > 1) {
echo "<tr><td><A href=\"" . $phpgw->link("email/") . "\"> " echo "<tr><td><A href=\"" . $phpgw->link("email/") . "\"> "
. lang_common("You have x new messages!",$mailbox_status->unseen) . "</A></td></tr>"; . lang("You have x new messages!",$mailbox_status->unseen) . "</A></td></tr>";
} }
echo "<!-- Mailox info -->\n"; echo "<!-- Mailox info -->\n";
} }
@ -99,7 +99,7 @@
. "/%' and (owner='" . $phpgw_info["user"]["userid"] . "' or access='" . "/%' and (owner='" . $phpgw_info["user"]["userid"] . "' or access='"
. "public')"); . "public')");
while ($phpgw->db->next_record()) { while ($phpgw->db->next_record()) {
echo "<tr><td>" . lang_common("Today is x's birthday!", $phpgw->db->f("firstname") . " " echo "<tr><td>" . lang("Today is x's birthday!", $phpgw->db->f("firstname") . " "
. $phpgw->db->f("lastname")) . "</td></tr>\n"; . $phpgw->db->f("lastname")) . "</td></tr>\n";
} }
$tommorow = $phpgw->common->show_date(mktime(0,0,0, $tommorow = $phpgw->common->show_date(mktime(0,0,0,
@ -110,7 +110,7 @@
. "bday like '$tommorow/%' and (owner='" . "bday like '$tommorow/%' and (owner='"
. $phpgw_info["user"]["userid"] . "' or access='public')"); . $phpgw_info["user"]["userid"] . "' or access='public')");
while ($phpgw->db->next_record()) { while ($phpgw->db->next_record()) {
echo "<tr><td>" . lang_common("Tommorow is x's birthday.", $phpgw->db->f("firstname") . " " echo "<tr><td>" . lang("Tommorow is x's birthday.", $phpgw->db->f("firstname") . " "
. $phpgw->db->f("lastname")) . "</td></tr>\n"; . $phpgw->db->f("lastname")) . "</td></tr>\n";
} }
echo "<!-- Birthday info -->\n"; echo "<!-- Birthday info -->\n";
@ -139,7 +139,7 @@
if ($check > 1) { if ($check > 1) {
$key = "You have x high priority events on your calendar today."; $key = "You have x high priority events on your calendar today.";
} }
if ($check > 0) echo "<tr><td>" . lang_common($key,$check) . "</td></tr>"; if ($check > 0) echo "<tr><td>" . lang($key,$check) . "</td></tr>";
echo "<!-- Calendar info -->\n"; echo "<!-- Calendar info -->\n";
} }

16
login.php
View File

@ -19,7 +19,7 @@
); );
include("header.inc.php"); include("header.inc.php");
include($phpgw_info["server"]["include_root"] . "/lang/" . "en" . "_login.inc.php"); // include($phpgw_info["server"]["include_root"] . "/lang/" . "en" . "_login.inc.php");
include($phpgw_info["server"]["api_dir"] . "/phpgw_template.inc.php"); include($phpgw_info["server"]["api_dir"] . "/phpgw_template.inc.php");
/* /*
@ -64,16 +64,16 @@
global $phpgw_info; global $phpgw_info;
switch($code){ switch($code){
case "1": case "1":
return lang_login("You have been successfully logged out"); return lang("You have been successfully logged out");
break; break;
case "2": case "2":
return lang_login("Sorry, your login has expired"); return lang("Sorry, your login has expired");
break; break;
case "5": case "5":
return "<font color=FF0000>" . lang_login("Bad login or password") . "</font>"; return "<font color=FF0000>" . lang("Bad login or password") . "</font>";
break; break;
case "10": case "10":
return "<font color=FF0000>" . lang_login("Your session could not be verified.") . "</font>"; return "<font color=FF0000>" . lang("Your session could not be verified.") . "</font>";
break; break;
default: default:
return "&nbsp;"; return "&nbsp;";
@ -116,9 +116,9 @@
$tmpl->set_var("website_title", $phpgw_info["server"]["site_title"]); $tmpl->set_var("website_title", $phpgw_info["server"]["site_title"]);
$tmpl->set_var("cd",check_logoutcode($cd)); $tmpl->set_var("cd",check_logoutcode($cd));
$tmpl->set_var("cookie",show_cookie()); $tmpl->set_var("cookie",show_cookie());
$tmpl->set_var("lang_username",lang_login("username")); $tmpl->set_var("lang_username",lang("username"));
$tmpl->set_var("lang_password",lang_login("password")); $tmpl->set_var("lang_password",lang("password"));
$tmpl->set_var("lang_login",lang_login("login")); $tmpl->set_var("lang_login",lang("login"));
$tmpl->parse("login2out","login2"); $tmpl->parse("login2out","login2");
$tmpl->parse("loginout", "login"); $tmpl->parse("loginout", "login");

2
logout.php
View File

@ -57,4 +57,4 @@
} }
Header("Location: " . $phpgw_info["server"]["webserver_url"] . "/login.php?cd=1"); Header("Location: " . $phpgw_info["server"]["webserver_url"] . "/login.php?cd=1");
?> ?>