From 21e243b3cf91416252402c48326ce59d5e55250e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 11 May 2005 00:07:17 +0000 Subject: [PATCH] Trad: Traduction module don --- htdocs/compta/dons/index.php | 18 ++++++++++++------ htdocs/compta/dons/pre.inc.php | 7 ++++--- htdocs/langs/en_US/donations.lang | 4 +++- htdocs/langs/fr_FR/donations.lang | 2 ++ 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/htdocs/compta/dons/index.php b/htdocs/compta/dons/index.php index 8667bcb88ab..2bddb58207c 100644 --- a/htdocs/compta/dons/index.php +++ b/htdocs/compta/dons/index.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004 Laurent Destailleur + * Copyright (C) 2004-2005 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,7 +21,8 @@ * */ -/*! \file htdocs/compta/dons/index.php +/** + \file htdocs/compta/dons/index.php \ingroup don \brief Page accueil espace don \version $Revision$ @@ -31,9 +32,13 @@ require("./pre.inc.php"); $langs->load("donations"); + llxHeader(); -$sql = "SELECT count(d.rowid) as nb, sum(d.amount) as somme , d.fk_statut FROM ".MAIN_DB_PREFIX."don as d GROUP BY d.fk_statut order by d.fk_statut"; +$sql = "SELECT count(d.rowid) as nb, sum(d.amount) as somme , d.fk_statut"; +$sql.= " FROM ".MAIN_DB_PREFIX."don as d"; +$sql.= " GROUP BY d.fk_statut"; +$sql.= " ORDER BY d.fk_statut"; $result = $db->query($sql); @@ -49,12 +54,13 @@ if ($result) $nb[$objp->fk_statut] = $objp->nb; $i++; } - $db->free(); + $db->free($result); } else { dolibarr_print_error($db); } -print_titre($langs->trans("Donations")); +print_titre($langs->trans("DonationsArea")); +print '
'; print ''; print ''; @@ -89,5 +95,5 @@ print "
"; $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/dons/pre.inc.php b/htdocs/compta/dons/pre.inc.php index 5e25d2a1912..806658dc834 100644 --- a/htdocs/compta/dons/pre.inc.php +++ b/htdocs/compta/dons/pre.inc.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004 Laurent Destailleur + * Copyright (C) 2004-2005 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,7 +21,8 @@ * */ -/*! \file htdocs/compta/dons/pre.inc.php +/** + \file htdocs/compta/dons/pre.inc.php \ingroup don \brief Fichier gestionnaire du menu de gauche de l'espace dons \version $Revision$ @@ -48,7 +49,7 @@ function llxHeader($head = "") { $menu = new Menu(); $menu->add(DOL_URL_ROOT."/compta/dons/",$langs->trans("Donations")); - $menu->add_submenu(DOL_URL_ROOT."/compta/dons/fiche.php?action=create",$langs->trans("AddDonation")); + $menu->add_submenu(DOL_URL_ROOT."/compta/dons/fiche.php?action=create",$langs->trans("NewDonation")); $menu->add_submenu(DOL_URL_ROOT."/compta/dons/liste.php",$langs->trans("List")); $menu->add_submenu(DOL_URL_ROOT."/compta/dons/stats.php",$langs->trans("Statistics")); diff --git a/htdocs/langs/en_US/donations.lang b/htdocs/langs/en_US/donations.lang index 1c1182b6239..554ed296286 100644 --- a/htdocs/langs/en_US/donations.lang +++ b/htdocs/langs/en_US/donations.lang @@ -2,10 +2,12 @@ Donation=Donation Donationss=Donations AddDonation=Add a donation +NewDonation=New donation DonationPromise=Gift promise PromisesNotValid=Not valid promises PromisesValid=Valid promises DonationsPayed=Donations payed DonationsReceived=Donations received PublicDonation=Public donation -DonationsNumber=Donation number \ No newline at end of file +DonationsNumber=Donation number +DonationsArea=Donations area \ No newline at end of file diff --git a/htdocs/langs/fr_FR/donations.lang b/htdocs/langs/fr_FR/donations.lang index bf8bf34c35d..fbd4f7c8d7d 100644 --- a/htdocs/langs/fr_FR/donations.lang +++ b/htdocs/langs/fr_FR/donations.lang @@ -2,6 +2,7 @@ Donation=Don Donations=Dons AddDonation=Ajouter don +NewDonation=Nouveau don DonationPromise=Promesse de don PromisesNotValid=Promesses non validées PromisesValid=Promesses validées @@ -9,3 +10,4 @@ DonationsPayed=Dons pay DonationsReceived=Dons encaissés PublicDonation=Don public DonationsNumber=Nombre de dons +DonationsArea=Espace Dons