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

Fix: Translation of currency works better now.

Browse Source
This commit is contained in:
Laurent Destailleur 2009-11-06 21:43:29 +00:00
parent c73c31434d
commit 64c9991efd
4 changed files with 123 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
htdocs/admin/facture.php
View File

@ -393,11 +393,19 @@ print "</tr>\n";
clearstatcache();
$handle=opendir($dir);
$var=True;
while (($file = readdir($handle))!==false)
$var=true;
foreach ($conf->file->dol_document_root as $dirroot)
{
$dir = $dirroot . "/includes/modules/facture/";
if (is_dir($dir))
{
$handle=opendir($dir);
if ($handle)
{
while (($file = readdir($handle))!==false)
{
if (preg_match('/\.modules\.php$/i',$file) && substr($file,0,4) == 'pdf_')
{
$var = !$var;
@ -471,9 +479,11 @@ while (($file = readdir($handle))!==false)
print "</tr>\n";
}
}
closedir($handle);
}
}
}
closedir($handle);
print '</table>';

23
htdocs/langs/en_US/dict.lang
View File

@ -255,18 +255,33 @@ CivilityMTRE=Master
##### Currencies #####
Currencyeuros=Euros
CurrencyAUD=AU Dollar
CurrencyCAD=CAN Dollar
CurrencyAUD=AU Dollars
CurrencySingAUD=AU Dollar
CurrencyCAD=CAN Dollars
CurrencySingCAD=CAN Dollar
CurrencyCHF=Swiss Francs
CurrencySingCHF=Swiss Franc
CurrencyEUR=Euros
CurrencySingEUR=Euro
CurrencyFRF=French Francs
CurrencySingFRF=French Franc
CurrencyGBP=GB Pounds
CurrencySingGBP=GB Pound
CurrencyMAD=Dirham
CurrencySingMAD=Dirham
CurrencyMGA=Ariary
CurrencyMUR=Mauritius rupee
CurrencyNOK=Norwegian krone
CurrencySingMGA=Ariary
CurrencyMUR=Mauritius rupees
CurrencySingMUR=Mauritius rupee
CurrencyNOK=Norwegian krones
CurrencySingNOK=Norwegian krone
CurrencyTND=Tunisian dinars
CurrencySingTND=Tunisian dinar
CurrencyUSD=US Dollars
CurrencySingUSD=US Dollar
CurrencyXAF=CFA Francs BEAC
CurrencySingXAF=CFA Franc BEAC
CurrencyXOF=CFA Francs BCEAO
CurrencySingXOF=CFA Franc BCEAO
CurrencyXPF=CFP Francs
CurrencySingXPF=CFP Franc

22
htdocs/langs/fr_FR/dict.lang
View File

@ -256,20 +256,36 @@ CivilityMTRE=Maître
##### Currencies #####
Currencyeuros=Euros
CurrencyAUD=Dollars Aus.
CurrencySingAUD=Dollar Aus.
CurrencyCAD=Dollars Can.
CurrencySingCAD=Dollar Can.
CurrencyCHF=Francs suisses
CurrencySingCHF=Franc suisse
CurrencyEUR=Euros
CurrencySingEUR=Euro
CurrencyFRF=Francs Français
CurrencySingFRF=Franc Français
CurrencyGBP=Livres sterling
CurrencySingGBP=Livre sterling
CurrencyMAD=Dirham
CurrencySingMAD=Dirham
CurrencyMGA=Ariary
CurrencySingMGA=Ariary
CurrencyMUR=Roupies mauritiennes
CurrencySingMUR=Roupie mauritienne
CurrencyNOK=Couronnes norvégiennes
CurrencySingNOK=Couronne norvégienne
CurrencySUR=Roubles
CurrencyTND=Dinar tunisiens
CurrencyTRL=Livre turques
CurrencySingSUR=Rouble
CurrencyTND=Dinars tunisiens
CurrencySingTND=Dinar tunisien
CurrencyTRL=Livres turques
CurrencySingTRL=Livre turque
CurrencyUSD=Dollars US
CurrencySingUSD=Dollar US
CurrencyXAF=Francs CFA BEAC
CurrencySingXAF=Franc CFA BEAC
CurrencyXOF=Francs CFA BCEAO
CurrencySingXOF=Franc CFA BCEAO
CurrencyXPF=Francs CFP
CurrencySingXPF=Franc CFP

10
htdocs/translate.class.php
View File

@ -368,20 +368,16 @@ class Translate {
{
global $db;
$newstr=$key;
if (preg_match('/CurrencyShort([A-Z]+)$/i',$key,$reg))
if (preg_match('/CurrencySing([A-Z][A-Z][A-Z])$/i',$key,$reg))
{
global $db;
//$newstr=$this->getLabelFromKey($db,$reg[1],'c_currencies','code_iso','labelshort');
$newstr=$this->getLabelFromKey($db,$reg[1],'c_currencies','code_iso','code');
$newstr=$this->getLabelFromKey($db,$reg[1],'c_currencies','code_iso','labelsing');
}
else if (preg_match('/Currency([A-Z]+)$/i',$key,$reg))
else if (preg_match('/Currency([A-Z][A-Z][A-Z])$/i',$key,$reg))
{
global $db;
$newstr=$this->getLabelFromKey($db,$reg[1],'c_currencies','code_iso','label');
}
else if (preg_match('/SendingMethod([0-9A-Z]+)$/i',$key,$reg))
{
global $db;
$newstr=$this->getLabelFromKey($db,$reg[1],'expedition_methode','code','libelle');
}
return $newstr;