Skip to content

Rebase #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 71 commits into from
Oct 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
8ea513d
Merge pull request #95 from dbarzin/dev
dbarzin Jul 16, 2024
a6def12
Merge pull request #96 from dbarzin/dev
dbarzin Jul 16, 2024
02a9ae6
Merge pull request #97 from dbarzin/dev
dbarzin Jul 16, 2024
a07f182
Merge pull request #98 from dbarzin/dev
dbarzin Jul 16, 2024
bde7b4a
Merge pull request #99 from dbarzin/dev
dbarzin Jul 16, 2024
71bb9c5
Merge pull request #100 from dbarzin/dev
dbarzin Jul 17, 2024
e5356d1
Merge pull request #101 from dbarzin/dev
dbarzin Jul 17, 2024
9476108
Merge pull request #102 from dbarzin/dev
dbarzin Jul 17, 2024
7309ba6
Merge pull request #103 from dbarzin/dev
dbarzin Jul 17, 2024
1b523fe
Merge pull request #104 from dbarzin/dev
dbarzin Jul 17, 2024
a70416a
Merge pull request #105 from dbarzin/dev
dbarzin Jul 22, 2024
6b5e4f7
Merge pull request #107 from dbarzin/dev
dbarzin Jul 24, 2024
17777ee
Merge pull request #108 from dbarzin/dev
dbarzin Jul 24, 2024
5c71e78
Merge pull request #109 from dbarzin/dev
dbarzin Jul 24, 2024
d40cab1
Merge pull request #110 from dbarzin/dev
dbarzin Jul 26, 2024
e15ec79
Merge pull request #111 from dbarzin/dev
dbarzin Jul 28, 2024
0099bce
Merge pull request #112 from dbarzin/dev
dbarzin Jul 29, 2024
48f0e9d
Merge pull request #114 from dbarzin/dev
dbarzin Aug 4, 2024
44a3e3c
Merge pull request #115 from dbarzin/dev
dbarzin Aug 4, 2024
0d5bcf4
Merge pull request #116 from dbarzin/dev
dbarzin Aug 4, 2024
3fff113
Merge pull request #117 from dbarzin/dev
dbarzin Aug 4, 2024
7f26d8a
Merge pull request #118 from dbarzin/dev
dbarzin Aug 4, 2024
61b727d
Merge pull request #119 from dbarzin/dev
dbarzin Aug 4, 2024
86a66f8
Merge pull request #120 from dbarzin/dev
dbarzin Aug 4, 2024
84334b4
Merge pull request #121 from dbarzin/dev
dbarzin Aug 6, 2024
3bb4c30
Merge pull request #122 from dbarzin/dev
dbarzin Aug 7, 2024
65f3363
Merge pull request #123 from dbarzin/dev
dbarzin Aug 10, 2024
da0e4d3
Merge pull request #124 from dbarzin/dev
dbarzin Aug 10, 2024
bb0e4e3
Merge pull request #125 from dbarzin/dev
dbarzin Aug 10, 2024
164ba84
Merge pull request #126 from dbarzin/dev
dbarzin Aug 10, 2024
de69e91
Merge pull request #127 from dbarzin/dev
dbarzin Aug 10, 2024
7e9cfb7
Merge pull request #128 from dbarzin/dev
dbarzin Aug 11, 2024
33c2483
Merge pull request #131 from dbarzin/dev
dbarzin Aug 17, 2024
e315d84
Merge pull request #132 from dbarzin/dev
dbarzin Aug 17, 2024
e027a9b
Merge pull request #133 from dbarzin/dev
dbarzin Aug 26, 2024
bbe8a96
Merge pull request #134 from dbarzin/dev
dbarzin Sep 1, 2024
429d8d9
Merge pull request #135 from dbarzin/dev
dbarzin Sep 2, 2024
9cc5f38
Merge pull request #136 from dbarzin/dev
dbarzin Sep 12, 2024
1644668
Merge pull request #138 from dbarzin/dev
dbarzin Sep 25, 2024
a9183ab
Merge pull request #140 from dbarzin/dev
dbarzin Sep 25, 2024
540aa7a
Merge pull request #141 from dbarzin/dev
dbarzin Sep 26, 2024
37eae3e
Merge pull request #142 from dbarzin/dev
dbarzin Sep 26, 2024
9365a42
Merge pull request #143 from dbarzin/dev
dbarzin Sep 28, 2024
41b4f80
Merge pull request #144 from dbarzin/dev
dbarzin Oct 1, 2024
803e252
Merge pull request #145 from dbarzin/dev
dbarzin Oct 1, 2024
010a9bf
Merge pull request #146 from dbarzin/dev
dbarzin Oct 1, 2024
6c32762
Merge pull request #147 from dbarzin/dev
dbarzin Oct 1, 2024
acb975e
Merge pull request #148 from dbarzin/dev
dbarzin Oct 1, 2024
dd86f57
Merge pull request #149 from dbarzin/dev
dbarzin Oct 2, 2024
67feb50
Merge pull request #150 from dbarzin/dev
dbarzin Oct 2, 2024
215b574
Merge pull request #151 from dbarzin/dev
dbarzin Oct 2, 2024
8298211
Merge pull request #153 from dbarzin/dev
dbarzin Oct 4, 2024
669ad8f
Merge pull request #154 from dbarzin/dev
dbarzin Oct 4, 2024
64173d9
Merge pull request #155 from dbarzin/dev
dbarzin Oct 4, 2024
fcd16d7
Merge pull request #156 from dbarzin/dev
dbarzin Oct 4, 2024
dde15ee
Merge pull request #157 from dbarzin/dev
dbarzin Oct 8, 2024
84491ab
Merge pull request #158 from dbarzin/dev
dbarzin Oct 9, 2024
4e9e543
Merge pull request #159 from dbarzin/dev
dbarzin Oct 9, 2024
dd63a3f
Merge pull request #160 from dbarzin/dev
dbarzin Oct 9, 2024
0460928
Merge pull request #161 from dbarzin/dev
dbarzin Oct 9, 2024
33aefcc
Create auth.php
ColdIce77 Oct 9, 2024
b7c6298
Update auth.php
ColdIce77 Oct 9, 2024
7b6846d
Merge pull request #162 from dbarzin/dev
dbarzin Oct 10, 2024
46186e6
Merge branch 'dbarzin:main' into main
ColdIce77 Oct 11, 2024
f129b00
German translation
ColdIce77 Oct 11, 2024
b81a335
Update create.blade.php
ColdIce77 Oct 11, 2024
45ad224
Update edit.blade.php
ColdIce77 Oct 11, 2024
23c1f9f
Update ControlController.php
ColdIce77 Oct 11, 2024
6863784
Add files via upload
ColdIce77 Oct 11, 2024
aa06cc3
Merge pull request #172 from dbarzin/dev
dbarzin Oct 11, 2024
39190d1
Merge pull request #171 from ColdIce77/main
dbarzin Oct 11, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/Http/Controllers/ControlController.php
Original file line number Diff line number Diff line change
Expand Up @@ -1615,7 +1615,7 @@ public function template()
abort_if($control === null, Response::HTTP_NOT_FOUND, '404 Not Found');

