Few fixes

diff --git a/galette/includes/dependencies.php b/galette/includes/dependencies.php
index 03a698b384027cabac0ab8f77ba4fa85e095cf4b..49b4fed34f27ada9049d96842302b46b7f4f9cac 100644 (file)
--- a/galette/includes/dependencies.php
+++ b/galette/includes/dependencies.php
@@ -168,7 +168,7 @@ $container['flash'] = function ($c) {
     return new \Slim\Flash\Messages();
 };
 
-$container['plugins'] = function ($c) use ($app) {
+$container['plugins'] = function ($c) {
     $plugins = new Galette\Core\Plugins();
     $i18n = $c->get('i18n');
     $plugins->loadModules($c->get('preferences'), GALETTE_PLUGINS_PATH, $i18n->getLongID());
@@ -541,7 +541,7 @@ $container['logger'] = function ($c) {
     $settings = $c->get('settings');
     $logger = new \Monolog\Logger($settings['logger']['name']);
     $logger->pushProcessor(new \Monolog\Processor\UidProcessor());
-    $logger->pushHandler(new \Monolog\Handler\StreamHandler($settings['logger']['path'], $setting['logger']['level']));
+    $logger->pushHandler(new \Monolog\Handler\StreamHandler($settings['logger']['path'], $settings['logger']['level']));
     return $logger;
 };
 

diff --git a/galette/includes/i18n.inc.php b/galette/includes/i18n.inc.php
index 2bb7b72c4ef0ee5ea230ce79edc6ef0d70945097..aa2cfef614cc9a7ef2150302b978ed9b266a3d11 100644 (file)
--- a/galette/includes/i18n.inc.php
+++ b/galette/includes/i18n.inc.php
@@ -89,7 +89,6 @@ function addDynamicTranslation($text_orig)
                     Analog::INFO
                 );
 
-                $where = array();
                 $owhere = $select->where;
 
                 $update = $zdb->update(L10n::TABLE);
@@ -201,7 +200,6 @@ function updateDynamicTranslation($text_orig, $text_locale, $text_trans)
         );
 
         if ($exists) {
-            $where = array();
             $owhere = $select->where;
 
             $update = $zdb->update(L10n::TABLE);
@@ -232,7 +230,7 @@ function updateDynamicTranslation($text_orig, $text_locale, $text_trans)
  * @param string $text_orig   Text to translate
  * @param string $text_locale The locale
  *
- * @return translated string
+ * @return string
  */
 function getDynamicTranslation($text_orig, $text_locale)
 {
@@ -265,13 +263,13 @@ function getDynamicTranslation($text_orig, $text_locale)
 }
 
 /**
- * Translate a string
+ * Translate a string, or return original one
  *
  * @param string  $string The string to translate
  * @param string  $domain Translation domain. Default to false (will take default domain)
  * @param boolean $nt     Indicate not translated strings; defaults to true
  *
- * @return Translated string (if available) ; $chaine otherwise
+ * @return string
  */
 function _T($string, $domain = 'galette', $nt = true)
 {
@@ -313,7 +311,7 @@ function _T($string, $domain = 'galette', $nt = true)
  * @param string $string The string to translate
  * @param string $domain Translation domain. Default to false (will take default domain)
  *
- * @return Translated string (if available), verbatim string otherwise
+ * @return string
  */
 function __($string, $domain = 'galette')
 {