Reformatting only

This commit is contained in:
Miles Lott 2001-06-15 21:29:33 +00:00
parent e475245b8d
commit 3356dc1453
2 changed files with 79 additions and 64 deletions

View File

@ -1,4 +1,4 @@
<?php <?php
if (empty($phpgw_info["server"]["translation_system"])){$phpgw_info["server"]["translation_system"] = "sql";} if (empty($phpgw_info['server']['translation_system'])){$phpgw_info['server']['translation_system'] = 'sql';}
include(PHPGW_API_INC."/class.translation_".$phpgw_info["server"]["translation_system"].".inc.php"); include(PHPGW_API_INC.'/class.translation_'.$phpgw_info['server']['translation_system'].'.inc.php');
?> ?>

View File

@ -26,43 +26,54 @@
class translation class translation
{ {
function translate($key, $vars=false ) function translate($key, $vars=false )
{ {
if ( ! $vars ) $vars = array(); if ( ! $vars ) $vars = array();
global $phpgw, $phpgw_info, $lang; global $phpgw, $phpgw_info, $lang;
$ret = $key; $ret = $key;
if (!isset($lang) || !$lang) { if (!isset($lang) || !$lang)
if (isset($phpgw_info["user"]["preferences"]["common"]["lang"]) && {
$phpgw_info["user"]["preferences"]["common"]["lang"]) { if (isset($phpgw_info['user']['preferences']['common']['lang']) &&
$userlang = $phpgw_info["user"]["preferences"]["common"]["lang"]; $phpgw_info['user']['preferences']['common']['lang'])
}else{ {
$userlang = "en"; $userlang = $phpgw_info['user']['preferences']['common']['lang'];
}
else
{
$userlang = 'en';
} }
$sql = "select message_id,content from lang where lang like '".$userlang."' ". $sql = "select message_id,content from lang where lang like '".$userlang."' ".
"and (app_name like '".$phpgw_info["flags"]["currentapp"]."' or app_name like 'common' or app_name like 'all')"; "and (app_name like '".$phpgw_info['flags']['currentapp']."' or app_name like 'common' or app_name like 'all')";
if (strcasecmp ($phpgw_info["flags"]["currentapp"], "common")>0){ if (strcasecmp ($phpgw_info['flags']['currentapp'], 'common')>0)
$sql .= " order by app_name asc"; {
}else{ $sql .= ' order by app_name asc';
$sql .= " order by app_name desc"; }
else
{
$sql .= ' order by app_name desc';
} }
$phpgw->db->query($sql,__LINE__,__FILE__); $phpgw->db->query($sql,__LINE__,__FILE__);
$phpgw->db->next_record(); $phpgw->db->next_record();
$count = $phpgw->db->num_rows(); $count = $phpgw->db->num_rows();
for ($idx = 0; $idx < $count; ++$idx) { for ($idx = 0; $idx < $count; ++$idx)
$lang[strtolower ($phpgw->db->f("message_id"))] = $phpgw->db->f("content"); {
$lang[strtolower ($phpgw->db->f('message_id'))] = $phpgw->db->f('content');
$phpgw->db->next_record(); $phpgw->db->next_record();
} }
} }
if (isset($lang[strtolower ($key)]) && $lang[strtolower ($key)]){ if (isset($lang[strtolower ($key)]) && $lang[strtolower ($key)])
{
$ret = $lang[strtolower ($key)]; $ret = $lang[strtolower ($key)];
}else{ }
else
{
$ret = $key."*"; $ret = $key."*";
} }
$ndx = 1; $ndx = 1;
while( list($key,$val) = each( $vars ) ) { while( list($key,$val) = each( $vars ) )
{
$ret = preg_replace( "/%$ndx/", $val, $ret ); $ret = preg_replace( "/%$ndx/", $val, $ret );
++$ndx; ++$ndx;
} }
@ -72,17 +83,21 @@
function add_app($app) function add_app($app)
{ {
global $phpgw, $phpgw_info, $lang; global $phpgw, $phpgw_info, $lang;
if ($phpgw_info["user"]["preferences"]["common"]["lang"]){ if ($phpgw_info['user']['preferences']['common']['lang'])
$userlang = $phpgw_info["user"]["preferences"]["common"]["lang"]; {
}else{ $userlang = $phpgw_info['user']['preferences']['common']['lang'];
$userlang = "en"; }
else
{
$userlang = 'en';
} }
$sql = "select message_id,content from lang where lang like '".$userlang."' and app_name like '".$app."'"; $sql = "select message_id,content from lang where lang like '".$userlang."' and app_name like '".$app."'";
$phpgw->db->query($sql,__LINE__,__FILE__); $phpgw->db->query($sql,__LINE__,__FILE__);
$phpgw->db->next_record(); $phpgw->db->next_record();
$count = $phpgw->db->num_rows(); $count = $phpgw->db->num_rows();
for ($idx = 0; $idx < $count; ++$idx) { for ($idx = 0; $idx < $count; ++$idx)
$lang[strtolower ($phpgw->db->f("message_id"))] = $phpgw->db->f("content"); {
$lang[strtolower ($phpgw->db->f('message_id'))] = $phpgw->db->f('content');
$phpgw->db->next_record(); $phpgw->db->next_record();
} }
} }