// Get template file
$template_filename = storage_path('app/models/control_.docx');
$template_filename = storage_path('app/models/control_'.Auth::User()->language.'.docx');
if (! file_exists($template_filename)) {
$template_filename = storage_path('app/models/control.docx');
}
Expand Down
21 changes: 21 additions & 0 deletions resources/lang/de/auth.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@

<?php

return [

/*
|--------------------------------------------------------------------------
| Authentication Language Lines
|--------------------------------------------------------------------------
|
| The following language lines are used during authentication for various
| messages that we need to display to the user. You are free to modify
| these language lines according to your application's requirements.
|
*/

'failed' => 'Diese Anmeldedaten sind dem System nicht bekannt.',
'throttle' => 'Zu viele Login-Versuche. Bitte in :seconds Sekunden erneut versuchen.',

];

48 changes: 48 additions & 0 deletions resources/lang/de/common.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?php
return [
'confirm' => 'Löschen bestätigen',

'accept' => 'Akzeptiert',
'cancel' => 'Abbruch',
'check' => 'Prüfen',
'create' => 'Erstellen',
'clone' => 'Kopieren',
'delete' => 'Löschen',
'download' => 'Download',
'edit' => 'Editieren',
'import' => 'Import',
'make' => 'Erledigen',
'new' => 'Neu',
'plan' => 'Planen',
'reject' => 'Ablehnen',
'save' => 'Sichern',
'test' => 'Testen',
'unplan' => 'Un-Planen',
'validate' => 'Validieren',

'once' => 'einmalig',
'monthly' => 'monatlich',
'quarterly' => 'quartal',
'biannually' => 'halbjährlich',
'annually' => 'jährlich',

'next' => 'Nächstes',
'previous' => 'Vorheriges',
'more_info' => 'Mehr Informationen',

'green' => 'Grün',
'orange' => 'Orange',
'red' => 'Rot',

'fail' => 'Durchgefallen',
'alert' => 'Alarm',
'success' => 'Erfolg',
'unknown' => 'Unbekannt',

'date' => 'Datum',

'never' => 'Nie',
'day' => 'täglich',
'week' => 'wöchentlich',
'month' => 'monatlich'
];
224 changes: 224 additions & 0 deletions resources/lang/de/cruds.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,224 @@
<?php
return [
'welcome' => [
'dashboard' => 'Dashboard',
'domains' => 'Domänen',
'measures' => 'Maßnahmen',
'controls' => 'Kontrollen',
'action_plans' => "Aktionsplan",
'next_controls' => 'Zeigt die Planung der nächsten 30 Tage',
'control_status' => 'Kontrollstatus',
'control_planning' => 'Maßnahmenplanung',
],
'action' => [
'index' => 'Aktionspläne',
'show' => 'Aktionsplan',
'fields' => [
'clause' => 'Klausel',
'name' => 'Name',
'scope' => 'Geltungsbereich',
'action' => 'Aktionsplan',
'plan_date' => 'Planungsdatum',
'next_date' => 'Reviewdatum',
'note' => 'Punktzahl',
'objective' => 'Zielsetzung',
'observation' => 'Beobachtung',
'action_plan' => 'Aktionsplan',
],
],
'attribute' => [
'fields' => [
'name' => 'Name',
'values' => 'Werte',
],
'add' => 'Attribut hinzufügen',
'edit' => 'Attribut ändern',
'show' => 'Attribut',
'index' => 'Liste der Attribute',
'choose' => 'Wähle ein Attribut',
'title' => 'Attribute'
],
'control' => [
'description' => 'Kontrollen',
'fields' => [
'action_plan' => 'Aktionsplan',
'attributes' => 'Attribute',
'choose_domain' => 'Wähle Domäne',
'choose_scope' => 'Wähle Geltungsbereich',
'choose_period' => 'Wähle Periode',
'choose_attribute' => 'Wähle Attribute',
'domain' => 'Domäne',
'indicator' => 'Funktion',
'measure' => 'Maßnahme',
'model' => 'Model',
'name' => 'Name',
'next' => 'Nächstes',
'note' => 'Notiz',
'objective' => 'Zilelsetzung',
'observations' => 'Beobachtungen',
'plan_date' => 'Planungsdatum',
'period' => 'Periode',
'periodicity' => 'Wiederholung',
'planned' => 'Eingeplant',
'realisation_date' => 'Realisierungsdatum',
'realized' => 'Realisiert',
'evidence' => 'Beweis',
'score' => 'Punktzahl',
'status' => 'Status',
'status_done' => 'Erledigt',
'status_todo' => 'ToDo',
'status_all' => 'Alle',
'scope' => 'Geltungsbereich',
'clause' => 'Klausel',
'clauses' => 'Klauseln',
'input' => 'Input',
'owners' => 'Verantwortlich',
],
'error' => [
'made' => 'Diese Maßnahme wurde bereits umgesetzt.',
'duplicate' => 'Diese Maßnahme existiert bereits.',
],
'checklist' => 'Measure sheet',
'create' => 'Erstelle eine Maßnahme',
'list' => 'Liste der Maßnahmen',
'edit' => 'Maßnahme ändern',
'history' => 'Zeitplan',
'make' => 'Maßnahme durchführen',
'plan' => 'Planung einer Maßnahme',
'radar' => 'Status der Sicherheitsmaßnahmen',
'title' => 'Maßnahmen',
'title_singular' => 'Maßnahme',
'groupBy' => 'Gruppiert nach',
],
'notification' => [
'subject' => 'Measurement list to carry out',
],
'measure' => [
'title' => 'Maßnahmen',
'fields' => [
'domain' => 'Domäne',
'clause' => 'Klausel',
'name' => 'Name',
'objective' => 'Beschreibung',
'attributes' => 'Attribute',
'model' => 'Model',
'indicator' => 'Indikator',
'action_plan' => 'Aktionsplan',
'periodicity' => 'Wiederholung',
'input' => 'Input',
],
'show' => 'Maßnahmen',
'index' => 'Liste der Maßnahmen',
'create' => 'Erstelle eine Maßnahme',
'edit' => 'Ändere eine Maßnahme',
'plan' => 'Kontrollplanung'
],
'domain' => [
'fields' => [
'framework' => 'Framework',
'name' => 'Name',
'description' => 'Beschreibung',
'measures' => '# Kontrollen',
],
'add' => 'Domäne hinzufügen',
'edit' => 'Domäne ändern',
'show' => 'Domäne',
'index' => 'Liste der Domänen',
'choose' => 'Wähle eine Domäne',
'title' => 'Domänen'
],
'document' => [
'title' => [
'storage' => 'Speicher',
'templates' => 'Vorlagen',
],
'description' => 'Beschreibung',
'list' => 'Liste der Dokumente',
'index' => 'Dokumente',
'fields' => [
'name' => 'Name',
'control' => 'Kontrolle',
'size' => 'Größe',
'hash' => 'Hashwert',
],
'model' => [
'control' => 'Vorlage Kontrollblatt',
'report' => 'Vorlage Lenkungsbericht',
],
'count' => 'Anzahl an Dokumenten',
'total_size' => 'Gesamtgröße',
],
'exports' => [
'index' => 'Exportiere Daten',
'start' => 'Start',
'end' => 'Ende',
'report_title' => 'Report',
'steering' => 'ISMS Lenkungsbericht',
'data_export_title' => 'Datenexport',
'domains_export'=> 'Exportiere Domänen ',
'measures_export' => 'Exportiere Sicherheitsmaßnahmen',
'controls_export' => 'Exportiere Kontrollen',
'import' => 'Import',
],
'imports' => [
'index' => 'Import',
'title' => 'Importiere Sicherheitsmaßnahmen',
],
'login' => [
'title' => 'Passwort eingeben',
'identification' => 'Login',
'connection' => 'Verbindung',
],
'report' => [
'action_plan' => [
'id' => '#',
'title' => 'Aktionsplan',
'next' => 'Reviewdatum'
]
],
'soa' => [
'title' => 'Erklärung der Anwendbarkeit (SoA)',
'generate' => 'Generiere Report'
],
'user' => [
'index' => 'Liste der Benutzer',
'edit' => 'Ändere Benutzer',
'add' => 'Neuer Benutzer',
'show' => 'Zeige Benutzer',
'fields' => [
'login' => 'Login',
'name' => 'Name',
'title' => 'Titel',
'role' => 'Rolle',
'password' => 'Passwort',
'email' => 'E-Mail',
'language' => 'Sprache',
'controls' => 'Kontrollen'
],
'roles' => [
'admin' => 'Administrator',
'user' => 'User',
'auditor' => 'Auditor',
'api' => 'API',
'auditee' => 'Auditierte',
],
],
'config' => [
'notifications' => [
'title' => 'Konfiguration der Benachrichtigungen',
'title_short' => 'Benachrichtigungen',
'help' => 'Hier können Sie die Benachrichtigungen konfigurieren, die die Benutzer per E-Mail erhalten.',
'message_subject' => 'Betreff',
'sent_from' => 'Gesendet von',
'to' => 'an',
'delay' => 'für Kontrollen die ablaufen in',
'recurrence' => 'Sende eine Benachrichtigung',
'duration' => [
'day' => 'Tag',
'days' => 'Tage',
'month' => 'Monat',
'months' => 'Monate',
],
],
],
];
24 changes: 24 additions & 0 deletions resources/lang/de/menu.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?php
return [
'home' => 'Home',
'attributes' => 'Attribute',
'domains' => 'Domänen',
'measures' => 'Maßnahmen',
'controls' => 'Kontrollen',
'planning' => 'Planung',
'radar' => 'Analyse',
'radar_by_domains' => 'nach Domänen',
'radar_by_controls' => 'nach Kontrollen',
'radar_by_attributes' => 'nach Attributen',
'action_plan' => 'Aktionspläne',
'configuration' => [
'title' => 'Konfiguration',
'users' => 'Benutzer',
'reports' => 'Reports',
'import' => "Import",
'documents' => 'Dokumente',
'models' => 'Models',
'notifications' => 'Benachrichtigungen'
],
'logout' => 'Logout'
];
19 changes: 19 additions & 0 deletions resources/lang/de/pagination.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?php

return [

/*
|--------------------------------------------------------------------------
| Pagination Language Lines
|--------------------------------------------------------------------------
|
| The following language lines are used by the paginator library to build
| the simple pagination links. You are free to change them to anything
| you want to customize your views to better match your application.
|
*/

'previous' => '&laquo; Vorherige',
'next' => 'Nächste &raquo;',

];
22 changes: 22 additions & 0 deletions resources/lang/de/passwords.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?php

return [

/*
|--------------------------------------------------------------------------
| Password Reset Language Lines
|--------------------------------------------------------------------------
|
| The following language lines are the default lines which match reasons
| that are given by the password broker for a password update attempt
| has failed, such as for an invalid token or invalid new password.
|
*/

'reset' => 'Ihr Passwort wurde zurückgesetzt!',
'sent' => 'Ein Link zum zurücksetzen des Passwortes wurde per E-Mail versendet!',
'throttled' => 'Bitte warten Sie etwas vor dem nächsten Versuch.',
'token' => 'Der Passwort-Reset-Token ist nicht gültig.',
'user' => "Diese E-Mail-Adresse ist unbekannt.",

];
Loading
Loading