diff --git a/app/Http/Controllers/LanguageController.php b/app/Http/Controllers/LanguageController.php index 1f3487158457dcc4d4efb5b7d8c310193b2bcc83..0e6330453866eba28c768f9335efaf9be6bab6f7 100644 --- a/app/Http/Controllers/LanguageController.php +++ b/app/Http/Controllers/LanguageController.php @@ -195,7 +195,6 @@ class LanguageController extends Controller } } - $t = []; $fn = ""; #Wähle die erste Datei aus, welche nicht ausgeschlossen worden ist @@ -209,29 +208,33 @@ class LanguageController extends Controller } } } - - #Speichere den Inhalt der ausgewählten Datei in Array $t ab + + $snippets = []; + + #Speichere den Inhalt der ausgewählten Datei in allen Sprachen in $snippets ab foreach($languageObjects as $folder => $languageObject) { foreach($languageObject->stringMap as $languageFileName => $languageFile) { if($languageFileName === $fn) { - $t[$languageObject->language] = $languageFile; + foreach($languageFile as $key => $value) { + $snippets[$key][$languageObject->language] = $value; + } continue 2; } } } - foreach($t as $language => $text) { - // foreach($text as $key => $value) { - echo("<p>"); - var_dump($text); - echo("</p>"); - //} + #Fülle $snippets auf mit leeren Einträgen für übrige Sprachen + foreach($to as $t) { + foreach($snippets as $key => $langArray) { + if(!isset($langArray[$t])) { + $snippets[$key][$t] = ""; + } + } } - die(); return view('languages.synoptic') ->with('to', $to) #Alle vorhandenen Sprachen - ->with('texts', $t) #Array mit Sprachsnippets + ->with('texts', $snippets) #Array mit Sprachsnippets ->with('filename', $fn) #Name der Datei ->with('title', trans('titles.languages.edit')); } diff --git a/app/Http/Controllers/MailController.php b/app/Http/Controllers/MailController.php index 2416f2702e04ec8f71bd0fd9c609d446dd64b440..90dd4dceeac763157e064ea50da617f62b6643ee 100644 --- a/app/Http/Controllers/MailController.php +++ b/app/Http/Controllers/MailController.php @@ -204,11 +204,11 @@ class MailController extends Controller if ($new > 0) { if($emailAddress !== "") { - Mail::to("aria@suma-ev.de") + Mail::to("dev@suma-ev.de") ->send(new Sprachdatei($message, $output, basename($filename), $emailAddress)); } else { - Mail::to("aria@suma-ev.de") + Mail::to("dev@suma-ev.de") ->send(new Sprachdatei($message, $output, basename($filename))); } } diff --git a/resources/views/languages/synoptic.blade.php b/resources/views/languages/synoptic.blade.php index 713cea0e858121991bbfb956886c458c44d6a960..1ce303621bc04cff3d6dfba01065adc23756ceb1 100644 --- a/resources/views/languages/synoptic.blade.php +++ b/resources/views/languages/synoptic.blade.php @@ -26,32 +26,19 @@ @endforeach </tr> </thead> -<?php /*<tbody> - @foreach($texts as $name => $langValues) - @if($langValues === "") - <tr> - <td class="name language-name">{{preg_replace("/(\s*).*#(.*)$/si", "$1$2", $name)}}</td> - <td></td> - <td></td> - </tr> - @else - <tr> <!--Key --> - <td class="name language-name">{{preg_replace("/(\s*).*#(.*)$/si", "$1$2", $name)}}</td> - <td> - @if(isset($langValues[$to])) - <textarea class="language-text-area" type="text" rows="1" cols="50" form="submit" name="{{ base64_encode($name) }}">{{$langValues[$to]}}</textarea> - @else - <textarea class="language-text-area" rows="1" cols="50" form="submit" name="{{base64_encode("_new_" . $name)}}"></textarea> - @endif - </td> - @foreach($langs as $lang => $value) - <td>{!! $langValues[$lang] or "" !!}</td> - @endforeach - </tr> - @endif + <tbody> + @foreach($texts as $key => $language) + <tr> <!--Key --> + <td class="name language-name">{{preg_replace("/(\s*).*#(.*)$/si", "$1$2", $key)}}</td> + @foreach($language as $lang => $languageValue) + <td> + <textarea class="language-text-area" rows="1" cols="50" form="submit" name="{{base64_encode("_new_" . $key)}}">{{ $languageValue }} </textarea> + </td> + @endforeach + </tr> @endforeach - </tbody> */ -?> + </tbody> + </table> <!-- <p>{{ trans('languages.hinweis.1') }}</p>