Merge branches 'develop' and 'develop' of https://github.com/amooma/GS5 into develop

3 files changed, 92 insertions, 0 deletions

diff --git a/config/locales/views/restore_jobs/de.yml b/config/locales/views/restore_jobs/de.yml
new file mode 100644
index 0000000..18ee349
--- /dev/null
+++ b/config/locales/views/restore_jobs/de.yml
@@ -0,0 +1,45 @@
+de:
+  restore_jobs:
+    name: 'Restore Auftrag'
+    controller:
+      successfuly_created: 'Restore Auftrag wurde angelegt.'
+      successfuly_updated: 'Restore Auftrag wurde aktualisiert.'
+      successfuly_destroyed: 'Restore Auftrag wurde gelöscht.'
+    index:
+      page_title: 'Liste Restore Aufträge'
+      state: 'Status'
+      backup_file: 'Backup Datei'
+      actions:
+        confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Restore Auftrag'
+        destroy: 'Löschen'
+        edit: 'Bearbeiten'
+        show: 'Anzeigen'
+        create: 'Neu anlegen'
+        create_for: 'Restore Auftrag neu anlegen für %{resource}'
+    show:
+      page_title: 'Restore Auftrag bearbeiten'
+      state: 'Status'
+      backup_file: 'Backup Datei'
+      actions:
+        confirm_destroy: 'Sind Sie sicher, dass die dieses Element löschen möchten?'
+        destroy: 'Löschen'
+        edit: 'Bearbeiten'
+        view_all: 'Alle anzeigen'
+    new:
+      page_title: 'Restore Auftrag neu anlegen'
+      actions:
+        back_to_list: 'Zurück zur Übersicht'
+    edit:
+      page_title: 'Restore Auftrag bearbeiten'
+      actions:
+        back_to_list: 'Zurück zur Übersicht'
+        edit: 'Bearbeiten'
+        view_all: 'Alle anzeigen'
+    form:
+      state:
+        label: 'Status'
+        hint: ''
+      backup_file:
+        label: 'Backup Datei'
+        hint: ''
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/restore_jobs/en.yml b/config/locales/views/restore_jobs/en.yml
new file mode 100644
index 0000000..d75de95
--- /dev/null
+++ b/config/locales/views/restore_jobs/en.yml
@@ -0,0 +1,45 @@
+en:
+  restore_jobs:
+    name: 'Restorejob'
+    controller:
+      successfuly_created: 'Successfully created Restorejob.'
+      successfuly_updated: 'Successfully updated Restorejob.'
+      successfuly_destroyed: 'Successfully destroyed Restorejob.'
+    index:
+      page_title: 'Listing Restorejob'
+      state: 'State'
+      backup_file: 'Backup file'
+      actions:
+        confirm_destroy: 'Are you sure you want to delete this Restorejob?'
+        destroy: 'Delete'
+        edit: 'Edit'
+        show: 'View'
+        create: 'New'
+        create_for: 'New Restorejob for %{resource}'
+    show:
+      page_title: 'Show Restorejob'
+      state: 'State'
+      backup_file: 'Backup file'
+      actions:
+        confirm_destroy: 'Are you sure you want to delete this element?'
+        destroy: 'Delete'
+        edit: 'Edit'
+        view_all: 'View All'
+    new:
+      page_title: 'New Restorejob'
+      actions:
+        back_to_list: 'Back to Index'
+    edit:
+      page_title: 'Editing Restorejob'
+      actions:
+        back_to_list: 'Back to Index'
+        edit: 'Edit'
+        view_all: 'View All'
+    form:
+      state:
+        label: 'State'
+        hint: ''
+      backup_file:
+        label: 'Backup file'
+        hint: ''
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index b6943ab..87c9c66 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,5 +1,7 @@
 Gemeinschaft42c::Application.routes.draw do
 
+  resources :restore_jobs
+
   resources :groups do
     resources :group_memberships
     resources :group_permissions