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

Fix test on currency name

Browse Source
This commit is contained in:
Laurent Destailleur 2017-06-27 12:33:29 +02:00
parent 32ff09123d
commit 1fafa4017d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/lib/company.lib.php
View File

@ -434,6 +434,8 @@ function currency_name($code_iso, $withcode='', $outputlangs=null)
if (empty($outputlangs)) $outputlangs=$langs; if (empty($outputlangs)) $outputlangs=$langs;
$outputlangs->load("dict");
// If there is a translation, we can send immediatly the label // If there is a translation, we can send immediatly the label
if ($outputlangs->trans("Currency".$code_iso)!="Currency".$code_iso) if ($outputlangs->trans("Currency".$code_iso)!="Currency".$code_iso)
{ {

3
test/phpunit/CompanyLibTest.php
View File

@ -129,11 +129,10 @@ class CompanyLibTest extends PHPUnit_Framework_TestCase
$result=currency_name('USD'); $result=currency_name('USD');
print __METHOD__." result=".$result."\n"; print __METHOD__." result=".$result."\n";
$this->assertEquals('United States Dollar',$result,'Test to get currency name USD in default language '.$langs->defaultlang); $this->assertEquals('US Dollars',$result,'Test to get currency name USD in default language '.$langs->defaultlang);
$outputlangs=new Translate('', $conf); $outputlangs=new Translate('', $conf);
$outputlangs->setDefaultLang('fr_FR'); $outputlangs->setDefaultLang('fr_FR');
$outputlangs->load("dict");
$result=currency_name('USD', 1, $outputlangs); $result=currency_name('USD', 1, $outputlangs);
print __METHOD__." result=".$result."\n"; print __METHOD__." result=".$result."\n";