Commit cae6641d authored by Dominik Hebeler's avatar Dominik Hebeler

Merge branch '363-spanische-version-vorbereiten' into 'development'

Resolve "Spanische Version Vorbereiten"

Closes #363

See merge request !631
parents 1274fe58 70e645ae
......@@ -46,7 +46,7 @@ return [
//'en-AU' => ['name' => 'Australian English', 'script' => 'Latn', 'native' => 'Australian English', 'regional' => 'en_AU'],
//'en-GB' => ['name' => 'British English', 'script' => 'Latn', 'native' => 'British English', 'regional' => 'en_GB'],
//'en-US' => ['name' => 'U.S. English', 'script' => 'Latn', 'native' => 'U.S. English', 'regional' => 'en_US'],
//'es' => ['name' => 'Spanish', 'script' => 'Latn', 'native' => 'español', 'regional' => 'es_ES'],
'es' => ['name' => 'Spanish', 'script' => 'Latn', 'native' => 'español', 'regional' => 'es_ES'],
//'eo' => ['name' => 'Esperanto', 'script' => 'Latn', 'native' => 'esperanto', 'regional' => ''],
//'eu' => ['name' => 'Basque', 'script' => 'Latn', 'native' => 'euskara', 'regional' => 'eu_ES'],
//'ewo' => ['name' => 'Ewondo', 'script' => 'Latn', 'native' => 'ewondo', 'regional' => ''],
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
{
"css/themes/default.css": "css/themes/default-39c89a0e8d.css",
"js/all.js": "js/all-94969523ba.js",
"js/quicktips.js": "js/quicktips-4563c0221a.js"
"css/themes/default.css": "css/themes/default-a9062cf83c.css",
"js/all.js": "js/all-70e38f5f5e.js",
"js/quicktips.js": "js/quicktips-34d41bc58a.js"
}
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -29,29 +29,42 @@ function encrypt() {
return true;
}
} else {
if (isEnglish()) {
window.alert("Error: Your browser is not supported. Please install an up to date browser like Mozilla Firefox.");
} else {
window.alert("Fehler: Ihr Browser wird nicht unterstützt. Bitte installieren Sie einen aktuellen Broweser wie z.B. Mozilla Firefox.");
switch (getLanguage()) {
case "de":
alert("Fehler: Ihr Browser wird nicht unterstützt. Bitte installieren Sie einen aktuellen Browser wie z.B. Mozilla Firefox.");
break;
case "en":
alert("Error: Your browser is not supported. Please install an up to date browser like Mozilla Firefox.");
break;
case "es":
// alert(""); TODO
break;
}
return false;
}
}
$(document).ready(function() {
if (isEnglish()) {
$(".encrypt-btn").html("encrypt and send");
} else {
$(".encrypt-btn").html("Verschlüsseln und senden");
switch (getLanguage()) {
case "de":
$(".encrypt-btn").html("Verschlüsseln und senden");
break;
case "en":
$(".encrypt-btn").html("encrypt and send");
break;
case "es":
// $(".encrypt-btn").html(""); TODO
break;
}
$(".contact").submit(function() {
return encrypt(this);
});
});
function isEnglish() {
if (window.location.href.indexOf('/en/') == -1) {
return false;
} else {
return true;
function getLanguage() {
var metaData = document.getElementsByTagName('meta');
for (var m in metaData) {
if (metaData[m]["httpEquiv"] == "language") {
return metaData[m]["content"];
}
}
}
\ No newline at end of file
......@@ -35,18 +35,30 @@ $(document).ready(function() {
});
$("#unten").click(function() {
$("#settings-form").append("<input type=\"hidden\" name=\"usage\" value=\"once\">");
if (isEnglish()) {
alert("On the following startpage your settings are saved one-time. They will be lost after your first search. Though if you want to save them, you can create a bookmark for the generated startpage.");
} else {
alert("Auf der folgenden Startseite sind Ihre Einstellungen nun einmalig gespeichert. Nach Ihrer ersten Suche sind diese wieder verloren. Wenn Sie diese speichern möchten, können Sie sich allerdings ein Lesezeichnen für die generierte Startseite einrichten.");
switch (getLanguage()) {
case "de":
alert("Auf der folgenden Startseite sind Ihre Einstellungen nun einmalig gespeichert. Nach Ihrer ersten Suche sind diese wieder verloren. Wenn Sie diese speichern möchten, können Sie sich allerdings ein Lesezeichen für die generierte Startseite einrichten.");
break;
case "en":
alert("On the following startpage your settings are saved one-time. They will be lost after your first search. Though if you want to save them, you can create a bookmark for the generated startpage.");
break;
case "es":
// alert(""); TODO
break;
}
});
$("#plugin").click(function() {
$("form").attr('action', $("#save").attr("data-href") + '#plugin-modal');
if (isEnglish()) {
alert("Your browser plugin with personal settings was generated. Please follow the instructions on the following page to install it. Notice that beforehand you might have to delete a former MetaGer plugin.");
} else {
alert("Ihr Browserplugin mit den persönlichen Sucheinstellungen wurde generiert. Folgen Sie bitte der Anleitung auf der folgenden Seite um es zu installieren. Beachten Sie: Zuvor sollten Sie ein eventuell bereits installiertes MetaGer-Plugin entfernen.");
switch (getLanguage()) {
case "de":
alert("Ihr Browserplugin mit den persönlichen Sucheinstellungen wurde generiert. Folgen Sie bitte der Anleitung auf der folgenden Seite um es zu installieren. Beachten Sie: Zuvor sollten Sie ein eventuell bereits installiertes MetaGer-Plugin entfernen.");
break;
case "en":
alert("Your browser plugin with personal settings was generated. Please follow the instructions on the following page to install it. Notice that beforehand you might have to delete a former MetaGer plugin.");
break;
case "es":
// alert(""); TODO
break;
}
});
});
......@@ -84,10 +96,11 @@ function resetOptions() {
}
}
function isEnglish() {
if (window.location.href.indexOf('/en/') == -1) {
return false;
} else {
return true;
function getLanguage() {
var metaData = document.getElementsByTagName('meta');
for (var m in metaData) {
if (metaData[m]["httpEquiv"] == "language") {
return metaData[m]["content"];
}
}
}
\ No newline at end of file
......@@ -94,8 +94,8 @@ return [
'plugin.safari.3' => 'L&ouml;schen Sie (nach Bedarf) die anderen Suchmaschinen aus dem OpenSearch-PlugIn, indem Sie das "X" neben diesen betätigen.',
'plugin.safari.4' => 'Sie können nun über den OpenSearch-Knopf(Lupe) mit MetaGer suchen.',
'plugin.vivaldi.1' => 'Klicken Sie in Ihrem Browser oben links auf das rote Vivaldi Logo und wählen Sie zuerst "Werkzeuge", dann im Untermenü "Einstellungen".',
'plugin.vivaldi.2' => 'Klicken Sie im neu geöffneten Menü auf den Punkt "Suche".',
'plugin.faq.1' => 'Siehe auch: ',
'plugin.faq.2' => 'Metager FAQ - Plugin',
'plugin.vivaldi.3' => 'Wählen Sie "Neue Suche hinzufügen".',
'plugin.vivaldi.4' => 'Tragen Sie im Feld URL "https://metager.de/meta/meta.ger3?eingabe=%s" ein.',
'plugin.vivaldi.5' => 'Tragen Sie als Beschreibung "MetaGer" und als Kürzel "mg" ein.',
......
<?php
return [
"options.1" => "Empezar una nueva búsqueda en este dominio",
"options.2" => "ocultar :host",
"options.3" => "ocultar *.:domain",
"options.4" => "Tienda asociada",
"options.5" => "abrir anónimo",
"proxytext" => "Abrirá el link anonimizado."
];
\ No newline at end of file
"options.1" => "Nueva búsqueda en este dominio",
"options.2" => "ocultar :host",
"options.3" => "ocultar *.:domain",
"options.4" => "Tienda asociada",
"options.5" => "abrir anónimo",
"proxytext" => "Abrirá el link anonimizado.",
];
<?php
return [
"opensearch" => "MetaGer: Buscar & encontrar seguro, proteger la privacidad",
"nav1" => "Búsqueda",
"nav2" => "Donaciones",
"nav3" => "Protección de datos",
"nav4" => "Foro",
"nav5" => "Contacto",
"nav6" => "Equipo",
"nav7" => "Sobre nosotros",
"nav8" => "Aviso legal",
"nav9" => "Ayuda",
"nav10" => "Widget",
"nav11" => "Asociador",
"nav12" => "Búsqueda de código",
"nav13" => "Cortador de URL",
"nav14" => "TOR-Hidden-Service",
"nav15" => "Servicios",
"nav16" => "Patrocinar",
"nav17" => "Comprar en tiendas que patrocinan a MetaGer",
"nav18" => "Contacto",
"nav19" => "Idioma",
"nav20" => "Ayuda",
"nav21" => "FAQ",
"nav22" => "Búsqueda de citas",
"nav23" => "Formulario de afiliación SUMA-EV",
"nav24" => "Codigo fuente MetaGer",
"nav25" => "MetaGer App",
"navigationToggle" => "Mostrar navegación",
"sumaev.1" => "MetaGer mantiene y desarrolla el",
"sumaev.2" => "SUMA-EV",
"meta.Description" => "Buscar y encontrar guardando su privacidad. El conocimiento digital del mundo tiene que ser accesible sin tutela de empresas o estados.",
"meta.Keywords" => "Búsqueda en internet, privacidad, buscador, motor de búsqueda, protección de datos, Anonproxy, buscar anónimo, MetaGer, metager, metager.de",
"meta.language" => "es"
];
\ No newline at end of file
"opensearch" => "MetaGer: Buscar & encontrar seguro, proteger la privacidad",
"nav1" => "Búsqueda",
"nav2" => "Donaciones",
"nav3" => "Protección de datos",
"nav4" => "Foro",
"nav5" => "Contacto",
"nav6" => "Equipo",
"nav7" => "Sobre nosotros",
"nav8" => "Aviso legal",
"nav9" => "Ayuda",
"nav10" => "Widget",
"nav11" => "Asociador",
"nav12" => "Búsqueda de código",
"nav13" => "Cortador de URL",
"nav14" => "TOR-Hidden-Service",
"nav15" => "Servicios",
"nav16" => "Patrocinar",
"nav17" => "Comprar en tiendas que patrocinan a MetaGer",
"nav18" => "Contacto",
"nav19" => "Idioma",
"nav20" => "Ayuda",
"nav21" => "FAQ",
"nav22" => "Búsqueda de citas",
"nav23" => "Formulario de afiliación SUMA-EV",
"nav24" => "Codigo fuente MetaGer",
"nav25" => "MetaGer App",
"spendenaufruf.title" => "Consigo:",
"spendenaufruf.text" => "¡ Asegurar el protección de datos y la esfera privada en el internet ! <br><a href=\"/spendenaufruf\" class=\"aufruf-a-startseite\">Nosotro llamamiento para conseguir donativos&hellip;</a>",
"navigationToggle" => "Mostrar navegación",
"sumaev.1" => "MetaGer mantiene y desarrolla el",
"sumaev.2" => "SUMA-EV",
"meta.Description" => "Buscar y encontrar guardando su privacidad. El conocimiento digital del mundo tiene que ser accesible sin tutela de empresas o estados.",
"meta.Keywords" => "Búsqueda en internet, privacidad, buscador, motor de búsqueda, protección de datos, Anonproxy, buscar anónimo, MetaGer, metager, metager.de",
"meta.language" => "es",
];
......@@ -144,6 +144,8 @@
<div id="mg-plugin" style="margin-top: -100px"></div>
<div style="margin-top: 100px"></div>
<div class="panel-heading">
<div id="mg-plugin" style="margin-top: -50"></div>
<div style="margin-top: 50"></div>
<h3 class="panel-title">{!! trans('faq.faq.17.h') !!}</h3>
</div>
<div class="panel-body">
......
......@@ -128,6 +128,8 @@
<li>{!! trans('index.plugin.vivaldi.10') !!}</li>
</ol>
@endif
<hr>
<p>@lang('index.plugin.faq.1')<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/faq#mg-plugin") }}">@lang('index.plugin.faq.2')</a></p>
</div>
</div>
</div>
......
......@@ -10,6 +10,7 @@
<meta content="{{ $eingabe }}" name="q" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<META HTTP-EQUIV="CACHE-CONTROL" CONTENT="NO-CACHE" />
<meta http-equiv="language" content="{!! trans('staticPages.meta.language') !!}" />
<meta HTTP-EQUIV="PRAGMA" CONTENT="NO-CACHE" />
<link rel="search" type="application/opensearchdescription+xml" title="{!! trans('resultPage.opensearch') !!}" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), action('StartpageController@loadPlugin', ['params' => base64_encode(serialize(Request::all()))])) }}">
<!--<link type="text/css" rel="stylesheet" href="/css/themes/{{ app('request')->input('theme', 'default-neu') }}.css" />-->
......
......@@ -6,7 +6,7 @@
<meta charset="utf-8" />
<meta name="description" content="{!! trans('staticPages.meta.Description') !!}" />
<meta name="keywords" content="{!! trans('staticPages.meta.Keywords') !!}" />
<meta http-equiv=”language” content="{!! trans('staticPages.meta.language') !!}" />
<meta http-equiv="language" content="{!! trans('staticPages.meta.language') !!}" />
<meta name="page-topic" content="Dienstleistung" />
<meta name="robots" content="index,follow" />
<meta name="revisit-after" content="7 days" />
......
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