From 7a8f244ae986f190b178448712d7acd91ef32fac Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 19 Jul 2014 16:03:55 +0200
Subject: [PATCH] Fix: Translation

---
 htdocs/langs/fa_IR/main.lang | 30 +++++++++++++++---------------
 test/phpunit/LangTest.php    | 10 +++++-----
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang
index df308499c01..73252f2f85a 100644
--- a/htdocs/langs/fa_IR/main.lang
+++ b/htdocs/langs/fa_IR/main.lang
@@ -7,21 +7,21 @@ DIRECTION=لیتر
 FONTFORPDF=DejaVuSans
 FONTSIZEFORPDF=10
 SeparatorDecimal=.
-SeparatorThousand=،
-FormatDateShort=٪ M /٪ د /٪ Y
-FormatDateShortInput=٪ M /٪ د /٪ Y
-FormatDateShortJava=MM / DD / YYYY
-FormatDateShortJavaInput=MM / DD / YYYY
-FormatDateShortJQuery=ماه / روز / سا
-FormatDateShortJQueryInput=ماه / روز / سا
-FormatHourShort=٪ I:٪ M٪ P
-FormatHourShortDuration=٪ H:٪ M
-FormatDateTextShort=٪ B٪ د،٪ Y
-FormatDateText=٪ B٪ د،٪ Y
-FormatDateHourShort=٪ M /٪ د /٪ Y٪ I:٪ M٪ P
-FormatDateHourSecShort=٪ M /٪ د /٪ Y٪ I:٪ M:٪ S٪ P
-FormatDateHourTextShort=٪ B٪ د،٪ Y،٪ I:٪ M٪ P
-FormatDateHourText=٪ B٪ د،٪ Y،٪ I:٪ M٪ P
+SeparatorThousand=None
+FormatDateShort=%m/%d/%Y
+FormatDateShortInput=%m/%d/%Y
+FormatDateShortJava=MM/dd/yyyy
+FormatDateShortJavaInput=MM/dd/yyyy
+FormatDateShortJQuery=yy/dd/mm
+FormatDateShortJQueryInput=yy/dd/mm
+FormatHourShort=%I:%M
+FormatHourShortDuration=%H:%M
+FormatDateTextShort=%b %d %Y
+FormatDateText=%B %d %Y
+FormatDateHourShort=%m/%d/%Y %I:%M:%S %p
+FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
+FormatDateHourTextShort=%b %d %Y %I:%M %p
+FormatDateHourText=%B %d %Y %H:%M %p
 DatabaseConnection=اتصال به پایگاه داده
 NoTranslation=بدون ترجمه
 NoRecordFound=هیچ سابقه ای پیدا نشد
diff --git a/test/phpunit/LangTest.php b/test/phpunit/LangTest.php
index 7d173481501..c0788feef8a 100755
--- a/test/phpunit/LangTest.php
+++ b/test/phpunit/LangTest.php
@@ -146,7 +146,7 @@ class LangTest extends PHPUnit_Framework_TestCase
 		{
 			if (! preg_match('/^[a-z]+_[A-Z]+$/',$code)) continue;
 
-			print 'Check language file for code='.$code."\n";
+			print 'Check language file for lang code='.$code."\n";
 			$tmplangs=new Translate('',$conf);
     		$langcode=$code;
         	$tmplangs->setDefaultLang($langcode);
@@ -154,19 +154,19 @@ class LangTest extends PHPUnit_Framework_TestCase
 
 			$result=$tmplangs->trans("SeparatorDecimal");
 			print __METHOD__." SeparatorDecimal=".$result."\n";
-			$this->assertContains($result,array('.',',','/',' ','','None'), 'Error for code '.$code);
+			$this->assertContains($result,array('.',',','/',' ','','None'), 'Error for decimal separator for lang code '.$code);	// Note that ، that is coma for RTL languages is not supported
 
 			$result=$tmplangs->trans("SeparatorThousand");
 			print __METHOD__." SeparatorThousand=".$result."\n";
-			$this->assertContains($result, array('.',',','/',' ','','None','Space'), 'Error for code '.$code);
+			$this->assertContains($result, array('.',',','/',' ','','None','Space'), 'Error for thousand separator for lang code '.$code);	// Note that ، that is coma for RTL languages is not supported
 
 			// Test java string contains only d,M,y,/,-,. and not m,...
 			$result=$tmplangs->trans("FormatDateShortJava");
 			print __METHOD__." FormatDateShortJava=".$result."\n";
-			$this->assertRegExp('/^[dMy\/\-\.]+$/',$result);
+			$this->assertRegExp('/^[dMy\/\-\.]+$/',$result,'FormatDateShortJava');
 			$result=$tmplangs->trans("FormatDateShortJavaInput");
 			print __METHOD__." FormatDateShortJavaInput=".$result."\n";
-			$this->assertRegExp('/^[dMy\/\-\.]+$/',$result);
+			$this->assertRegExp('/^[dMy\/\-\.]+$/',$result,'FormatDateShortJavaInput');
 
 			unset($tmplangs);
 		}