From 175b62493fe2dd4dff984dba8664d4f75bb19740 Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Fri, 7 Feb 2014 12:16:13 +1300
Subject: [PATCH] Refs #4439 inlining the message as to not create new
translation for this edge case.
---
core/Plugin/ControllerAdmin.php | 4 +++-
lang/en.json | 3 +--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/core/Plugin/ControllerAdmin.php b/core/Plugin/ControllerAdmin.php
index 72ef900287..a60b5972b0 100644
--- a/core/Plugin/ControllerAdmin.php
+++ b/core/Plugin/ControllerAdmin.php
@@ -121,7 +121,9 @@ abstract class ControllerAdmin extends Controller
{
if (self::$isEacceleratorUsed) {
$params = array('<a href="http://dev.piwik.org/trac/ticket/4439">', '</a>');
- $message = Piwik::translate('CoreAdminHome_EacceleratorNotCompatible', $params);
+ $message = sprintf("You are using the PHP accelerator & optimizer eAccelerator which is known to be not compatible with Piwik.
+ We have disabled eAccelerator, which might affect the performance of Piwik.
+ Read the %srelated ticket%s for more information and how to fix this problem.", $params);
$notification = new Notification($message);
$notification->context = Notification::CONTEXT_WARNING;
diff --git a/lang/en.json b/lang/en.json
index da10eeefa0..1dbcea0f44 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -585,8 +585,7 @@
"PluginSettingsIntro": "Here you can change the settings for the following 3rd party plugins:",
"PluginSettingsValueNotAllowed": "The value for field \"%s\" in plugin \"%s\" is not allowed",
"PluginSettingChangeNotAllowed": "You are not allowed to change the value of the setting \"%s\" in plugin \"%s\"",
- "PluginSettings": "Plugin settings",
- "EacceleratorNotCompatible": "You are using the PHP accelerator & optimizer eAccelerator which is known to be not compatible with Piwik. We have disabled eAccelerator therefore which might affect the performance of Piwik. Read the %srelated ticket%s for more information and how to fix this problem."
+ "PluginSettings": "Plugin settings"
},
"CoreHome": {
"InjectedHostWarningIntro": "You are now accessing Piwik from %1$s, but Piwik has been configured to run at this address: %2$s.",
--
GitLab