Fix translation edit in last commit and remove local config check in FrontController since it's done by EnvironmentValidator.

3 files changed, 4 insertions, 29 deletions

diff --git a/core/FrontController.php b/core/FrontController.php
index 06c08293f4..d4aed5c313 100644
--- a/core/FrontController.php
+++ b/core/FrontController.php
@@ -189,31 +189,10 @@ class FrontController extends Singleton
     /**
      * Loads the config file
      * This is overridden in tests to ensure test config file is used
-     *
-     * @return Exception
      */
     public static function createConfigObject()
     {
-        $exceptionToThrow = false;
-        try {
-            Config::getInstance()->database; // access property to check if the local file exists
-        } catch (Exception $exception) {
-            Log::debug($exception);
-
-            /**
-             * Triggered when the configuration file cannot be found or read, which usually
-             * means Piwik is not installed yet.
-             *
-             * This event can be used to start the installation process or to display a custom error message.
-             *
-             * @param Exception $exception The exception that was thrown by `Config::getInstance()`.
-             *
-             * TODO: remove?
-             */
-            Piwik::postEvent('Config.NoConfigurationFile', array($exception), $pending = true);
-            $exceptionToThrow = $exception;
-        }
-        return $exceptionToThrow;
+        Config::getInstance()->database; // access property
     }
 
     /**
@@ -235,7 +214,7 @@ class FrontController extends Singleton
         }
         $initialized = true;
 
-        $exceptionToThrow = self::createConfigObject();
+        self::createConfigObject();
 
         $tmpPath = StaticContainer::get('path.tmp');
 
@@ -257,10 +236,6 @@ class FrontController extends Singleton
         Plugin\Manager::getInstance()->loadPluginTranslations();
         Plugin\Manager::getInstance()->loadActivatedPlugins();
 
-        if ($exceptionToThrow) {
-            throw $exceptionToThrow;
-        }
-
         // try to connect to the database
         try {
             Db::createDatabaseObject();
diff --git a/core/Plugin/Manager.php b/core/Plugin/Manager.php
index 1cdf9ebb2e..bf6906cfc8 100644
--- a/core/Plugin/Manager.php
+++ b/core/Plugin/Manager.php
@@ -1278,7 +1278,7 @@ class Manager
      *
      * @return array
      */
-    protected function getPluginsFromGlobalIniConfigFile() // TODO: if this is only used for sorting, move to PluginList
+    protected function getPluginsFromGlobalIniConfigFile()
     {
         return $this->pluginList->getPluginsBundledWithPiwik();
     }
diff --git a/lang/en.json b/lang/en.json
index f9db2406e4..0c23f98ef5 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -145,7 +145,7 @@
         "ExceptionContactSupportGeneric": "If you still have this issue please %scontact your Piwik administrator%s for assistance. ",
         "ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "The user has to be either a Super User or the user '%s' itself.",
         "ExceptionConfigurationFileNotFound": "The configuration file {%s} has not been found or could not be read.",
-        "ExceptionConfigurationFileNotFound2": "If the file exists, please check that %s is readable by the user '%s'."
+        "ExceptionConfigurationFileNotFound2": "If the file exists, please check that %s is readable by the user '%s'.",
         "ExceptionDatabaseVersion": "Your %1$s version is %2$s but Piwik requires at least %3$s.",
         "ExceptionDatabaseVersionNewerThanCodebase": "Your Piwik codebase is running the old version %1$s and we have detected that your Piwik Database has already been upgraded to the newer version %2$s.",
         "ExceptionDatabaseVersionNewerThanCodebaseWait": "Maybe your Piwik administrators are currently finishing the upgrade process. Please try again in a few minutes.",