Fix: traduction et modif esthétique

This commit is contained in:
Regis Houssin 2007-05-04 18:54:03 +00:00
parent 12b94eaf7e
commit 81211651c9
5 changed files with 33 additions and 15 deletions

View File

@ -66,7 +66,7 @@ class box_actions extends ModeleBoxes {
include_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); include_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php");
$actionstatic=new ActionComm($db); $actionstatic=new ActionComm($db);
$this->info_box_head = array('text' =>$langs->trans("ActionsToDo")); $this->info_box_head = array('text' => $langs->trans("BoxTitleLastActionsToDo",$max));
if ($user->rights->commercial->main->lire) if ($user->rights->commercial->main->lire)
{ {
@ -100,7 +100,7 @@ class box_actions extends ModeleBoxes {
if (date("U",$objp->dp) < (time() - $conf->global->MAIN_DELAY_ACTIONS_TODO)) $late=img_warning($langs->trans("Late")); if (date("U",$objp->dp) < (time() - $conf->global->MAIN_DELAY_ACTIONS_TODO)) $late=img_warning($langs->trans("Late"));
$label=($langs->trans("Action".$objp->code)!=("Action".$objp->code) ? $langs->trans("Action".$objp->code) : $objp->label); $label=($langs->transnoentities("Action".$objp->code)!=("Action".$objp->code) ? $langs->transnoentities("Action".$objp->code) : $objp->label);
$this->info_box_contents[$i][0] = array('align' => 'left', $this->info_box_contents[$i][0] = array('align' => 'left',
'nowrap' => 1, 'nowrap' => 1,
@ -124,6 +124,22 @@ class box_actions extends ModeleBoxes {
'text' => $actionstatic->LibStatut($objp->percent,3)); 'text' => $actionstatic->LibStatut($objp->percent,3));
$i++; $i++;
}
$i=$num;
while ($i < $max)
{
if ($num==0 && $i==$num)
{
$this->info_box_contents[$i][0] = array('align' => 'center','text'=>$langs->trans("NoActionsToDo"));
$this->info_box_contents[$i][1] = array('text'=>'&nbsp;');
$this->info_box_contents[$i][2] = array('text'=>'&nbsp;');
} else {
$this->info_box_contents[$i][0] = array('text'=>'&nbsp;');
$this->info_box_contents[$i][1] = array('text'=>'&nbsp;');
$this->info_box_contents[$i][2] = array('text'=>'&nbsp;');
}
$i++;
} }
} }
else { else {

View File

@ -25,7 +25,7 @@ BoxTitleLastSuppliers=Last %s recorded suppliers
BoxTitleLastCustomers=Last %s recorded customers BoxTitleLastCustomers=Last %s recorded customers
BoxTitleLastPropals=Last %s recorded proposals BoxTitleLastPropals=Last %s recorded proposals
BoxTitleLastCustomerBills=Last %s customer's invoices BoxTitleLastCustomerBills=Last %s customer's invoices
BoxTitleLastSupplierBills=Les %s supplier's invoices BoxTitleLastSupplierBills=Last %s supplier's invoices
BoxTitleLastProspects=Last %s recorded prospects BoxTitleLastProspects=Last %s recorded prospects
BoxTitleLastProductsInContract=Last %s derniers produits/services contractés BoxTitleLastProductsInContract=Last %s derniers produits/services contractés
BoxTitleOldestUnpayedCustomerBills=Oldest %s unpayed customer's invoices BoxTitleOldestUnpayedCustomerBills=Oldest %s unpayed customer's invoices
@ -38,3 +38,4 @@ BoxMyLastBookmarks=My last %s bookmarks
FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
NoRecordedBookmarks=No bookmarks defined. Click <a href="%s">here</a> to add bookmarks. NoRecordedBookmarks=No bookmarks defined. Click <a href="%s">here</a> to add bookmarks.
NoRecordedCustomers=No recorded customers NoRecordedCustomers=No recorded customers
BoxTitleLastActionsToDo=Last %s actions to do

View File

@ -38,3 +38,4 @@ BoxMyLastBookmarks=Mes %s derniers marque-pages
FailedToRefreshDataInfoNotUpToDate=Echec du rafraichissement du flux RSS. Date du dernier rafraichissement: %s FailedToRefreshDataInfoNotUpToDate=Echec du rafraichissement du flux RSS. Date du dernier rafraichissement: %s
NoRecordedBookmarks=Pas de bookmarks personnels. Cliquer ici pour en ajouter. NoRecordedBookmarks=Pas de bookmarks personnels. Cliquer ici pour en ajouter.
NoRecordedCustomers=Pas de clients enregistrés NoRecordedCustomers=Pas de clients enregistrés
BoxTitleLastActionsToDo=Les %s dernières actions à faires