Stable version

Change-Id: I70001bedbdf1823cb9e8dccd545800387777201b

2 files changed, 240 insertions, 58 deletions

diff --git a/moonv4/moon_gui/delivery/assets/i18n/en.json b/moonv4/moon_gui/delivery/assets/i18n/en.json
index fb0a0774..dd54e112 100755
--- a/moonv4/moon_gui/delivery/assets/i18n/en.json
+++ b/moonv4/moon_gui/delivery/assets/i18n/en.json
@@ -215,6 +215,10 @@
 					},
 					"notFound": "There is no Action"
 				},
+				"update":{
+					"error": "Unable to update Perimeter `{{perimeterName}}`",
+					"success": "Perimeter `{{perimeterName}}` successfully updated"
+				},
 				"table": {
 					"id" : "Id",
 					"name" : "Name",
@@ -226,23 +230,28 @@
 					"action": {
 						"title": "Actions",
 						"delete": "Delete",
-						"update": "Update"
+						"update": "Update",
+						"unmap": "Unmap"
 					}
 				},
 				"edit": {
 					"name" : "Name",
 					"description" : "Description",
+					"partnerId": "Partner Id",
+					"policies": "Policy list",
+					"email": "E-mail",
+					"selectedPolicies": "Selected Policies",
 					"check": {
 						"name": {
 							"required": "Name is required"
 						}
 					},
 					"action": {
-						"list": "Map an existing",
-						"new": "Create a new",
-						"create": "Create",
-						"map": "Map the selected",
-						"delete": "Delete"
+						"list": "Add an existing Perimeter",
+						"new": "Add a new Perimeter",
+						"create": "Add Perimeter",
+						"add": "Add the selected Perimeter",
+						"delete" : "Delete the selected Perimeter"
 					},
 					"create":{
 						"error": "Unable to create `{{name}}`",
@@ -307,17 +316,25 @@
 				"edit": {
 					"name" : "Name",
 					"description" : "Description",
+					"categories" : "Category List",
+					"policies": "Policy List",
 					"check": {
 						"name": {
 							"required": "Name is required"
+						},
+						"category":{
+							"required": "A Category is required"
+						},
+						"policy":{
+							"required": "A Policy is required"
 						}
 					},
 					"action": {
-						"list": "Map an existing",
-						"new": "Create a new",
-						"create": "Create",
-						"map": "Map the selected",
-						"delete": "Delete"
+						"list": "Add an existing Data",
+						"new": "Create a new Data",
+						"create": "Create Data",
+						"add": "Add the selected Data",
+						"delete": "Delete Data"
 					},
 					"create":{
 						"error": "Unable to create `{{name}}`",
@@ -342,9 +359,14 @@
 						"description": "Description",
 						"enabled": "Enabled",
 						"rule": "Rule",
+						"instructions": "Instruction",
 						"notFound": "There is no Rule",
 						"loading": {
 							"metaRule" : "Loading Meta Rule"
+						},
+						"action":{
+							"title": "Actions",
+							"delete": "Delete"
 						}
 					},
 					"action": {
@@ -355,14 +377,71 @@
 						"delete": "Delete"
 					},
 					"error": "Unable to retrieve Rule"
+				},
+				"edit": {
+					"title" : "List of associated Rules",
+					"action" : {
+						"create": "Create Rules",
+						"delete": {
+							"error" : "Unable to delete {{rulesName}} Action, reason : {{reason}}",
+							"success": "Rules `{{rulesName}}` successfully deleted"
+						},
+						"add": {
+							"title": "Add a Rules",
+							"policies": "Select a policy",
+							"instructions": "Instruction",
+							"metarules" : "Select one of the associated MetaRules",
+							"categories":{
+								"subject": "Select {{number}} Subject(s)",
+								"object": "Select {{number}} Object(s)",
+								"action": "Select {{number}} Action(s)"
+							},
+							"selectedSubjects": "Selected Subject(s)",
+							"selectedObjects": "Selected Object(s)",
+							"selectedActions": "Selected Action(s)",
+							"details":{
+								"show": "Details",
+								"close": "Close"
+							},
+							"check":{
+								"policy":{
+									"required": "A Policy is required"
+								},
+								"instructions":{
+									"required": "An Instruction in JSON format is required"
+								},
+								"metarules":{
+									"required": "A MetaRule is required"
+								},
+								"subject":{
+									"required": "{{number}} Subject(s) are required"
+								},
+								"object":{
+									"required": "{{number}} Object(s) are required"
+								},
+								"action":{
+									"required": "{{number}} a(s) are required"
+								}
+							},
+							"create":{
+								"error": "Unable to create Rules",
+								"success": "Rules successfully created"
+							},
+							"delete":{
+								"error": "Unable to delete Rules, reason : `{{reason}}`",
+								"success": "Rules successfully deleted"
+							}
+						},
+						"notFound": "There is no Rules"
+					}
 				}
 			},
 			"assignments": {
 				"subject" : {
 					"title" : "List of associated Assignments Subjects",
 					"delete": {
-						"error" : "Unable to delete {{subjectName}} Subject, reason : {{reason}}",
-						"success": "Subject `{{subjectName}}` successfully deleted"
+						"error" : "Unable to delete Assignments, reason : {{reason}}",
+						"success": "Assignments successfully deleted"
 					},
 					"add": {
 						"title": "Add a Assignments Subject"
@@ -372,8 +451,8 @@
 				"object" : {
 					"title" : "List of associated Assignments Objects",
 					"delete": {
-						"error" : "Unable to delete {{objectName}} Object, reason : {{reason}}",
-						"success": "Object `{{objectName}}` successfully deleted"
+						"error" : "Unable to delete Assignments, reason : {{reason}}",
+						"success": "Assignments successfully deleted"
 					},
 					"add": {
 						"title": "Add a Assignments Object"
@@ -383,8 +462,8 @@
 				"action" : {
 					"title" : "List of associated Assignments Actions",
 					"delete": {
-						"error" : "Unable to delete {{actionName}} Action, reason : {{reason}}",
-						"success": "Action `{{actionName}}` successfully deleted"
+						"error" : "Unable to delete Assignments, reason : {{reason}}",
+						"success": "Assignments successfully deleted"
 					},
 					"add": {
 						"title": "Add a Assignments Action"
@@ -413,27 +492,39 @@
 					}
 				},
 				"edit": {
-					"name" : "Name",
-					"description" : "Description",
+					"policies": "Select a Policy",
+					"categories": "Select a Category",
+					"perimeters": "Select a Perimeter",
+					"data": "Select a Data",
+					"selectedData" : "Selected Data",
 					"check": {
-						"name": {
-							"required": "Name is required"
+						"policy":{
+							"required": "A Policy is required"
+						},
+						"category":{
+							"required": "A Category is required"
+						},
+						"perimeter":{
+							"required": "A Perimeter is required"
+						},
+						"data":{
+							"required": "A Data is required"
 						}
 					},
 					"action": {
-						"list": "Map an existing",
-						"new": "Create a new",
-						"create": "Create",
-						"map": "Map the selected",
-						"delete": "Delete"
+						"list": "Add an existing Assignments",
+						"new": "Add a new Assignments",
+						"create": "Create Assignments",
+						"map": "Add the selected Assignments",
+						"delete": "Delete Assignments"
 					},
 					"create":{
-						"error": "Unable to create `{{name}}`",
-						"success": "`{{name}}` successfully created"
+						"error": "Unable to create Assignments",
+						"success": "Assignments successfully created"
 					},
 					"delete":{
-						"error": "Unable to delete `{{name}}`",
-						"success": "`{{name}}` successfully deleted"
+						"error": "Unable to delete Assignments, reason : `{{reason}}`",
+						"success": "Assignments successfully deleted"
 					}
 				}
 			}
diff --git a/moonv4/moon_gui/delivery/assets/i18n/fr.json b/moonv4/moon_gui/delivery/assets/i18n/fr.json
index 957fbac5..85c513b3 100755
--- a/moonv4/moon_gui/delivery/assets/i18n/fr.json
+++ b/moonv4/moon_gui/delivery/assets/i18n/fr.json
@@ -215,6 +215,10 @@
 					},
 					"notFound": "Il n'existe aucune Action"
 				},
+				"update":{
+					"error": "Impossible de mettre à jour le Périmètre `{{perimeterName}}`",
+					"success": "Le Périèmtre `{{perimeterName}}` a été mis à jour"
+				},
 				"table": {
 					"id" : "Id",
 					"name" : "Nom",
@@ -226,22 +230,27 @@
 					"action": {
 						"title": "Actions",
 						"delete": "Supprimer",
-						"update": "Mettre à jour"
+						"update": "Mettre à jour",
+						"unmap": "Dissocier"
 					}
 				},
 				"edit": {
 					"name" : "Nom",
 					"description" : "Description",
+					"partnerId": "Partner Id",
+					"policies":"Liste des Politiques",
+					"email": "E-mail",
+					"selectedPolicies": "Politiques selectionnées",
 					"check": {
 						"name": {
 							"required": "Le nom est requis"
 						}
 					},
 					"action": {
-						"list": "Associer un Element existante",
-						"new": "Créer une nouvelle Element",
-						"create":"Créer l'Element",
-						"map":"Asscoier l'Element selectionnée",
+						"list": "Associer un Périmètre existant",
+						"new": "Ajouter un nouveau Périmètre",
+						"create":"Ajouter le Périmètre ",
+						"map":"Asscoier le Périmètre selectionné",
 						"delete": "Supprimer"
 					},
 					"create": {
@@ -307,17 +316,25 @@
 				"edit": {
 					"name" : "Nom",
 					"description" : "Description",
+					"categories": "Liste des Catégories",
+					"policies": "Liste des Politiques",
 					"check": {
 						"name": {
 							"required": "Le nom est requis"
+						},
+						"category":{
+							"required": "Une Catégorie est requise"
+						},
+						"policy":{
+							"required": "Une Politique est requise"
 						}
 					},
 					"action": {
-						"list": "Associer un Element existante",
-						"new": "Créer une nouvelle Element",
-						"create":"Créer l'Element",
-						"map":"Asscoier l'Element selectionnée",
-						"delete": "Supprimer"
+						"list": "Associer une Data existante",
+						"new": "Créer une nouvelle Data",
+						"create":"Créer la Data",
+						"add":"Ajouter la Data selectionnée",
+						"delete": "Supprimer la Data"
 					},
 					"create": {
 						"error": "Impossible de créer l'Element `{{name}}`",
@@ -342,9 +359,14 @@
 						"description": "Description",
 						"enabled": "Enabled",
 						"rule": "Règle",
+						"instructions": "Instruction",
 						"notFound": "Il n'existe aucune Règle",
 						"loading": {
 							"metaRule" : "Chargement de la Meta Règle"
+						},
+						"action":{
+							"title": "Actions",
+							"delete": "Supprimer"
 						}
 					},
 					"action": {
@@ -355,14 +377,71 @@
 						"delete": "Supprimer"
 					},
 					"error": "Impossible de récupérer la liste des Règles"
+				},
+				"edit": {
+					"title" : "Liste des Règles associées",
+					"action" : {
+						"create": "Créer une Règles",
+						"delete": {
+							"error" : "Impossible de supprimer la Règles{{rulesName}}, raison : {{reason}}",
+							"success": "Règles`{{rulesName}}` supprimée avec succès"
+						},
+						"add": {
+							"title": "Ajouter une Règles",
+							"policies": "Sélectionnez une Politique",
+							"instructions": "Instruction",
+							"metarules" : "Sélectionnez une des MetaRules associée(s)",
+							"categories":{
+								"subject": "Sélectionnez {{number}} Sujet(s)",
+								"object": "Sélectionnez {{number}} Object(s)",
+								"action": "Sélectionnez {{number}} Action(s)"
+							},
+							"selectedSubjects": "Sujets(s) sélectionnés",
+							"selectedObjects": "Objet(s) sélectionnés",
+							"selectedActions": "Action(s) sélectionnées",
+							"details":{
+								"show": "Détails",
+								"close": "Fermer"
+							},
+							"check":{
+								"policy":{
+									"required": "Une Politique est requise"
+								},
+								"instructions":{
+									"required": "Une Instruction au format JSON est requise"
+								},
+								"metarules":{
+									"required": "une MetaRules est requise"
+								},
+								"subject":{
+									"required": "{{number}} Sujets(s) sont requis"
+								},
+								"object":{
+									"required": "{{number}} Obje(s) sont requis"
+								},
+								"action":{
+									"required": "{{number}} Sujets(s) sont requises"
+								}
+							},
+							"create": {
+								"error": "Impossible de créer la Règles `{{name}}`",
+								"success": "La règles `{{name}}` a été créé avec succès"
+							},
+							"delete": {
+								"error": "Impossible de supprimer la Règle, raison: `{{reason}}`",
+								"success": "La Règle a été supprimée avec succès"
+							}
+						},
+						"notFound": "Il n'y a pas de Règles"
+					}
 				}
 			},
 			"assignments" :{
 				"subject" : {
 					"title" : "Liste des Affectations Sujets associées",
 					"delete": {
-						"error" : "Impossible de supprimer l'Affectations Sujet : {{subjectName}}, la raison : {{reason}}",
-						"success": "Affectations Sujet `{{subjectName}}` a été supprimé avec succès"
+						"error" : "Impossible de supprimer l'Affectations, la raison : {{reason}}",
+						"success": "Affectations a été supprimé avec succès"
 					},
 					"add": {
 						"title": "Ajouter une Affectations Sujet"
@@ -372,8 +451,8 @@
 				"object" : {
 					"title" : "Liste des Affectations Objets associées",
 					"delete": {
-						"error" : "Impossible de supprimer l'Affectations Objet : {{objectName}}, la raison : {{reason}}",
-						"success": "Affectations Objet `{{objectName}}` a été supprimée avec succès"
+						"error" : "Impossible de supprimer l'Affectations, la raison : {{reason}}",
+						"success": "Affectations a été supprimée avec succès"
 					},
 					"add": {
 						"title": "Ajouter une Affectations Objet"
@@ -383,8 +462,8 @@
 				"action" : {
 					"title" : "Liste des Affectations Actions associées",
 					"delete": {
-						"error" : "Impossible de supprimer l'Affectations Action : {{actionName}}, la raison : {{reason}}",
-						"success": "Affectations Action `{{actionName}}` a été supprimée avec succès"
+						"error" : "Impossible de supprimer l'Affectations, la raison : {{reason}}",
+						"success": "Affectations Action a été supprimée avec succès"
 					},
 					"add": {
 						"title": "Ajouter une Affectations Action"
@@ -413,27 +492,39 @@
 					}
 				},
 				"edit": {
-					"name" : "Nom",
-					"description" : "Description",
+					"policies": "Sélectionnez une Politique",
+					"categories": "Sélectionnez une Catégorie",
+					"perimeters": "Sélectionnez un Perimètre",
+					"data": "Sélectionnez une Donnée",
+					"selectedData" : "Données Séléctionnées",
 					"check": {
-						"name": {
-							"required": "Le nom est requis"
+						"policy":{
+							"required": "Une Politique est requise"
+						},
+						"category":{
+							"required": "Une Catégorie est requise"
+						},
+						"perimeter":{
+							"required": "Un Perimètre est requis"
+						},
+						"data":{
+							"required": "Une Donnée est requise"
 						}
 					},
 					"action": {
-						"list": "Associer une Affectations existante",
-						"new": "Créer une nouvelle Affectations",
+						"list": "Ajouter une Affectations existante",
+						"new": "Ajouter une nouvelle Affectations",
 						"create":"Créer l'Affectations",
-						"map":"Asscoier l'Affectations selectionnée",
-						"delete": "Supprimer"
+						"map":"Ajouter l'Affectations selectionnée",
+						"delete": "Supprimer l'Affectations"
 					},
 					"create": {
-						"error": "Impossible de créer l'Affectations `{{name}}`",
-						"success": "L'Affectations `{{name}}` a été créé avec succès"
+						"error": "Impossible de créer l'Affectations`",
+						"success": "L'Affectations a été créé avec succès"
 					},
 					"delete": {
-						"error": "Impossible de supprimer l'Affectations `{{name}}`",
-						"success": "L'Affectations `{{name}}` a été supprimée avec succès"
+						"error": "Impossible de supprimer l'Affectations, raison : `{{reason}}`",
+						"success": "L'Affectations a été supprimée avec succès"
 					}
 				}
 			}