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

Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into

Browse Source 
develop
This commit is contained in:
Laurent Destailleur 2014-04-07 13:09:34 +02:00
commit ab3bbf8e0b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/langs/hr_HR/main.lang
View File

@ -7,7 +7,7 @@ DIRECTION=ltr
FONTFORPDF=helvetica FONTFORPDF=helvetica
FONTSIZEFORPDF=10 FONTSIZEFORPDF=10
SeparatorDecimal=, SeparatorDecimal=,
SeparatorThousand=, SeparatorThousand=Space
FormatDateShort=%m/%d/%Y FormatDateShort=%m/%d/%Y
FormatDateShortInput=%m/%d/%Y FormatDateShortInput=%m/%d/%Y
FormatDateShortJava=MM/dd/yyyy FormatDateShortJava=MM/dd/yyyy

2
test/phpunit/LangTest.php
View File

@ -158,7 +158,7 @@ class LangTest extends PHPUnit_Framework_TestCase
$result=$tmplangs->trans("SeparatorThousand"); $result=$tmplangs->trans("SeparatorThousand");
print __METHOD__." SeparatorThousand=".$result."\n"; print __METHOD__." SeparatorThousand=".$result."\n";
$this->assertContains($result,array('.',',','/',' ','','None','SeparatorThousand')); // SeparatorThousand is returned when SeparatorThousand=Space $this->assertContains($result,array('.',',','/',' ','','None','Space'));
// Test java string contains only d,M,y,/,-,. and not m,... // Test java string contains only d,M,y,/,-,. and not m,...
$result=$tmplangs->trans("FormatDateShortJava"); $result=$tmplangs->trans("FormatDateShortJava");