Collect descriptions from plugins

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>
 

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"
+        }
+      }
+    }
   }
 }

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"

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);

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"
+      }
+    }
+  }
+}