From 78cc643188ea3ddef0ab11f9849f67e63ca23632 Mon Sep 17 00:00:00 2001
From: robocoder <anthon.pang@gmail.com>
Date: Wed, 16 Mar 2011 16:22:56 +0000
Subject: [PATCH] minor fixes when writing a clean translation; update expected
 test result

git-svn-id: http://dev.piwik.org/svn/trunk@4103 59fd770c-687e-43c8-a1e3-f5a4ff64c105
---
 .../tests/LanguagesManager.test.php           |  9 ++-
 ...agesManager.getTranslationsForLanguage.xml | 56 +++++++++----------
 2 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/plugins/LanguagesManager/tests/LanguagesManager.test.php b/plugins/LanguagesManager/tests/LanguagesManager.test.php
index df51c4bb7e..459e5855a7 100644
--- a/plugins/LanguagesManager/tests/LanguagesManager.test.php
+++ b/plugins/LanguagesManager/tests/LanguagesManager.test.php
@@ -115,7 +115,14 @@ class Test_Languages_Manager extends UnitTestCase
 		{
 			if(!empty($value))
 			{
-				$tstr .= "\t'".$key."' => '".addcslashes($value,"'")."',".PHP_EOL;
+				if(strpos($value, "\n") === false && strpos($value, '$') === false)
+				{
+					$tstr .= "\t'".$key."' => '".addcslashes($value,"'")."',".PHP_EOL;
+				}
+				else
+				{
+					$tstr .= "\t'".$key."' => \"".addclashes($value,'"$').'",'.PHP_EOL;
+				}
 			}
 		}
 		$tstr .= ');'.PHP_EOL;
diff --git a/tests/integration/expected/test_apiGetReportMetadata_year__LanguagesManager.getTranslationsForLanguage.xml b/tests/integration/expected/test_apiGetReportMetadata_year__LanguagesManager.getTranslationsForLanguage.xml
index deb3dee39d..ad4a31cd3d 100644
--- a/tests/integration/expected/test_apiGetReportMetadata_year__LanguagesManager.getTranslationsForLanguage.xml
+++ b/tests/integration/expected/test_apiGetReportMetadata_year__LanguagesManager.getTranslationsForLanguage.xml
@@ -4936,6 +4936,34 @@
 		<label>PDFReports_YouMustBeLoggedIn</label>
 		<value>Vous devez être connecté afin de pouvoir créer et planifier des rapports PDF personnalisés.</value>
 	</row>
+	<row>
+		<label>ExamplePlugin_PluginDescription</label>
+		<value>Plugin d'exemple: ce plugin décrit comment créer un plugin très simple qui exporte 2 widgets du tableau de bord</value>
+	</row>
+	<row>
+		<label>ExamplePlugin_exampleWidgets</label>
+		<value>Widgets d'exemple</value>
+	</row>
+	<row>
+		<label>ExamplePlugin_exampleWidget</label>
+		<value>Widget d'exemple</value>
+	</row>
+	<row>
+		<label>ExamplePlugin_blogPiwikRss</label>
+		<value>Flux RSS du blog Piwik</value>
+	</row>
+	<row>
+		<label>ExamplePlugin_photostreamMatt</label>
+		<value>Photos de Matt</value>
+	</row>
+	<row>
+		<label>ExamplePlugin_piwikDownloads</label>
+		<value>Téléchargements de Piwik</value>
+	</row>
+	<row>
+		<label>ExamplePlugin_PiwikHasBeenDownloaded</label>
+		<value>En %s, Piwik a été téléchargé %s fois.</value>
+	</row>
 	<row>
 		<label>General_Export</label>
 		<value>Exporter</value>
@@ -5100,26 +5128,6 @@
 		<label>VisitsSummary_Report</label>
 		<value>Rapport</value>
 	</row>
-	<row>
-		<label>ExamplePlugin_PluginDescription</label>
-		<value>Plugin d'exemple: ce plugin décrit comment créer un plugin très simple qui exporte 2 widgets du tableau de bord</value>
-	</row>
-	<row>
-		<label>ExamplePlugin_exampleWidgets</label>
-		<value>Widgets d'exemple</value>
-	</row>
-	<row>
-		<label>ExamplePlugin_exampleWidget</label>
-		<value>Widget d'exemple</value>
-	</row>
-	<row>
-		<label>ExamplePlugin_blogPiwikRss</label>
-		<value>Flux RSS du blog Piwik</value>
-	</row>
-	<row>
-		<label>ExamplePlugin_photostreamMatt</label>
-		<value>Photos de Matt</value>
-	</row>
 	<row>
 		<label>General_DisplayGoals</label>
 		<value>Afficher les objectifs</value>
@@ -5176,12 +5184,4 @@
 		<label>PDFReports_ManagePdfReports</label>
 		<value>Gérer les rapports PDF</value>
 	</row>
-	<row>
-		<label>ExamplePlugin_piwikDownloads</label>
-		<value>Téléchargements de Piwik</value>
-	</row>
-	<row>
-		<label>ExamplePlugin_PiwikHasBeenDownloaded</label>
-		<value>En %s, Piwik a été téléchargé %s fois.</value>
-	</row>
 </result>
\ No newline at end of file
-- 
GitLab