From 44d2bbd0a72b1320986a877c071e59518787b5e7 Mon Sep 17 00:00:00 2001
From: Aria <aria@suma-ev.de>
Date: Tue, 13 Jun 2017 11:22:34 +0200
Subject: [PATCH] =?UTF-8?q?kleinere=20=C3=84nderungen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitignore | 1 +
app/Http/Controllers/LanguageController.php | 8 +-
public/langfiles.zip | Bin 1283 -> 0 bytes
resources/views/languages/synoptic.blade.php | 2 +-
synoptic | 336 -------------------
5 files changed, 4 insertions(+), 343 deletions(-)
delete mode 100644 public/langfiles.zip
delete mode 100644 synoptic
diff --git a/.gitignore b/.gitignore
index e06d9263d..dffc66b4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ Homestead.yaml
.env
.orig
.vscode
+langfiles.zip
# The Files created by Gulp in the build process
/public/build
/public/js/lib.js
diff --git a/app/Http/Controllers/LanguageController.php b/app/Http/Controllers/LanguageController.php
index 80d3fecf8..44696372d 100644
--- a/app/Http/Controllers/LanguageController.php
+++ b/app/Http/Controllers/LanguageController.php
@@ -97,6 +97,7 @@ class LanguageController extends Controller
$fn = "";
$t = [];
$ex = ['files' => [], 'new' => 0];
+
if ($exclude !== "") {
try {
$ex = unserialize(base64_decode($exclude));
@@ -143,7 +144,6 @@ class LanguageController extends Controller
}
$t = $this->htmlEscape($t, $to);
$t = $this->createHints($t, $to);
-
return view('languages.edit')
->with('texts', $t) //Array mit vorhandenen Ãœbersetzungen der Datei $fn in beiden Sprachen
->with('filename', $fn) //Pfad zur angezeigten Datei
@@ -162,7 +162,7 @@ class LanguageController extends Controller
$languageFolders = scandir($languageFilePath);
#Enthält zu jeder Sprache ein Objekt mit allen Daten
$languageObjects = [];
- $to = [];
+ $to = []; #Alle vorhandenen Sprachen
#Dekodieren ausgeschlossener Dateien anhand des URL-Parameters
$ex = ['files' => [], 'new' => 0];
@@ -210,10 +210,6 @@ class LanguageController extends Controller
}
}
- if($fn === "") {
- //Alles bearbeitet -> zeige entsprechende Nachricht
- }
-
$snippets = [];
#Speichere den Inhalt der ausgewählten Datei in allen Sprachen in $snippets ab
diff --git a/public/langfiles.zip b/public/langfiles.zip
deleted file mode 100644
index 601229310be12f9f35e1c77f29b1b62ab90afe68..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1283
zcmWIWW@Zs#0D<$qd%eI6D8US*Q&RN<pb9v^3d{|Sbeez?^MF_kqM#_XI5n{-IU_MI
zr6e(_Sg#<XAhdTk-ys7YhUd?;*PIa*>e*wZ#I}sjLxJsbgs)4s(rv~4{;FzuJKyHr
ze>!8X@Fpdma&~Sz|5TqnQNN!R<owyXLdx(<XB5W@uICyXYESLf;*2@*VT*)%>%9rg
zUKfmxNS1bVa@wg(wa{r5H!9!vcXm$QWa*`X&r|}08z;^x@1Ogd3Fd0--b&3w^On*7
z`Pb@!-kA;c7El3BZwaux{-GVVPFY2xa;f8@MT=ZS+>0J`95H*oS?8aevevdpU*pYh
z7j+-w$QJAGcAVQAT-Q^#am(4f`!^0-Jdib-XE#OcmB)UKi2Ev2jx^1)DN33X@iJnj
zkejc>55LMF6}6YLH^SA+D@3=wjZgpjdQPmy49Tx+cIKU7C*Y@IG(R1k*C$g4^v@)i
zpNg^ismB@^RRXN9e~9?66BL^ACn#v?A{R}wkDn%bTwAmE)Jh9xp%@-zEw}Zv)Xy&K
zoBm=>k(q2^iN=qL&7Vu>=+|t$8~X37O~Cg$0i9I79n#8@8(xJhJJOXQvt!PZ42#SE
zR=WuPI8r<9*7<*nPRDPVIAv-{!WSbBjaH-gx3>Of!0)BBA~Y}gzhf?Q19~SE>Ls88
zEYY-iqy7nv2amM8bTxHP1$R6PVqjX@H0RQnGd8x)s(#VdeoH4^Ir2zIRaQh(xnoLx
zU7Tm&s=U0qWllwPd3jlJokHPjOvQmtV`LIx#+@~QP5^`djvxx0QD7RdXBCKY28L~o
ziVzK0oKC!@*MVk$lQF8L=m{BN=?{noiY#5t2(%QG&QL8yPiY8C&p<R#WN94}0|PiE
gpjwKa77&)shiJfRDJvUD9S0Cz0Xj_*RK_s?0JG+ERsaA1
diff --git a/resources/views/languages/synoptic.blade.php b/resources/views/languages/synoptic.blade.php
index 234a05754..70b2bedef 100644
--- a/resources/views/languages/synoptic.blade.php
+++ b/resources/views/languages/synoptic.blade.php
@@ -3,7 +3,7 @@
@section('title', $title )
@section('content')
- <h1>Ãœbersicht</h1>
+ <h1>{{ trans('languages.header') }}</h1>
<?php /*
<!--
<div class="progress">
diff --git a/synoptic b/synoptic
deleted file mode 100644
index fc24c0f08..000000000
--- a/synoptic
+++ /dev/null
@@ -1,336 +0,0 @@
-
-
-
-<!DOCTYPE html>
-<html lang="de">
- <head>
- <meta charset="utf-8" />
- <meta http-equiv="content-type" content="text/html; charset=utf-8" />
- <title>Sprachdateien bearbeiten - MetaGer</title>
- <meta name="description" content="Sicher suchen und finden unter Wahrung der Privatsphäre. Das digitale Wissen der Welt muss ohne Bevormundung durch Staaten oder Konzerne frei zugänglich sein und bleiben." />
- <meta name="keywords" content="Internetsuche, privatsphäre, privacy, Suchmaschine, Datenschutz, Anonproxy, anonym suchen, Bildersuche, Suchmaschine, anonym, MetaGer, metager, metager.de" />
- <meta name="page-topic" content="Dienstleistung" />
- <meta name="robots" content="index,follow" />
- <meta name="revisit-after" content="7 days" />
- <meta name="audience" content="all" />
- <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
- <meta rel="icon" type="image/x-icon" href="/favicon.ico" />
- <meta rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
- <META HTTP-EQUIV="CACHE-CONTROL" CONTENT="NO-CACHE" />
- <meta HTTP-EQUIV="PRAGMA" CONTENT="NO-CACHE" />
- <link rel="search" type="application/opensearchdescription+xml" title="MetaGer: Sicher suchen & finden, Privatsphäre schützen" href="http://localhost:8000/plugins/YTowOnt9/opensearch.xml">
- <link type="text/css" rel="stylesheet" href="/css/themes/default.css" />
- <link id="theme" type="text/css" rel="stylesheet" href="/css/theme.css.php" />
- </head>
- <body>
- <header>
- <a class="navbar-brand" href="http://localhost:8000/">
- <div class="logo">
- <h1>MetaGer</h1>
- </div>
- </a>
- <nav id="navbar-static-pages" class="navbar-resultpage">
-
-
- <ul id="metager-static-nav-list" class="list-inline pull-right">
- <li id="toggle-nav-hide" class="hidden">
- <a class="metager-navbar-toggle pull-right" href="#" data-original-title="" title="">
- <span class="sr-only">Navigation anzeigen</span>
- <i class="fa fa-bars" aria-hidden="true"></i>
- </a>
- <div class="clearfix"></div>
- </li>
- <li id="toggle-nav-show">
- <a class="metager-navbar-toggle pull-right" href="#metager-static-nav-list" data-original-title="" title="">
- <span class="sr-only">Navigation anzeigen</span>
- <i class="fa fa-bars" aria-hidden="true"></i>
- </a>
- <div class="clearfix"></div>
- </li>
- <li class="active" >
- <a href="http://localhost:8000/" tabindex="200" id="navigationSuche">Suche</a>
- </li>
- <li class="metager-dropdown" >
- <a class="metager-dropdown-toggle" role="button" aria-expanded="false" tabindex="201">Fördern
- <span class="caret"></span></a>
- <ul class="metager-dropdown-menu">
- <li>
- <a href="http://localhost:8000/spende" tabindex="202">Spenden</a>
- </li>
- <li>
- <a href="http://localhost:8000/beitritt" tabindex="203">Beitrittsformular SUMA-EV</a>
- </li>
- <li>
- <a href="https://www.boost-project.com/de/shops?charity_id=1129&tag=bl" tabindex="204">Einkaufen bei MetaGer-Fördershops</a>
- </li>
- </ul>
- </li>
- <li id="gutscheine" class="metager-dropdown" >
- <a href="https://metager.de/gutscheine/">Gutscheine</a>
- <a class="metager-dropdown-toggle" data-role="button" aria-expanded="false" tabindex="205"><span class="caret"></span></span>
- <ul class="metager-dropdown-menu">
- <li>
- <a href="https://metager.de/gutscheine/congstar/" tabindex="206" >Congstar Gutschein</a>
- </li>
- <li>
- <a href="https://metager.de/gutscheine/check24/" tabindex="207" >Check24 Gutschein</a>
- </li>
- <li>
- <a href="https://metager.de/gutscheine/handyflash/" tabindex="208" >Handyflash Gutschein</a>
- </li>
- <li>
- <a href="https://metager.de/gutscheine/groupon/" tabindex="209" >Groupon Gutschein</a>
- </li>
- <li>
- <a href="https://metager.de/gutscheine/medion/" tabindex="210" >Medion Gutschein</a>
- </li>
- <li>
- <a href="https://metager.de/gutscheine/navabi/" tabindex="211" >Navabi Gutschein</a>
- </li>
- <li>
- <a href="https://metager.de/gutscheine/netcologne/" tabindex="212" >Netcologne Gutschein</a>
- </li>
- <li>
- <a href="https://metager.de/gutscheine/teufel/" tabindex="213" >Teufel Gutschein</a>
- </li>
- <li role="separator" class="divider"></li>
- <li>
- <a href="https://metager.de/gutscheine/alle-gutscheine/" tabindex="214" >Alle Gutscheine</a>
- </li>
- </ul>
- </li>
- <li >
- <a href="http://localhost:8000/datenschutz" id="navigationPrivacy" tabindex="215">Datenschutz</a>
- </li>
- <li class="metager-dropdown" >
- <a class="metager-dropdown-toggle" role="button" aria-haspopup="true" aria-expanded="false" id="navigationHilfe" tabindex="216">Hilfe
- <span class="caret"></span></a>
- <ul class="metager-dropdown-menu">
- <li>
- <a href="http://localhost:8000/hilfe" tabindex="217">Hilfe</a>
- </li>
- <li>
- <a href="http://localhost:8000/faq" tabindex="218">FAQ</a>
- </li>
- </ul>
- </li>
- <li class="metager-dropdown" >
- <a class="metager-dropdown-toggle" role="button" aria-haspopup="true" aria-expanded="false" id="navigationKontakt" tabindex="219">Kontakt
- <span class="caret"></span></a>
- <ul class="metager-dropdown-menu">
- <li>
- <a href="http://forum.suma-ev.de/" tabindex="220">Forum</a>
- </li>
- <li>
- <a href="http://localhost:8000/kontakt" tabindex="221">Kontakt</a>
- </li>
- <li>
- <a href="http://localhost:8000/team" tabindex="222">Team</a>
- </li>
- <li>
- <a href="http://localhost:8000/about" tabindex="223">Ãœber uns</a>
- </li>
- <li>
- <a href="http://localhost:8000/impressum" tabindex="224">Impressum</a>
- </li>
- </ul>
- </li>
- <li class="metager-dropdown" >
- <a class="metager-dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" tabindex="225">Dienste
- <span class="caret"></span></a>
- <ul class="metager-dropdown-menu">
- <li>
- <a href="http://localhost:8000/widget" tabindex="226">Widget</a>
- </li>
- <li>
- <a href="http://localhost:8000/zitat-suche" tabindex="227">Zitatsuche</a>
- </li>
- <li>
- <a href="https://metager.de/klassik/asso/" tabindex="228">Assoziator</a>
- </li>
- <li>
- <a href="http://code.metager.de/" tabindex="229">Code-Suche</a>
- </li>
- <li>
- <a href="http://localhost:8000/app" tabindex="230">MetaGer App</a>
- </li>
- <li>
- <a href="https://metager.to/" tabindex="231">URL-Verkürzer</a>
- </li>
- <li>
- <a href="https://maps.metager.de" target="_blank" tabindex="232">Maps.MetaGer.de</a>
- </li>
- <li>
- <a href="https://gitlab.metager3.de/open-source/MetaGer" tabindex="233">MetaGer Quellcode</a>
- </li>
- <li>
- <a href="http://forum.suma-ev.de/viewtopic.php?f=3&t=43" tabindex="234">TOR-Hidden-Service</a>
- </li>
- </ul>
- </li>
- <li class="metager-dropdown">
- <a class="metager-dropdown-toggle" role="button" aria-haspopup="true" aria-expanded="false" id="navigationSprache" tabindex="235">Sprache (Deutsch)
- <span class="caret"></span></a>
- <ul class="metager-dropdown-menu">
- <li>
- <a rel="alternate" hreflang="de" href="http://localhost:8000/synoptic" tabindex="235">Deutsch</a>
- </li>
- <li>
- <a rel="alternate" hreflang="en" href="http://localhost:8000/en/synoptic" tabindex="236">English</a>
- </li>
- <li>
- <a rel="alternate" hreflang="es" href="http://localhost:8000/es/synoptic" tabindex="237">español</a>
- </li>
- <li>
- <a rel="alternate" hreflang="fr" href="http://localhost:8000/fr/synoptic" tabindex="238">français</a>
- </li>
- </ul>
- </li>
- </ul>
- </nav>
-
- </header>
- <div class="wrapper">
- <main class="mg-panel container">
- <h1>Ãœbersicht</h1>
- <h2>results.php</h2>
- <form id="submit" method="POST">
- <input type="hidden" name="filename" value="results.php" />
- </form>
- <table class="table">
- <thead>
- <tr>
- <th>#ID</th>
- <th>de</th>
- <th>en</th>
- <th>es</th>
- <th>fr</th>
- <th>nd</th>
-
- </tr>
- </thead>
- <tbody>
- <tr> <!--Key -->
- <td class="name language-name">redirect</td>
- <td>
- <textarea class="language-text-area" rows="1" cols="20" form="submit" name="ZGVfcmVkaXJlY3Q=">(mit redirect) </textarea>
- </td>
- <td>
- <textarea class="language-text-area" rows="1" cols="20" form="submit" name="ZW5fcmVkaXJlY3Q=">(with redirect) </textarea>
- </td>
- <td>
- <textarea class="language-text-area" rows="1" cols="20" form="submit" name="ZXNfcmVkaXJlY3Q=">(con desviar) </textarea>
- </td>
- <td>
- <textarea class="language-text-area" rows="1" cols="20" form="submit" name="X25ld19mcl9yZWRpcmVjdA=="></textarea>
- </td>
- <td>
- <textarea class="language-text-area" rows="1" cols="20" form="submit" name="X25ld19uZF9yZWRpcmVjdA=="></textarea>
- </td>
- </tr>
- <tr> <!--Key -->
- <td class="name language-name">weiter</td>
- <td>
- <textarea class="language-text-area" rows="1" cols="20" form="submit" name="ZGVfd2VpdGVy">Weitersuchen </textarea>
- </td>
- <td>
- <textarea class="language-text-area" rows="1" cols="20" form="submit" name="ZW5fd2VpdGVy">more </textarea>
- </td>
- <td>
- <textarea class="language-text-area" rows="1" cols="20" form="submit" name="ZXNfd2VpdGVy">Continuar </textarea>
- </td>
- <td>
- <textarea class="language-text-area" rows="1" cols="20" form="submit" name="X25ld19mcl93ZWl0ZXI="></textarea>
- </td>
- <td>
- <textarea class="language-text-area" rows="1" cols="20" form="submit" name="X25ld19uZF93ZWl0ZXI="></textarea>
- </td>
- </tr>
- <tr> <!--Key -->
- <td class="name language-name">zurueck</td>
- <td>
- <textarea class="language-text-area" rows="1" cols="20" form="submit" name="ZGVfenVydWVjaw==">Zurück </textarea>
- </td>
- <td>
- <textarea class="language-text-area" rows="1" cols="20" form="submit" name="ZW5fenVydWVjaw==">back </textarea>
- </td>
- <td>
- <textarea class="language-text-area" rows="1" cols="20" form="submit" name="ZXNfenVydWVjaw==">Atrás </textarea>
- </td>
- <td>
- <textarea class="language-text-area" rows="1" cols="20" form="submit" name="X25ld19mcl96dXJ1ZWNr"></textarea>
- </td>
- <td>
- <textarea class="language-text-area" rows="1" cols="20" form="submit" name="X25ld19uZF96dXJ1ZWNr"></textarea>
- </td>
- </tr>
- <tr> <!--Key -->
- <td class="name language-name">filter</td>
- <td>
- <textarea class="language-text-area" rows="1" cols="20" form="submit" name="ZGVfZmlsdGVy">Die Suchergebnisse wurden gefiltert: <strong>[:filter]</strong>. <a href=":link" target="_blank">Filter abschalten.</a> </textarea>
- </td>
- <td>
- <textarea class="language-text-area" rows="1" cols="20" form="submit" name="ZW5fZmlsdGVy">Results are filtered by language: <strong>[:filter]</strong>. <a href=":link" target="_blank">Disable this filter.</a> </textarea>
- </td>
- <td>
- <textarea class="language-text-area" rows="1" cols="20" form="submit" name="ZXNfZmlsdGVy">Resultados filtraban: <strong>[:filter]</strong>. <a href=":link" target="_blank">Desactivar filtro.</a> </textarea>
- </td>
- <td>
- <textarea class="language-text-area" rows="1" cols="20" form="submit" name="X25ld19mcl9maWx0ZXI="></textarea>
- </td>
- <td>
- <textarea class="language-text-area" rows="1" cols="20" form="submit" name="X25ld19uZF9maWx0ZXI="></textarea>
- </td>
- </tr>
- <tr> <!--Key -->
- <td class="name language-name">filter.default</td>
- <td>
- <textarea class="language-text-area" rows="1" cols="20" form="submit" name="ZGVfZmlsdGVyLmRlZmF1bHQ=">Sie erhalten die Benutzeroberfläche in <strong>:langName</strong>, aber Ergebnisse in <strong>ALLEN</strong> Sprachen. Für ausschließlich deutschsprachige Ergebnisse können Sie unter <a href="/settings" target="_blank">anpassen</a> die "Sprache auswählen". </textarea>
- </td>
- <td>
- <textarea class="language-text-area" rows="1" cols="20" form="submit" name="ZW5fZmlsdGVyLmRlZmF1bHQ=">The interface language is set to <strong>:langName</strong> but you will receive results in <strong>ALL</strong> languages. If you want to restrict the results to a specific language, please click <a href="/en/settings" target="_blank">customize</a> and choose your desired language there. </textarea>
- </td>
- <td>
- <textarea class="language-text-area" rows="1" cols="20" form="submit" name="ZXNfZmlsdGVyLmRlZmF1bHQ=">RecibÃs el interfaz del usuario en <strong>:langName</strong>, pero resultados en <strong>TODOS</strong> idiomas. Usan <a href="/settings" target="_blank">adjustar</a> para seleccionar una idioma para los resultados. </textarea>
- </td>
- <td>
- <textarea class="language-text-area" rows="1" cols="20" form="submit" name="X25ld19mcl9maWx0ZXIuZGVmYXVsdA=="></textarea>
- </td>
- <td>
- <textarea class="language-text-area" rows="1" cols="20" form="submit" name="X25ld19uZF9maWx0ZXIuZGVmYXVsdA=="></textarea>
- </td>
- </tr>
- </tbody>
-
- </table>
-<!--
- <p>Sobald du mit deinen Texten zufrieden bist, kannst du uns diese mit einem Klick auf folgenden Knopf automatisch zusenden. Wenn es mehr fehlende Texte in der angegebenen Sprache gibt, wird dein Browser dich danach direkt zu diesen leiten.</p>
- <p><b>Hinweis</b>: Die übermittelten Texte werden von diesem Tool erst erkannt, sobald diese von uns gesichtet und eingefügt wurden. Wenn du deine Arbeit sichern möchtest um diese zu einem späteren Zeitpunkt fortzusetzen (auch wenn wir deine bisherige Arbeit noch nicht übernehmen konnten), so reicht es vollkommen, den aktuellen Link aus deiner Browserleiste zu kopieren und zu einem späteren Zeitpunkt wieder aufzurufen.</p>
- <p><b>Achtung</b>: Mit der Einsendung stimmst du einer <a href="https://gitlab.metager3.de/open-source/MetaGer" target="_blank" rel="noopener">Veröffentlichung</a> deiner Texte unter AGPL-v3-Lizenz durch uns zu. Falls du namentlich genannt werden möchtest, teile uns dies bitte in einer email an <a href="mailto:office@suma-ev.de">office@suma-ev.de</a> mit.</p>
- <p><b>E-Mail-Adresse für Rückfragen</b> (optional):</p>
--->
- <button class="btn btn-success" type="submit" form="submit">Dateien herunterladen</button>
- <button class="btn btn-success" type="submit" form="submit">Nächste Seite</button>
- <script type="text/javascript" src="/js/lib.js"></script>
- <script type="text/javascript" src="/build/js/editLanguage-7a1cbfb2ba.js"></script>
- </main>
- <footer class="noprint">
- <ul class="list-inline hidden-xs">
- <li>
- <a href="https://www.suma-ev.de/" >
- <img src="/img/suma_ev_logo-m1-greyscale.png" alt="SUMA-EV Logo"></a>
- </li>
- <li id="info">
- <a href="http://localhost:8000/kontakt">Kontakt</a> - <a href="http://localhost:8000/impressum">Impressum</a>
- MetaGer wird entwickelt und betrieben vom <a href="https://www.suma-ev.de/">SUMA-EV - Verein für freien Wissenszugang.</a>
- </li>
- <li>
- <a href="https://www.uni-hannover.de/" >
- <img src="/img/luh_metager.png" alt="LUH Logo"></a>
- </li>
- </ul>
- </footer>
- <img src="http://localhost:8000/img/piwik.png?site=http%3A%2F%2Flocalhost%3A8000%2Fsynoptic" class="hidden" />
- </div>
- </body>
-</html>
--
GitLab