Merge branch 'development'

metager/app/Http/Controllers/AdminInterface.php

@@ -71,9 +71,9 @@ class AdminInterface extends Controller
             }
             // No Cache for today
             if ($date->isToday()) {
-                Cache::put($cache_key, $total_count, now()->addWeek());
-            } else {
                 Cache::put($cache_key, $total_count, now()->addMinutes(5));
+            } else {
+                Cache::put($cache_key, $total_count, now()->addWeek());
             }
         }
 

metager/resources/views/datenschutz/english.blade.php

@@ -11,7 +11,7 @@
         MetaGer and related services are operated by <a href="https://suma-ev.de/impressum.html">SUMA-EV</a>, which is
         also the author of this statement. By "we" in this statement usually SUMA-EV is meant.
         <br />Our contact details can be found in our <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "impressum") }}">site
-            notice</a>. We can be reached by e-mail via our <a href="/en/kontakt">encrypted form</a>.
+            notice</a>. We can be reached by e-mail via our <a href="/en/kontakt">contact form</a>.
     </div>
     <div class="section">
         <h1>Principles</h1>
@@ -69,7 +69,7 @@
                                 <h2 id="search-request">Entered search query</h2>
                                 Entered search terms are mandatory for a web search. As a rule, personal data cannot be
                                 obtained from them; partly because they have no fixed structure.
-                                <h3>Beispiele</h3>
+                                <h3>Examples</h3>
                                 <samp>Water consumption when showering</samp><br />
                                 <samp>Lyrics from the song There was a bird on a tree</samp><br />
                                 <samp>Grakvaloth</samp><br />
@@ -98,7 +98,7 @@
                                     <li>In addition to donations and membership fees, we must finance our operation
                                         through non-personalized advertising on the results page. To receive this
                                         advertising, we give parts of the user agent in connection with the first two
-                                        blocks of the so-called <a href="#ip-address">IP-Adresse</a> to our advertising
+                                        blocks of the so-called <a href="#ip-address">IP-Adress</a> to our advertising
                                         partners.
                                     </li>
                                 </ol>
@@ -344,4 +344,4 @@
         Like our offers, this privacy policy is subject to constant change. You should therefore read it again
         regularly.
         <br />This version of our Privacy Policy is dated 2021-02-03.
-    </div>
\ No newline at end of file
+    </div>