Merge pull request #194 from owncloud/always-prepare-parameters

Always prepare parameters for extensions
owncloud · Dec 12, 2014 · 35ae9ac · 35ae9ac
2 parents f6b09d7 + fce36ba
commit 35ae9ac
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/lib/datahelper.php b/lib/datahelper.php
@@ -59,11 +59,12 @@ public function translation($app, $text, $params, $stripPath = false, $highlight
 			return '';
 		}
 
+		$preparedParams = $this->parameterHelper->prepareParameters(
+			$params, $this->parameterHelper->getSpecialParameterList($app, $text),
+			$stripPath, $highlightParams
+		);
+
 		if ($app === 'files') {
-			$preparedParams = $this->parameterHelper->prepareParameters(
-				$params, $this->parameterHelper->getSpecialParameterList($app, $text),
-				$stripPath, $highlightParams
-			);
 			switch ($text) {
 				case 'created_self':
 					return $this->l->t('You created %1$s', $preparedParams);
@@ -96,14 +97,14 @@ public function translation($app, $text, $params, $stripPath = false, $highlight
 
 		// Allow other apps to correctly translate their activities
 		$translation = $this->activityManager->translate(
-			$app, $text, $params, $stripPath, $highlightParams, $this->l->getLanguageCode());
+			$app, $text, $preparedParams, $stripPath, $highlightParams, $this->l->getLanguageCode());
 
 		if ($translation !== false) {
 			return $translation;
 		}
 
 		$l = Util::getL10N($app);
-		return $l->t($text, $params);
+		return $l->t($text, $preparedParams);
 	}
 
 	/**