lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Missing translation loading

Browse Source
This commit is contained in:
Laurent Destailleur 2010-05-25 22:22:24 +00:00
parent 47d3a77fd2
commit cd740acef6
10 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/commande/tpl/linkedobjectblock.tpl.php
View File

@ -21,7 +21,8 @@
<!-- BEGIN PHP TEMPLATE -->
<?php
<?php
$langs->load("orders");
if ($somethingshown) { echo '<br>'; }
print_titre($langs->trans('RelatedOrders'));
?>
@ -32,7 +33,7 @@ print_titre($langs->trans('RelatedOrders'));
<td align="right"><?php echo $langs->trans("AmountHTShort"); ?></td>
<td align="right"><?php echo $langs->trans("Status"); ?></td>
</tr>
<?php
<?php
$var=true;
for ($i = 0 ; $i < $num ; $i++)
{

7
htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
View File

@ -21,7 +21,8 @@
<!-- BEGIN PHP TEMPLATE -->
<?php
<?php
$langs->load("bills");
if ($somethingshown) { echo '<br>'; }
if ($num > 1) print_titre($langs->trans("RelatedBills"));
else print_titre($langs->trans("RelatedBill"));
@ -33,7 +34,7 @@ else print_titre($langs->trans("RelatedBill"));
<td align="right"><?php echo $langs->trans("AmountHTShort"); ?></td>
<td align="right"><?php echo $langs->trans("Status"); ?></td>
</tr>
<?php
<?php
$var=true;
for ($i = 0 ; $i < $num ; $i++)
{
@ -49,7 +50,7 @@ for ($i = 0 ; $i < $num ; $i++)
<?php
$total = $total + $linkedObjectBlock->total_ht;
$i++;
}
}
?>
<tr class="liste_total">
<td align="left" colspan="2"><?php echo $langs->trans("TotalHT"); ?></td>

7
htdocs/contrat/tpl/linkedobjectblock.tpl.php
View File

@ -21,9 +21,10 @@
<!-- BEGIN PHP TEMPLATE -->
<?php
<?php
$langs->load("contracts");
if ($somethingshown) { echo '<br>'; }
print_titre($langs->trans('RelatedContract'));
print_titre($langs->trans('RelatedContracts'));
?>
<table class="noborder" width="100%">
<tr class="liste_titre">
@ -32,7 +33,7 @@ print_titre($langs->trans('RelatedContract'));
<td align="right"><?php echo $langs->trans("AmountHTShort"); ?></td>
<td align="right"><?php echo $langs->trans("Status"); ?></td>
</tr>
<?php
<?php
$var=true;
for ($i = 0 ; $i < $num ; $i++)
{

2
htdocs/core/class/commonobject.class.php
View File

@ -1099,9 +1099,9 @@ class CommonObject
$num = sizeof($objectid);
if ($num)
{
// TODO uniformiser emplacement classe
$classpath = $object.'/class';
$tplpath = $object;
// TODO uniformiser emplacement classe
if ($object == 'facture') $tplpath = 'compta/'.$object; $classpath = $tplpath.'/class';
if ($object == 'propal') $tplpath = 'comm/'.$object; $classpath = $tplpath.'/class';

2
htdocs/langs/en_US/bills.lang
View File

@ -273,6 +273,8 @@ ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %
TypeAmountOfEachNewDiscount=Input amount for each of two parts :
TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to original discount amount.
ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
RelatedBill=Related invoice
RelatedBills=Related invoices
# PaymentConditions
PaymentConditionShortRECEP=Immediate

1
htdocs/langs/en_US/contracts.lang
View File

@ -84,6 +84,7 @@ ConfirmMoveToAnotherContract=I choosed new target contract and confirm I want to
ConfirmMoveToAnotherContractQuestion=Choose in which existing contract (of same third party), you want to move this service to ?
PaymentRenewContractId=Renew contract line (number %s)
ExpiredSince=Expiration date
RelatedContracts=Related contracts
##### Types de contacts #####
TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
TypeContact_contrat_internal_SALESREPFOLL=Sales representative following-up contract

2
htdocs/langs/en_US/propal.lang
View File

@ -67,8 +67,6 @@ ValidityDuration=Validity duration
CloseAs=Close with status
ClassifyBilled=Classify billed
BuildBill=Build invoice
RelatedBill=Related invoice
RelatedBills=Related invoices
ErrorPropalNotFound=Propal %s not found
Estimate=Estimate :
EstimateShort=Estimate

2
htdocs/langs/fr_FR/bills.lang
View File

@ -270,6 +270,8 @@ ConfirmSplitDiscount=Êtes-vous sûr de vouloir scinder la réduction de <b>%s</
TypeAmountOfEachNewDiscount=Saisissez le montant de chacune des deux parts :
TotalOfTwoDiscountMustEqualsOriginal=La somme du montant des 2 nouvelles réductions doit être équivalente au montant de la réduction à scinder.
ConfirmRemoveDiscount=Êtes-vous sûr de vouloir supprimer cette réduction ?
RelatedBill=Facture associée
RelatedBills=Factures associées
# PaymentConditions
PaymentConditionShortRECEP=A réception

1
htdocs/langs/fr_FR/contracts.lang
View File

@ -84,6 +84,7 @@ ConfirmMoveToAnotherContract=J'ai choisi le contrat cible et confirme le déplac
ConfirmMoveToAnotherContractQuestion=Choisissez vers quel autre contrat de ce même tiers, vous voulez déplacer ce service ?
PaymentRenewContractId=Renouvellement service (numéro %s)
ExpiredSince=Expiration le
RelatedContracts=Contrats associés
##### Types de contacts #####
TypeContact_contrat_internal_SALESREPSIGN=Commercial signataire du contrat
TypeContact_contrat_internal_SALESREPFOLL=Commercial suivi du contrat

2
htdocs/langs/fr_FR/propal.lang
View File

@ -67,8 +67,6 @@ ValidityDuration=Durée de validité
CloseAs=Clôturer au statut
ClassifyBilled=Classer facturée
BuildBill=Créer facture
RelatedBill=Facture associée
RelatedBills=Factures associées
ErrorPropalNotFound=Propale %s inexistante
Estimate=Devis :
EstimateShort=Devis