Simplify permissions labels

OHFLesvos · Apr 22, 2022 · 4729c99 · 4729c99
1 parent 27dc096
commit 4729c99
Show file tree

Hide file tree

Showing 6 changed files with 154 additions and 144 deletions.
diff --git a/config/permissions.php b/config/permissions.php
@@ -3,76 +3,76 @@
 return [
     'keys' => [
         'app.usermgmt.view' => [
-            'label' => 'auth.permissions.view_usermgmt',
+            'label' => 'permissions.view_usermgmt',
         ],
         'app.usermgmt.users.manage' => [
-            'label' => 'auth.permissions.usermgmt_manage_users',
+            'label' => 'permissions.usermgmt_manage_users',
         ],
         'app.usermgmt.roles.manage' => [
-            'label' => 'auth.permissions.usermgmt_manage_roles',
+            'label' => 'permissions.usermgmt_manage_roles',
         ],
         'app.settings.common.configure' => [
-            'label' => 'auth.permissions.configure_common_settings',
+            'label' => 'permissions.configure_common_settings',
         ],
         'badges.create' => [
-            'label' => 'auth.permissions.create_badges',
+            'label' => 'permissions.create_badges',
         ],
         'fundraising.donors_donations.view' => [
-            'label' => 'auth.permissions.view_fundraising_donors_donations',
+            'label' => 'permissions.view_fundraising_donors_donations',
         ],
         'fundraising.donors_donations.manage' => [
-            'label' => 'auth.permissions.manage_fundraising_donors_donations',
+            'label' => 'permissions.manage_fundraising_donors_donations',
         ],
         'fundraising.reports.view' => [
-            'label' => 'auth.permissions.view_fundraising_reports',
+            'label' => 'permissions.view_fundraising_reports',
         ],
         'fundraising.donations.accept_webhooks' => [
-            'label' => 'auth.permissions.accept_fundraising_donations_webhooks',
+            'label' => 'permissions.accept_fundraising_donations_webhooks',
         ],
         'accounting.transactions.view' => [
-            'label' => 'auth.permissions.view_transactions',
+            'label' => 'permissions.view_transactions',
         ],
         'accounting.transactions.create' => [
-            'label' => 'auth.permissions.create_transactions',
+            'label' => 'permissions.create_transactions',
         ],
         'accounting.transactions.update' => [
-            'label' => 'auth.permissions.update_transactions',
+            'label' => 'permissions.update_transactions',
         ],
         'accounting.transactions.update_metadata' => [
-            'label' => 'auth.permissions.update_transaction_metadata',
+            'label' => 'permissions.update_transaction_metadata',
         ],
         'accounting.transactions.delete' => [
-            'label' => 'auth.permissions.delete_transactions',
+            'label' => 'permissions.delete_transactions',
         ],
         'accounting.transactions.book_externally' => [
-            'label' => 'auth.permissions.book_externally',
+            'label' => 'permissions.book_externally',
         ],
         'accounting.summary.view' => [
-            'label' => 'auth.permissions.view_summary',
+            'label' => 'ermissions.view_summary',
         ],
         'accounting.suppliers.manage' => [
-            'label' => 'auth.permissions.manage_suppliers',
+            'label' => 'permissions.manage_suppliers',
         ],
         'accounting.budgets.view' => [
-            'label' => 'auth.permissions.view_budgets',
+            'label' => 'permissions.view_budgets',
         ],
         'accounting.budgets.manage' => [
-            'label' => 'auth.permissions.manage_budgets',
+            'label' => 'permissions.manage_budgets',
         ],
         'accounting.configure' => [
-            'label' => 'auth.permissions.configure_accounting',
+            'label' => 'permissions.configure_accounting',
         ],
         'cmtyvol.view' => [
-            'label' => 'auth.permissions.view_community_volunteers',
+            'label' => 'permissions.view_community_volunteers',
         ],
         'cmtyvol.manage' => [
-            'label' => 'auth.permissions.manage_community_volunteers',
+            'label' => 'permissions.manage_community_volunteers',
         ],
         'visitors.register' => [
-            'label' => 'auth.permissions.register_visitors',
+            'label' => 'permissions.register_visitors',
         ],
         'visitors.export' => [
-            'label' => 'auth.permissions.export_visitors',
+            'label' => 'permissions.export_visitors',
         ],
     ],
     'gate_mapping' => [

diff --git a/lang/de/auth.php b/lang/de/auth.php
@@ -1,6 +1,7 @@
 <?php
 
 return [
+
     /*
     |--------------------------------------------------------------------------
     | Authentication Language Lines
@@ -15,37 +16,4 @@
     'failed' => 'Diese Kombination aus Zugangsdaten wurden nicht in unserer Datenbank gefunden.',
     'password' => 'Das angegebene Passwort ist falsch.',
     'throttle' => 'Zu viele Loginversuche. Versuchen Sie es bitte in :seconds Sekunden nochmal.',
-
-    'permissions' => [
-        'view_usermgmt' => 'Benutzerverwaltung: Benutzer und Rollen betrachten',
-        'usermgmt_manage_users' => 'Benutzerverwaltung: Benutzer erstellen, bearbeiten und löschen',
-        'usermgmt_manage_roles' => 'Benutzerverwaltung: Rollen erstellen, bearbeiten und löschen',
-
-        'configure_common_settings' => 'Allgemeine Einstellungen konfigurieren',
-
-        'create_badges' => 'Badges: Badges erstellen',
-
-        'view_fundraising_donors_donations' => 'Spendenverwaltung: Spender & Spenden betrachten',
-        'manage_fundraising_donors_donations' => 'Spendenverwaltung: Spender & Spenden verwalten',
-        'view_fundraising_reports' => 'Spendenverwaltung: Berichte betrachten',
-        'accept_fundraising_donations_webhooks' => 'Spendenverwaltung: Webhooks akzeptieren',
-
-        'view_transactions' => 'Buchhaltung: Transaktionen betrachten',
-        'create_transactions' => 'Buchhaltung: Transaktionen erfassen',
-        'update_transactions' => 'Buchhaltung: Transaktionen bearbeiten',
-        'update_transaction_metadata' => 'Buchhaltung: Metadaten von Transaktionen bearbeiten',
-        'delete_transactions' => 'Buchhaltung: Transaktionen löschen',
-        'book_externally' => 'Buchhaltung: Transaktionen extern verbuchen',
-        'view_summary' => 'Buchhaltung: Zusammenfassung ansehen',
-        'manage_suppliers' => 'Buchhaltung: Lieferanten verwalten',
-        'view_budgets' => 'Buchhaltung: Budgets ansehen',
-        'manage_budgets' => 'Buchhaltung: Budgets verwalten',
-        'configure_accounting'  => 'Buchhaltung: Einstellungen bearbeiten',
-
-        'view_community_volunteers' => 'Community Volunteers: Community Volunteers betrachten',
-        'manage_community_volunteers' => 'Community Volunteers: Community Volunteers verwalten',
-
-        'register_visitors' => 'Besucher: Registrieren',
-        'export_visitors' => 'Besucher: Exportieren',
-    ],
 ];
diff --git a/lang/de/permissions.php b/lang/de/permissions.php
@@ -0,0 +1,34 @@
+<?php
+
+return [
+    'view_usermgmt' => 'Benutzerverwaltung: Benutzer und Rollen betrachten',
+    'usermgmt_manage_users' => 'Benutzerverwaltung: Benutzer erstellen, bearbeiten und löschen',
+    'usermgmt_manage_roles' => 'Benutzerverwaltung: Rollen erstellen, bearbeiten und löschen',
+
+    'configure_common_settings' => 'Allgemeine Einstellungen konfigurieren',
+
+    'create_badges' => 'Badges: Badges erstellen',
+
+    'view_fundraising_donors_donations' => 'Spendenverwaltung: Spender & Spenden betrachten',
+    'manage_fundraising_donors_donations' => 'Spendenverwaltung: Spender & Spenden verwalten',
+    'view_fundraising_reports' => 'Spendenverwaltung: Berichte betrachten',
+    'accept_fundraising_donations_webhooks' => 'Spendenverwaltung: Webhooks akzeptieren',
+
+    'view_transactions' => 'Buchhaltung: Transaktionen betrachten',
+    'create_transactions' => 'Buchhaltung: Transaktionen erfassen',
+    'update_transactions' => 'Buchhaltung: Transaktionen bearbeiten',
+    'update_transaction_metadata' => 'Buchhaltung: Metadaten von Transaktionen bearbeiten',
+    'delete_transactions' => 'Buchhaltung: Transaktionen löschen',
+    'book_externally' => 'Buchhaltung: Transaktionen extern verbuchen',
+    'view_summary' => 'Buchhaltung: Zusammenfassung ansehen',
+    'manage_suppliers' => 'Buchhaltung: Lieferanten verwalten',
+    'view_budgets' => 'Buchhaltung: Budgets ansehen',
+    'manage_budgets' => 'Buchhaltung: Budgets verwalten',
+    'configure_accounting'  => 'Buchhaltung: Einstellungen bearbeiten',
+
+    'view_community_volunteers' => 'Community Volunteers: Community Volunteers betrachten',
+    'manage_community_volunteers' => 'Community Volunteers: Community Volunteers verwalten',
+
+    'register_visitors' => 'Besucher: Registrieren',
+        'export_visitors' => 'Besucher: Exportieren',
+];
diff --git a/lang/en/auth.php b/lang/en/auth.php
@@ -16,37 +16,4 @@
     'failed' => 'These credentials do not match our records.',
     'password' => 'The provided password is incorrect.',
     'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
-
-    'permissions' => [
-        'view_usermgmt' => 'User management: View users and roles',
-        'usermgmt_manage_users' => 'User management: Create, edit and delete users',
-        'usermgmt_manage_roles' => 'User management: Create, edit and delete roles',
-
-        'configure_common_settings' => 'Configure common settings',
-
-        'create_badges' => 'Badges: Create badges',
-
-        'view_fundraising_donors_donations' => 'Donation management: View donors & donations',
-        'manage_fundraising_donors_donations' => 'Donation management: Manage donors & donations',
-        'view_fundraising_reports' => 'Donation management: View reports',
-        'accept_fundraising_donations_webhooks' => 'Donation management: Accept Webhooks',
-
-        'view_transactions' => 'Accounting: View transactions',
-        'create_transactions' => 'Accounting: Register transactions',
-        'update_transactions' => 'Accounting: Edit transactions',
-        'update_transaction_metadata' => 'Accounting: Edit metadata of transactions',
-        'delete_transactions' => 'Accounting: Delete transactions',
-        'book_externally' => 'Accounting: Book transactions externally',
-        'view_summary' => 'Accounting: View summary',
-        'manage_suppliers' => 'Accounting: Manage suppliers',
-        'view_budgets' => 'Accounting: View budgets',
-        'manage_budgets' => 'Accounting: Manage budgets',
-        'configure_accounting'  => 'Accounting: Configure settings',
-
-        'view_community_volunteers' => 'Community volunteers: View community volunteers',
-        'manage_community_volunteers' => 'Community volunteers: Manage community volunteers',
-
-        'register_visitors' => 'Visitors: Register',
-        'export_visitors' => 'Visitors: Export',
-    ],
 ];
diff --git a/lang/en/permissions.php b/lang/en/permissions.php
@@ -0,0 +1,34 @@
+<?php
+
+return [
+    'view_usermgmt' => 'User management: View users and roles',
+    'usermgmt_manage_users' => 'User management: Create, edit and delete users',
+    'usermgmt_manage_roles' => 'User management: Create, edit and delete roles',
+
+    'configure_common_settings' => 'Configure common settings',
+
+    'create_badges' => 'Badges: Create badges',
+
+    'view_fundraising_donors_donations' => 'Donation management: View donors & donations',
+    'manage_fundraising_donors_donations' => 'Donation management: Manage donors & donations',
+    'view_fundraising_reports' => 'Donation management: View reports',
+    'accept_fundraising_donations_webhooks' => 'Donation management: Accept Webhooks',
+
+    'view_transactions' => 'Accounting: View transactions',
+    'create_transactions' => 'Accounting: Register transactions',
+    'update_transactions' => 'Accounting: Edit transactions',
+    'update_transaction_metadata' => 'Accounting: Edit metadata of transactions',
+    'delete_transactions' => 'Accounting: Delete transactions',
+    'book_externally' => 'Accounting: Book transactions externally',
+    'view_summary' => 'Accounting: View summary',
+    'manage_suppliers' => 'Accounting: Manage suppliers',
+    'view_budgets' => 'Accounting: View budgets',
+    'manage_budgets' => 'Accounting: Manage budgets',
+    'configure_accounting'  => 'Accounting: Configure settings',
+
+    'view_community_volunteers' => 'Community volunteers: View community volunteers',
+    'manage_community_volunteers' => 'Community volunteers: Manage community volunteers',
+
+    'register_visitors' => 'Visitors: Register',
+    'export_visitors' => 'Visitors: Export',
+];