From 326ea4a2f8f5d6699d193a737b20ca03fb73d5e0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 4 Sep 2004 12:03:36 +0000 Subject: [PATCH] Trad: Et encore des traductions --- htdocs/langs/en_US/bills.lang | 1 + htdocs/langs/en_US/main.lang | 3 +++ htdocs/langs/en_US/products.lang | 8 +++++++- htdocs/langs/fr_FR/bills.lang | 1 + htdocs/langs/fr_FR/main.lang | 5 ++++- htdocs/langs/fr_FR/products.lang | 6 ++++++ htdocs/product/fiche.php | 28 ++++++++++++++++++---------- 7 files changed, 40 insertions(+), 12 deletions(-) diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index ff4c9c19161..366be9389d1 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -10,6 +10,7 @@ DoPaiement=Do paiement BuildPDF=Build PDF RebuildPDF=Rebuild PDF VAT=VAT +VATRate=VAT Rate Amount=Amount BillStatusDraft=Draft (need to be validated) BillStatusPayed=Payed diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 09416d03e10..23f8ddc3cc2 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -98,3 +98,6 @@ ChartNotGenerated=Chart not generated Duration=Duration Summary=Summary NotYetAvailable=Not yet available +Popularity=Popularity +Categories=Categories +Category=Categorie diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang index f2101cb6743..7db3b8311ef 100644 --- a/htdocs/langs/en_US/products.lang +++ b/htdocs/langs/en_US/products.lang @@ -3,6 +3,8 @@ Products=Products Services=Services Product=Product Service=Service +NewProduct=New product +NewService=New service ProductsAndServices=Products and Services ProductsAndServicesOnSell=Products and Services on sell ProductsAndServicesNotOnSell=Products and Services out of sell @@ -12,4 +14,8 @@ ServicesOnSell=Services on sell ServicesNotOnSell=Services out of sell LastRecorded=Last products/services on sell recorded CardProduct0=Product card -CardProduct1=Service card \ No newline at end of file +CardProduct1=Service card +Stock=Stock +Stocks=Stocks +OnSell=On sell +NotOnSell=Out of Sell \ No newline at end of file diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang index fab8add98a3..5c97a302a06 100644 --- a/htdocs/langs/fr_FR/bills.lang +++ b/htdocs/langs/fr_FR/bills.lang @@ -10,6 +10,7 @@ DoPaiement=Emettre paiement BuildPDF=Générer le PDF RebuildPDF=Regénérer le PDF VAT=TVA +VATRate=Taux TVA Amount=Montant BillStatusDraft=Brouillon (à valider) BillStatusPayed=Payée diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index 7b0328f3ed5..b26fb138fa8 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -97,4 +97,7 @@ ChartGenerated=Graphiques g ChartNotGenerated=Graphique non généré Duration=Durée Summary=Résumé -NotYetAvailable=Pas encore disponible \ No newline at end of file +NotYetAvailable=Pas encore disponible +Popularity=Popularité +Categories=Categories +Category=Categorie \ No newline at end of file diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang index 1daae8d441a..4ac41f07530 100644 --- a/htdocs/langs/fr_FR/products.lang +++ b/htdocs/langs/fr_FR/products.lang @@ -3,6 +3,8 @@ Products=Produits Services=Services Product=Produit Service=Service +NewProduct=Nouveau produit +NewService=Nouveau service ProductsAndServices=Produits et Services ProductsAndServicesOnSell=Produits et Services en vente ProductsAndServicesNotOnSell=Produits et Services hors vente @@ -13,3 +15,7 @@ ServicesNotOnSell=Services hors vente LastRecorded=Derniers produits/services en vente enregistrés CardProduct0=Fiche produit CardProduct1=Fiche service +Stock=Stock +Stocks=Stocks +OnSell=En vente +NotOnSell=Hors vente diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index 57781884637..ee4ac427823 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -243,11 +243,14 @@ if ($_GET["action"] == 'create') print '
'; print ''; print ''."\n"; - print '
Nouveau '.$types[$_GET["type"]].'

'."\n"; + print '
'; + if ($_GET["type"]==0) { print $langs->trans("NewProduct"); } + if ($_GET["type"]==1) { print $langs->trans("NewService"); } + print '

'."\n"; print ''; print ''; - print ''; print ''; print ''; - print ''; + print ''; if ($_GET["type"] == 0 && defined("MAIN_MODULE_STOCK")) @@ -402,10 +406,11 @@ else print ''; - print ''; + $langs->load("bills"); + print ''; if ($product->type == 0 && defined("MAIN_MODULE_STOCK")) { - print ''; + print ''; if ($product->no_stock) { print "".''; print ''; - print "".''; @@ -723,6 +729,8 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->envente) if($user->rights->facture->creer) { + $langs->load("bills"); + print "".'
Référence'; + print ''.$langs->trans("Ref").''; if ($_error == 1) { print "Cette référence existe déjà"; @@ -255,15 +258,16 @@ if ($_GET["action"] == 'create') print '
'.$langs->trans("Label").'
Prix de vente
Taux TVA'; - - + + $langs->load("bills"); + print '
'.$langs->trans("VATRate").''; print $html->select_tva("tva_tx"); print '
'.$langs->trans("Status").''; print '
Taux TVA'.$product->tva_tx.' %
'.$langs->trans("VATRate").''.$product->tva_tx.' %
Stock
'.$langs->trans("Stock").'Pas de définition de stock pour ce produit"; @@ -527,7 +532,8 @@ else print "
'.$langs->trans("Ref").'
'.$langs->trans("Label").'
Taux TVA'; + $langs->load("bills"); + print '
'.$langs->trans("VATRate").''; $html = new Form($db); print $html->select_tva("tva_tx", $product->tva_tx); print '
'; print_titre("Ajouter à ma facture"); print '';