mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-01-24 17:27:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate
2016-09-12 22:23:50 +00:00
parent 3206bbb41d b1aa16f7a9
commit ebc1237ddc
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/language/de/common_lang.php
View File

@@ -3,7 +3,7 @@
$lang["common_address_1"] = "Adresse 1";
$lang["common_address_2"] = "Adresse 2";
$lang["common_city"] = "Stadt";
$lang["common_close"] = "Close";
$lang["common_close"] = "Schließen";
$lang["common_comments"] = "Kommentare";
$lang["common_common"] = "Allgemein";
$lang["common_confirm_search"] = "Sie haben einen oder mehrere Zeilen gewählt. Nach der Verarbeitung werden diese nicht mehr selektiert sein. Wollen Sie die Suche dennoch verarbeiten?";

1
application/language/sv/bootstrap_tables_lang.php Normal file
View File

@@ -0,0 +1 @@
<?php

21
application/libraries/Email_lib.php
View File

@@ -33,16 +33,25 @@ class Email_lib
*/
public function sendEmail($to, $subject, $message, $attachment = NULL)
{
$this->CI->email->from($this->CI->config->item('email'), $this->CI->config->item('company'));
$this->CI->email->to($to);
$this->CI->email->subject($subject);
$this->CI->email->message($message);
$email = $this->CI->email;
$email->from($this->CI->config->item('email'), $this->CI->config->item('company'));
$email->to($to);
$email->subject($subject);
$email->message($message);
if( !empty($attachment) )
{
$this->CI->email->attach($attachment);
$email->attach($attachment);
}
return $this->CI->email->send();
$result = $email->send();
if(!$result)
{
error_log($email->print_debugger());
}
return $result;
}
}