From 80466c9700f535289de83ae9ddb4160f99992885 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Fri, 18 Jan 2019 15:33:33 +0100
Subject: [PATCH] Collect descriptions from plugins

---
 .../resources/META-INF/scm/permissions.xml    |  4 ----
 .../main/resources/locales/en/plugins.json    | 16 +++++++++++++
 scm-ui/public/locales/en/permissions.json     | 20 ----------------
 .../components/PermissionCheckbox.js          |  7 +++---
 .../main/resources/locales/en/plugins.json    | 24 +++++++++++++++++++
 5 files changed, 44 insertions(+), 27 deletions(-)
 create mode 100644 scm-webapp/src/main/resources/locales/en/plugins.json

diff --git a/scm-plugins/scm-git-plugin/src/main/resources/META-INF/scm/permissions.xml b/scm-plugins/scm-git-plugin/src/main/resources/META-INF/scm/permissions.xml
index a61077f61a..2f97eb5762 100644
--- a/scm-plugins/scm-git-plugin/src/main/resources/META-INF/scm/permissions.xml
+++ b/scm-plugins/scm-git-plugin/src/main/resources/META-INF/scm/permissions.xml
@@ -34,14 +34,10 @@
 <permissions>
   
   <permission>
-    <display-name>Git config (read)</display-name>
-    <description>Read access to git config</description>
     <value>configuration:read:git</value>
   </permission>
   
   <permission>
-    <display-name>Git config (write)</display-name>
-    <description>Write access to git config</description>
     <value>configuration:write:git</value>
   </permission>
 
diff --git a/scm-plugins/scm-git-plugin/src/main/resources/locales/en/plugins.json b/scm-plugins/scm-git-plugin/src/main/resources/locales/en/plugins.json
index a84f44726f..68194e3a43 100644
--- a/scm-plugins/scm-git-plugin/src/main/resources/locales/en/plugins.json
+++ b/scm-plugins/scm-git-plugin/src/main/resources/locales/en/plugins.json
@@ -33,5 +33,21 @@
       },
       "success": "Default branch changed!"
     }
+  },
+  "permissions" : {
+    "configuration": {
+      "read": {
+        "git": {
+          "displayName": "Read git configuration",
+          "description": "May read the git configuration"
+        }
+      },
+      "write": {
+        "git": {
+          "displayName": "Write git configuration",
+          "description": "May change the git configuration"
+        }
+      }
+    }
   }
 }
diff --git a/scm-ui/public/locales/en/permissions.json b/scm-ui/public/locales/en/permissions.json
index 3e929434cb..52059db60a 100644
--- a/scm-ui/public/locales/en/permissions.json
+++ b/scm-ui/public/locales/en/permissions.json
@@ -1,24 +1,4 @@
 {
-  "repository": {
-    "read": {
-      "*": {
-        "displayName": "Read all repositories",
-        "description": "Read access to all repositories"
-      }
-    },
-    "write": {
-      "*": {
-        "displayName": "Modify all repositories",
-        "description": "May modify/configure all repositories"
-      }
-    }
-  },
-  "user":{
-    "*": {
-      "displayName": "Administer users",
-      "description": "May administer all users"
-    }
-  },
   "form": {
     "submit-button": {
       "label": "Set permissions"
diff --git a/scm-ui/src/permissions/components/PermissionCheckbox.js b/scm-ui/src/permissions/components/PermissionCheckbox.js
index 5f9b2774a4..4fca7bba51 100644
--- a/scm-ui/src/permissions/components/PermissionCheckbox.js
+++ b/scm-ui/src/permissions/components/PermissionCheckbox.js
@@ -16,17 +16,18 @@ class PermissionCheckbox extends React.Component<Props> {
   render() {
     const { t, permission, checked, onChange, disabled } = this.props;
     const key = permission.split(":").join(".");
+    console.log("permissions." + key + ".displayName");
     return (
       <Checkbox
         name={permission}
-        label={t(key + ".displayName")}
+        label={t("permissions." + key + ".displayName")}
         checked={checked}
         onChange={onChange}
         disabled={disabled}
-        helpText={t(key + ".description")}
+        helpText={t("permissions." + key + ".description")}
       />
     );
   }
 }
 
-export default translate("permissions")(PermissionCheckbox);
+export default translate("plugins")(PermissionCheckbox);
diff --git a/scm-webapp/src/main/resources/locales/en/plugins.json b/scm-webapp/src/main/resources/locales/en/plugins.json
new file mode 100644
index 0000000000..2df9fc2981
--- /dev/null
+++ b/scm-webapp/src/main/resources/locales/en/plugins.json
@@ -0,0 +1,24 @@
+{
+  "permissions": {
+    "repository": {
+      "read": {
+        "*": {
+          "displayName": "Read all repositories",
+          "description": "Read access to all repositories"
+        }
+      },
+      "write": {
+        "*": {
+          "displayName": "Modify all repositories",
+          "description": "May modify/configure all repositories"
+        }
+      }
+    },
+    "user": {
+      "*": {
+        "displayName": "Administer users",
+        "description": "May administer all users"
+      }
+    }
+  }
+}