Merge pull request #112 from InseeFr/acceptance

Acceptance
InseeFr · Aug 11, 2020 · c477c70 · c477c70
2 parents adc0acc + 2a7426f
commit c477c70
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/app/.env.development b/app/.env.development
@@ -1,3 +1,3 @@
-REACT_APP_API_BASE_HOST = 'http://localhost:8081/api'
+REACT_APP_API_BASE_HOST = 'http://localhost:6969/Bauhaus-Back-Office/api'
 
-REACT_APP_APPLICATIONS = "concepts,classifications,operations,structures"
+REACT_APP_APPLICATIONS = "concepts,classifications"
diff --git a/app/.env.production b/app/.env.production
@@ -1,3 +1,3 @@
 REACT_APP_API_BASE_HOST = './api'
 
-REACT_APP_APPLICATIONS = "concepts,classifications,operations,structures"
+REACT_APP_APPLICATIONS = "concepts,classifications"
diff --git a/app/.env.test b/app/.env.test
@@ -1,3 +1,3 @@
-REACT_APP_API_BASE_HOST = 'http://localhost:8081/api'
+REACT_APP_API_BASE_HOST = 'http://localhost:6969/Bauhaus-Back-Office/api'
 
 REACT_APP_APPLICATIONS = "concepts,classifications,operations,structures"
diff --git a/app/package.json b/app/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "Bauhaus",
-	"version": "2.0.0",
+	"version": "2.1.0",
 	"description": "Web application for the management of concepts, classifications and other statistical objects",
 	"repository": {
 		"type": "git",

diff --git a/app/src/js/i18n/dictionary/app.js b/app/src/js/i18n/dictionary/app.js
@@ -126,7 +126,7 @@ const dictionary = {
 	},
 	validationStatusPlaceholder: {
 		fr: 'Sélectionnez le statut de publication...',
-		en: 'Select publishing status...',
+		en: 'Select publication status...',
 	},
 	creatorTitle: {
 		fr: 'Propriétaire',

diff --git a/app/src/js/i18n/dictionary/concepts.js b/app/src/js/i18n/dictionary/concepts.js
@@ -102,11 +102,11 @@ const dictionary = {
 	},
 	isConceptValidTitle: {
 		fr: 'État du concept',
-		en: 'State of the concept',
+		en: 'Publication status',
 	},
 	isCollectionValidTitle: {
 		fr: 'État de la collection',
-		en: 'State of the collection',
+		en: 'Publication status',
 	},
 	conceptsDefinition: {
 		fr: 'Définition',