Skip to content

GitLab

Commit df2fac9a authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch '25-teamseite-ubersetzen' into 'master' 

+ Teamseite übersetzt

Closes #25

See merge request !29
parents 08448d22 1c32b766
Hide whitespace changes
Inline Side-by-side
composer.lock
View file @ df2fac9a
......@@ -225,16 +225,16 @@
},
{
"name": "guzzlehttp/promises",
"version": "1.1.0",
"version": "1.2.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/promises.git",
"reference": "bb9024c526b22f3fe6ae55a561fd70653d470aa8"
"reference": "c10d860e2a9595f8883527fa0021c7da9e65f579"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/promises/zipball/bb9024c526b22f3fe6ae55a561fd70653d470aa8",
"reference": "bb9024c526b22f3fe6ae55a561fd70653d470aa8",
"url": "https://api.github.com/repos/guzzle/promises/zipball/c10d860e2a9595f8883527fa0021c7da9e65f579",
"reference": "c10d860e2a9595f8883527fa0021c7da9e65f579",
"shasum": ""
},
"require": {
......@@ -272,7 +272,7 @@
"keywords": [
"promise"
],
"time": "2016-03-08 01:15:46"
"time": "2016-05-18 16:56:05"
},
{
"name": "guzzlehttp/psr7",
......@@ -536,16 +536,16 @@
},
{
"name": "laravel/framework",
"version": "v5.2.31",
"version": "v5.2.32",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "2fa2797604bf54b06faf7bb139a9fc0d66826fea"
"reference": "f688217113f70b01d0e127da9035195415812bef"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/2fa2797604bf54b06faf7bb139a9fc0d66826fea",
"reference": "2fa2797604bf54b06faf7bb139a9fc0d66826fea",
"url": "https://api.github.com/repos/laravel/framework/zipball/f688217113f70b01d0e127da9035195415812bef",
"reference": "f688217113f70b01d0e127da9035195415812bef",
"shasum": ""
},
"require": {
......@@ -661,7 +661,7 @@
"framework",
"laravel"
],
"time": "2016-04-27 13:02:09"
"time": "2016-05-17 13:24:40"
},
{
"name": "league/flysystem",
......@@ -1691,16 +1691,16 @@
},
{
"name": "symfony/polyfill-mbstring",
"version": "v1.1.1",
"version": "v1.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "1289d16209491b584839022f29257ad859b8532d"
"reference": "dff51f72b0706335131b00a7f49606168c582594"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/1289d16209491b584839022f29257ad859b8532d",
"reference": "1289d16209491b584839022f29257ad859b8532d",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/dff51f72b0706335131b00a7f49606168c582594",
"reference": "dff51f72b0706335131b00a7f49606168c582594",
"shasum": ""
},
"require": {
......@@ -1712,7 +1712,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.1-dev"
"dev-master": "1.2-dev"
}
},
"autoload": {
......@@ -1746,20 +1746,20 @@
"portable",
"shim"
],
"time": "2016-01-20 09:13:37"
"time": "2016-05-18 14:26:46"
},
{
"name": "symfony/polyfill-php56",
"version": "v1.1.1",
"version": "v1.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php56.git",
"reference": "4d891fff050101a53a4caabb03277284942d1ad9"
"reference": "3edf57a8fbf9a927533344cef65ad7e1cf31030a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/4d891fff050101a53a4caabb03277284942d1ad9",
"reference": "4d891fff050101a53a4caabb03277284942d1ad9",
"url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/3edf57a8fbf9a927533344cef65ad7e1cf31030a",
"reference": "3edf57a8fbf9a927533344cef65ad7e1cf31030a",
"shasum": ""
},
"require": {
......@@ -1769,7 +1769,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.1-dev"
"dev-master": "1.2-dev"
}
},
"autoload": {
......@@ -1802,20 +1802,20 @@
"portable",
"shim"
],
"time": "2016-01-20 09:13:37"
"time": "2016-05-18 14:26:46"
},
{
"name": "symfony/polyfill-util",
"version": "v1.1.1",
"version": "v1.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-util.git",
"reference": "8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4"
"reference": "ef830ce3d218e622b221d6bfad42c751d974bf99"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-util/zipball/8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4",
"reference": "8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4",
"url": "https://api.github.com/repos/symfony/polyfill-util/zipball/ef830ce3d218e622b221d6bfad42c751d974bf99",
"reference": "ef830ce3d218e622b221d6bfad42c751d974bf99",
"shasum": ""
},
"require": {
......@@ -1824,7 +1824,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.1-dev"
"dev-master": "1.2-dev"
}
},
"autoload": {
......@@ -1854,7 +1854,7 @@
"polyfill",
"shim"
],
"time": "2016-01-20 09:13:37"
"time": "2016-05-18 14:26:46"
},
{
"name": "symfony/process",
......@@ -2308,16 +2308,16 @@
},
{
"name": "mockery/mockery",
"version": "0.9.4",
"version": "0.9.5",
"source": {
"type": "git",
"url": "https://github.com/padraic/mockery.git",
"reference": "70bba85e4aabc9449626651f48b9018ede04f86b"
"reference": "4db079511a283e5aba1b3c2fb19037c645e70fc2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/padraic/mockery/zipball/70bba85e4aabc9449626651f48b9018ede04f86b",
"reference": "70bba85e4aabc9449626651f48b9018ede04f86b",
"url": "https://api.github.com/repos/padraic/mockery/zipball/4db079511a283e5aba1b3c2fb19037c645e70fc2",
"reference": "4db079511a283e5aba1b3c2fb19037c645e70fc2",
"shasum": ""
},
"require": {
......@@ -2369,7 +2369,7 @@
"test double",
"testing"
],
"time": "2015-04-02 19:54:00"
"time": "2016-05-22 21:52:33"
},
{
"name": "phpdocumentor/reflection-docblock",
......@@ -2634,21 +2634,24 @@
},
{
"name": "phpunit/php-timer",
"version": "1.0.7",
"version": "1.0.8",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-timer.git",
"reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b"
"reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3e82f4e9fc92665fafd9157568e4dcb01d014e5b",
"reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b",
"url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260",
"reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
"phpunit/phpunit": "~4|~5"
},
"type": "library",
"autoload": {
"classmap": [
......@@ -2671,7 +2674,7 @@
"keywords": [
"timer"
],
"time": "2015-06-21 08:01:12"
"time": "2016-05-12 18:03:57"
},
{
"name": "phpunit/php-token-stream",
......@@ -2724,16 +2727,16 @@
},
{
"name": "phpunit/phpunit",
"version": "4.8.24",
"version": "4.8.26",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "a1066c562c52900a142a0e2bbf0582994671385e"
"reference": "fc1d8cd5b5de11625979125c5639347896ac2c74"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a1066c562c52900a142a0e2bbf0582994671385e",
"reference": "a1066c562c52900a142a0e2bbf0582994671385e",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fc1d8cd5b5de11625979125c5639347896ac2c74",
"reference": "fc1d8cd5b5de11625979125c5639347896ac2c74",
"shasum": ""
},
"require": {
......@@ -2747,7 +2750,7 @@
"phpunit/php-code-coverage": "~2.1",
"phpunit/php-file-iterator": "~1.4",
"phpunit/php-text-template": "~1.2",
"phpunit/php-timer": ">=1.0.6",
"phpunit/php-timer": "^1.0.6",
"phpunit/phpunit-mock-objects": "~2.3",
"sebastian/comparator": "~1.1",
"sebastian/diff": "~1.2",
......@@ -2792,7 +2795,7 @@
"testing",
"xunit"
],
"time": "2016-03-14 06:16:08"
"time": "2016-05-17 03:09:28"
},
{
"name": "phpunit/phpunit-mock-objects",
......@@ -2968,16 +2971,16 @@
},
{
"name": "sebastian/environment",
"version": "1.3.6",
"version": "1.3.7",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/environment.git",
"reference": "2292b116f43c272ff4328083096114f84ea46a56"
"reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/2292b116f43c272ff4328083096114f84ea46a56",
"reference": "2292b116f43c272ff4328083096114f84ea46a56",
"url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/4e8f0da10ac5802913afc151413bc8c53b6c2716",
"reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716",
"shasum": ""
},
"require": {
......@@ -3014,7 +3017,7 @@
"environment",
"hhvm"
],
"time": "2016-05-04 07:59:13"
"time": "2016-05-17 03:18:57"
},
{
"name": "sebastian/exporter",
......
resources/lang/de/team.php 0 → 100644
View file @ df2fac9a
<?php
return [
'role.1' => 'Geschäftsführer, Vorstand',
'role.2' => 'Büroleiter und Jugendschutzbeauftragter',
'role.3' => 'Pressereferentin',
'role.4' => 'Programmierer',
'role.5' => 'Programmierer',
'role.6' => 'Programmierer',
'role.7' => 'Sekretariat',
'contact.1' => 'Fragen/Probleme zu MetaGer etc. bitte immer an',
'contact.2' => 'mailen, oder das',
'contact.3' => 'Kontaktformular mit Verschlüsselung',
'contact.4' => 'benutzten, oder am besten: ins',
'contact.5' => 'MetaGer-Forum',
'contact.6' => 'schreiben. Wir können bei der Vielzahl der Anfragen nicht immer zeitnah antworten - im',
'contact.7' => 'MetaGer-Forum',
'contact.8' => 'können Ihnen wahrscheinlich auch andere MetaGer-Nutzer weiterhelfen, und von den Fragen und Antworten profitieren ALLE.',
'contact.9' => 'Nur in begründeten Ausnahmefällen, wenn Sie bestimmte Personen direkt erreichen wollen, sollten Sie an diese mailen. Denn Team-Mitglieder können Urlaub haben, krank sein usw.',
];
\ No newline at end of file
resources/lang/en/team.php 0 → 100644
View file @ df2fac9a
<?php
return [
'role.1' => 'chief executive, chairman',
'role.2' => 'office supervisor und youth protection commissioner',
'role.3' => 'press secretary',
'role.4' => 'programmer',
'role.5' => 'programmer',
'role.6' => 'programmer',
'role.7' => 'secretary',
'contact.1' => 'Please mail your questions/problems about MetaGer etc. to',
'contact.2' => 'or use the',
'contact.3' => 'contact form with encryption',
'contact.4' => ', or preferably make a post in the',
'contact.5' => 'MetaGer-forum.',
'contact.6' => 'Due to the amount of requests, we can not always answer promptly - in the',
'contact.7' => 'MetaGer-forum',
'contact.8' => 'there are probably other users which can help you aswell, and the questions and answers benefit EVERYONE.',
'contact.9' => 'Only in reasoned exceptions, if you want to rech someone directly, you should mail them. Because team members might be on vacation, sick etc.',
];
\ No newline at end of file
resources/views/team/team.blade.php
View file @ df2fac9a
......@@ -8,47 +8,39 @@
<ul id="teamList">
<li>
<a href="https://de.wikipedia.org/wiki/Wolfgang_Sander-Beuermann" target="_blank">Sander-Beuermann, Wolfgang
</a>, Dr.-Ing. - Geschäftsführer, Vorstand -
</a>, Dr.-Ing. - {{ trans('team.role.1') }} -
<a href="mailto:wsb@suma-ev.de">wsb@suma-ev.de
</a> -
<a href="/team/pubkey-wsb">Public Key
</a>
</li>
<li>Becker, Georg - Büroleiter und Jugendschutzbeauftragter -
<li>Becker, Georg - {{ trans('team.role.2') }} -
<a href="mailto:georg.becker@suma-ev.de">georg.becker@suma-ev.de
</a>
</li>
<li>Branz, Manuela - Pressereferentin -
<li>Branz, Manuela - {{ trans('team.role.3') }} -
<a href="mailto:manuela.branz@suma-ev.de">manuela.branz@suma-ev.de
</a>
</li>
<li>Pfennig, Dominik - Programmierer -
<li>Pfennig, Dominik - {{ trans('team.role.4') }} -
<a href="mailto:dominik@suma-ev.de">dominik@suma-ev.de
</a>
</li>
<li>Höfer, Phil - Programmierer -
<li>Höfer, Phil - {{ trans('team.role.5') }} -
<a href="mailto:phil@suma-ev.de">phil@suma-ev.de
</a>
</li>
<li>Hasselbring, Karl - Programmierer -
<li>Hasselbring, Karl - {{ trans('team.role.6') }} -
<a href="mailto:karl@suma-ev.de">karl@suma-ev.de
</a>
</li>
<li>Riel, Carsten - Sekretariat -
<li>Riel, Carsten - {{ trans('team.role.7') }} -
<a href="carsten@suma-ev.de">carsten@suma-ev.de
</a>
</li>
</ul>
<p>Fragen/Probleme zu MetaGer etc. bitte immer an
<a href="mailto:office@suma-ev.de">office@suma-ev.de
</a> mailen, oder das
<a href="/kontakt/">Kontaktformular mit Verschlüsselung
</a> benutzten, oder am besten: ins
<a href="http://forum.suma-ev.de/" target="_blank">MetaGer-Forum
</a> schreiben. Wir können bei der Vielzahl der Anfragen nicht immer zeitnah antworten - im
<a href="http://forum.suma-ev.de/" target="_blank">MetaGer-Forum
</a> können Ihnen wahrscheinlich auch andere MetaGer-Nutzer weiterhelfen, und von den Fragen und Antworten profitieren ALLE.
</p>
<p>Nur in begründeten Ausnahmefällen, wenn Sie bestimmte Personen direkt erreichen wollen, sollten Sie an diese mailen. Denn Team-Mitglieder können Urlaub haben, krank sein usw.
<p>{{ trans('team.contact.1') }}
<a href="mailto:office@suma-ev.de">office@suma-ev.de</a> {{ trans('team.contact.2') }} <a href="/kontakt/">{{ trans('team.contact.3') }}</a>{{ trans('team.contact.4') }} <a href="http://forum.suma-ev.de/" target="_blank">{{ trans('team.contact.5') }}</a> {{ trans('team.contact.6') }} <a href="http://forum.suma-ev.de/" target="_blank">{{ trans('team.contact.7') }}</a> {{ trans('team.contact.8') }} </p>
<p>{{ trans('team.contact.9') }}
</p>
@endsection
\ No newline at end of file
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