From 81211651c96bcb5d178078f1d7d589ab972368ce Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 4 May 2007 18:54:03 +0000 Subject: [PATCH] =?UTF-8?q?Fix:=20traduction=20et=20modif=20esth=E9tique?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/includes/boxes/box_actions.php | 30 ++++++++++++++++++++------- htdocs/includes/boxes/box_clients.php | 4 ++-- htdocs/langs/en_US/boxes.lang | 5 +++-- htdocs/langs/fr_FR/boxes.lang | 3 ++- htdocs/lib/functions.inc.php | 6 +++--- 5 files changed, 33 insertions(+), 15 deletions(-) diff --git a/htdocs/includes/boxes/box_actions.php b/htdocs/includes/boxes/box_actions.php index 686b9f3cbdf..94c44d06903 100644 --- a/htdocs/includes/boxes/box_actions.php +++ b/htdocs/includes/boxes/box_actions.php @@ -64,9 +64,9 @@ class box_actions extends ModeleBoxes { global $user, $langs, $db, $conf; 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) { @@ -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")); - $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', 'nowrap' => 1, @@ -119,12 +119,28 @@ class box_actions extends ModeleBoxes { $this->info_box_contents[$i][3] = array('align' => 'right', 'text' => $objp->percent. "%"); - $this->info_box_contents[$i][4] = array( - 'align' => 'right', - 'text' => $actionstatic->LibStatut($objp->percent,3)); + $this->info_box_contents[$i][4] = array( + 'align' => 'right', + 'text' => $actionstatic->LibStatut($objp->percent,3)); $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'=>' '); + $this->info_box_contents[$i][2] = array('text'=>' '); + } else { + $this->info_box_contents[$i][0] = array('text'=>' '); + $this->info_box_contents[$i][1] = array('text'=>' '); + $this->info_box_contents[$i][2] = array('text'=>' '); + } + $i++; + } } else { dolibarr_print_error($db); diff --git a/htdocs/includes/boxes/box_clients.php b/htdocs/includes/boxes/box_clients.php index 89ae8d9e76c..45cced56cc1 100644 --- a/htdocs/includes/boxes/box_clients.php +++ b/htdocs/includes/boxes/box_clients.php @@ -96,8 +96,8 @@ class box_clients extends ModeleBoxes { 'text' => stripslashes($objp->nom), 'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->idp); - $this->info_box_contents[$i][1] = array('align' => 'right', - 'text' => dolibarr_print_date($objp->dc, "day")); + $this->info_box_contents[$i][1] = array('align' => 'right', + 'text' => dolibarr_print_date($objp->dc, "day")); $i++; } diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang index 277b9d88248..48dad1dd1c7 100644 --- a/htdocs/langs/en_US/boxes.lang +++ b/htdocs/langs/en_US/boxes.lang @@ -25,7 +25,7 @@ BoxTitleLastSuppliers=Last %s recorded suppliers BoxTitleLastCustomers=Last %s recorded customers BoxTitleLastPropals=Last %s recorded proposals BoxTitleLastCustomerBills=Last %s customer's invoices -BoxTitleLastSupplierBills=Les %s supplier's invoices +BoxTitleLastSupplierBills=Last %s supplier's invoices BoxTitleLastProspects=Last %s recorded prospects BoxTitleLastProductsInContract=Last %s derniers produits/services contractés BoxTitleOldestUnpayedCustomerBills=Oldest %s unpayed customer's invoices @@ -37,4 +37,5 @@ BoxTitleTotalUnpayedSuppliersBills=Unpayed supplier's invoices BoxMyLastBookmarks=My last %s bookmarks FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s NoRecordedBookmarks=No bookmarks defined. Click here to add bookmarks. -NoRecordedCustomers=No recorded customers \ No newline at end of file +NoRecordedCustomers=No recorded customers +BoxTitleLastActionsToDo=Last %s actions to do \ No newline at end of file diff --git a/htdocs/langs/fr_FR/boxes.lang b/htdocs/langs/fr_FR/boxes.lang index 81dca44de63..d8010a6ee5f 100644 --- a/htdocs/langs/fr_FR/boxes.lang +++ b/htdocs/langs/fr_FR/boxes.lang @@ -37,4 +37,5 @@ BoxTitleTotalUnpayedSuppliersBills=Impay BoxMyLastBookmarks=Mes %s derniers marque-pages FailedToRefreshDataInfoNotUpToDate=Echec du rafraichissement du flux RSS. Date du dernier rafraichissement: %s NoRecordedBookmarks=Pas de bookmarks personnels. Cliquer ici pour en ajouter. -NoRecordedCustomers=Pas de clients enregistrés \ No newline at end of file +NoRecordedCustomers=Pas de clients enregistrés +BoxTitleLastActionsToDo=Les %s dernières actions à faires \ No newline at end of file diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php index 608d68da264..a48ee14f100 100644 --- a/htdocs/lib/functions.inc.php +++ b/htdocs/lib/functions.inc.php @@ -1139,10 +1139,10 @@ function dol_loginfunction($notused,$pearstatus) print ''; print "\n"; - print "\n"; - print "\n"; + print "\n"; + print "\n"; print ''."\n"; // Evite indexation par robots - print "Dolibarr Authentification\n"; + print "Dolibarr Authentification\n"; print ''."\n";