Commit 23001034 authored by Dominik Hebeler's avatar Dominik Hebeler

Merge branch 'development' into 'carsten-development-patch-87634'

# Conflicts:
#   resources/lang/es/index.php
parents 69900c52 9795ccc1
......@@ -9,8 +9,8 @@ use Illuminate\Http\Response;
use LaravelLocalization;
use Mail;
use Validator;
use \IBAN;
use \IBANCountry;
use \PHP_IBAN\IBAN;
use \PHP_IBAN\IBANCountry;
class MailController extends Controller
{
......@@ -55,7 +55,7 @@ class MailController extends Controller
} else {
# Wir versenden die Mail des Benutzers an uns:
$mailto = "support@metager.org";
if(LaravelLocalization::getCurrentLocale() === "de"){
if (LaravelLocalization::getCurrentLocale() === "de") {
$mailto = "support@suma-ev.de";
}
$message = $request->input('message');
......
......@@ -141,13 +141,13 @@ Results.prototype.addToContainer = function (container) {
var options = $('\
<div id="saver-options">\
<div class="saver-option saver-option-filter">\
<input class="form-control" type="text" placeholder="&#xf0b0 ' + t('result-saver.filter') + '">\
<input style="font-family: \'Font Awesome 5 Free\', sans-serif;" class="form-control" type="text" placeholder="&#xf0b0 ' + t('result-saver.filter') + '">\
</div>\
<div class="saver-option saver-option-sort">\
<select class="form-control" style="font-family: FontAwesome, sans-serif;">\
<option value="chronological" style="font-family: FontAwesome, sans-serif;">&#xf017 ' + t('result-saver.sort.chronological') + '</option>\
<option value="rank" style="font-family: FontAwesome, sans-serif;">&#xf162 ' + t('result-saver.sort.ranking') + '</option>\
<option value="alphabetical" style="font-family: FontAwesome, sans-serif;">&#xf15d ' + t('result-saver.sort.alphabetical') + '</option>\
<select class="form-control" style="font-family: \'Font Awesome 5 Free\', sans-serif;">\
<option value="chronological" style="font-family: \'Font Awesome 5 Free\', sans-serif;">&#xf017 ' + t('result-saver.sort.chronological') + '</option>\
<option value="rank" style="font-family: \'Font Awesome 5 Free\', sans-serif;">&#xf162 ' + t('result-saver.sort.ranking') + '</option>\
<option value="alphabetical" style="font-family: \'Font Awesome 5 Free\', sans-serif;">&#xf15d ' + t('result-saver.sort.alphabetical') + '</option>\
</select>\
</div>\
<div class="saver-option saver-option-delete">\
......
......@@ -28,13 +28,13 @@ return [
"focus-creator.focusname" => "Focus:",
'about.1.1' => "Guaranteed Privacy",
'about.1.2' => 'With us you have full control over your data.',
'about.2.1' => 'Nonprofit organization',
'about.2.2' => 'We as SUMA-EV are independent because we do not pursue commercial interests!',
'about.3.1' => 'Support & Donate',
'about.3.2' => 'With your donation you support the work of the SUMA-EV and the operation of MetaGer.',
'about.4.1' => 'Join in!',
'about.4.2' => 'Strengthen us by becoming a member.',
'about.1.2' => 'With us you have full control over your data. We don\'t track and our source code is free.',
'about.2.1' => 'Diverse & free',
'about.2.2' => 'MetaGer protects against censorship by combining the results of multiple search engines.',
'about.3.1' => '100 % renewable energy',
'about.3.2' => 'All of our services are run using renewable energy. Sustainable and clean.',
'about.4.1' => 'Nonprofit organization',
'about.4.2' => 'Strengthen us by becoming a member or by donating to our nonprofit organization!',
'lang.tooltip' => 'Language',
'key.placeholder' => 'Enter member key',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment