Refs #4202 removing functions Piwik_Translate and Piwik_TranslateException

2 files changed, 6 insertions, 5 deletions

diff --git a/plugins/Feedback/Controller.php b/plugins/Feedback/Controller.php
index b7ce4e8b49..ee2f37f637 100644
--- a/plugins/Feedback/Controller.php
+++ b/plugins/Feedback/Controller.php
@@ -54,16 +54,16 @@ class Controller extends \Piwik\Controller
                 || strpos($email, 'probe@') !== false
                 || strpos($body, '<probe') !== false
             ) {
-                throw new Exception(Piwik_TranslateException('Feedback_ExceptionBodyLength', array($minimumBodyLength)));
+                throw new Exception(Piwik::translateException('Feedback_ExceptionBodyLength', array($minimumBodyLength)));
             }
             if (!Piwik::isValidEmailString($email)) {
-                throw new Exception(Piwik_TranslateException('UsersManager_ExceptionInvalidEmail'));
+                throw new Exception(Piwik::translateException('UsersManager_ExceptionInvalidEmail'));
             }
             if (preg_match('/https?:/i', $body)) {
-                throw new Exception(Piwik_TranslateException('Feedback_ExceptionNoUrls'));
+                throw new Exception(Piwik::translateException('Feedback_ExceptionNoUrls'));
             }
             if (!Nonce::verifyNonce('Feedback.sendFeedback', $nonce)) {
-                throw new Exception(Piwik_TranslateException('General_ExceptionNonceMismatch'));
+                throw new Exception(Piwik::translateException('General_ExceptionNonceMismatch'));
             }
             Nonce::discardNonce('Feedback.sendFeedback');
 
diff --git a/plugins/Feedback/Feedback.php b/plugins/Feedback/Feedback.php
index e48b416c37..f59e988a24 100644
--- a/plugins/Feedback/Feedback.php
+++ b/plugins/Feedback/Feedback.php
@@ -9,6 +9,7 @@
  * @package Feedback
  */
 namespace Piwik\Plugins\Feedback;
+use Piwik\Piwik;
 
 
 /**
@@ -39,7 +40,7 @@ class Feedback extends \Piwik\Plugin
             true,
             $order = 20,
             $isHTML = false,
-            $tooltip = Piwik_Translate('Feedback_TopLinkTooltip')
+            $tooltip = Piwik::translate('Feedback_TopLinkTooltip')
         );
     }