* [FIX] Closes #397. Fixed untranslated string in email subject. Than…

…ks to @lukasp2 for the feedback.
nuxsmin · Jan 31, 2017 · f52563f · f52563f
1 parent 17942b8
commit f52563f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/inc/SP/Controller/ConfigActionController.class.php b/inc/SP/Controller/ConfigActionController.class.php
@@ -689,6 +689,9 @@ protected function exportAction()
 
     /**
      * Acción para realizar el backup de sysPass
+     *
+     * @throws \SP\Core\Exceptions\SPException
+     * @throws \phpmailer\phpmailerException
      */
     protected function backupAction()
     {

diff --git a/inc/SP/Log/Email.class.php b/inc/SP/Log/Email.class.php
@@ -60,7 +60,7 @@ public static function sendEmail(LogMessage $LogMessage, $mailTo = '', $isEvent
 
         if ($isEvent === true) {
             $performer = Session::getUserData()->getUserLogin() ?: __('N/D');
-            $body[] = sprintf('%s: %s', Html::strongText(__('Acción')), $LogMessage->getAction());
+            $body[] = sprintf('%s: %s', Html::strongText(__('Acción')), $LogMessage->getAction(true));
             $body[] = sprintf('%s: %s (%s)', Html::strongText(__('Realizado por')), $performer, $_SERVER['REMOTE_ADDR']);
 
             $Mail->addCC(Config::getConfig()->getMailFrom());
@@ -70,7 +70,7 @@ public static function sendEmail(LogMessage $LogMessage, $mailTo = '', $isEvent
         $body[] = $LogMessage->getHtmlDetails(true);
 
         $Mail->isHTML();
-        $Mail->Body = implode(Log::NEWLINE_HTML, array_merge($body, self::getEmailFooter()));
+        $Mail->Body = implode(Log::NEWLINE_HTML, array_merge($body, Email::getEmailFooter()));
 
         $LogMessage = new LogMessage();
         $LogMessage->setAction(__('Enviar Email', false));