diff options
| author | Matthieu Napoli <matthieu@mnapoli.fr> | 2014-11-14 01:58:48 +0300 |
|---|---|---|
| committer | Matthieu Napoli <matthieu@mnapoli.fr> | 2014-11-14 01:58:48 +0300 |
| commit | 9ea42bb907d9ddbb1ca7e0868e34b3a46de1973e (patch) | |
| tree | 7e3f6946db2805d085195568b3eecd3a684d32d7 /plugins/CorePluginsAdmin | |
| parent | 40e67157a46111053f4abb5218e9c7246c90d5f9 (diff) | |
| parent | 7f7cc482e54158bf3478cebb5359a2ec0bc58ec9 (diff) | |
Merge branch 'di-config' into tmp-path
Conflicts:
core/Session.php
Diffstat (limited to 'plugins/CorePluginsAdmin')
| -rw-r--r-- | plugins/CorePluginsAdmin/Controller.php | 9 | ||||
| -rw-r--r-- | plugins/CorePluginsAdmin/lang/fr.json | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php index b87fc91579..02020c710d 100644 --- a/plugins/CorePluginsAdmin/Controller.php +++ b/plugins/CorePluginsAdmin/Controller.php @@ -11,7 +11,7 @@ namespace Piwik\Plugins\CorePluginsAdmin; use Exception; use Piwik\API\Request; use Piwik\Common; -use Piwik\Exceptions\HtmlMessageException; +use Piwik\Exception\MissingFilePermissionException; use Piwik\Filechecks; use Piwik\Filesystem; use Piwik\Nonce; @@ -444,10 +444,13 @@ class Controller extends Plugin\ControllerAdmin $messageIntro = Piwik::translate("Warning: \"%s\" could not be uninstalled. Piwik did not have enough permission to delete the files in $path. ", $pluginName); - $exitMessage = $messageIntro . "<br/><br/>" . $messagePermissions; + $exitMessage = $messageIntro . "<br/><br/>" . $messagePermissions; $exitMessage .= "<br> Or manually delete this directory (using FTP or SSH access)"; - throw new HtmlMessageException($exitMessage); + $ex = new MissingFilePermissionException($exitMessage); + $ex->setIsHtmlMessage(); + + throw $ex; } $this->redirectAfterModification($redirectAfter); diff --git a/plugins/CorePluginsAdmin/lang/fr.json b/plugins/CorePluginsAdmin/lang/fr.json index 465054c613..17310355b0 100644 --- a/plugins/CorePluginsAdmin/lang/fr.json +++ b/plugins/CorePluginsAdmin/lang/fr.json @@ -61,7 +61,7 @@ "OriginThirdParty": "Tierce-Partie", "PluginDescription": "Interface d'administration des plugins.", "PluginHomepage": "Page d'accueil du plugin", - "PluginKeywords": "Mots-Clefs", + "PluginKeywords": "Mots-clés", "PluginNotCompatibleWith": "Le composant %1$s n'est pas compatible avec %2$s.", "PluginNotWorkingAlternative": "Si vous avez utilisé ce composant additionnel, peut être pourriez vous trouver une version plus récente sur le Marché. Le cas échéant vous devriez le désinstaller.", "PluginRequirement": "%1$s requiert %2$s.", |