diff --git a/src/backend/freecad.go b/src/backend/freecad.go index c3dc64f..1fd84c1 100644 --- a/src/backend/freecad.go +++ b/src/backend/freecad.go @@ -102,7 +102,7 @@ func createEntry(content string) (int) { // FileContent contains the script to be executed by FreeCAD it will generate a file preview and a Wavefront OBJ format // this file shall be put into the ctrlr0 bucket from the user account - // We must pass it to FreeCAD but this is a scarce ressource and that shall be done properly + // We must pass it to FreeCAD but this is a scarce resource and that shall be done properly // If we got a system crash or whatever // We are storing each FreeCAD script to the file system and use a named pipe to process the file diff --git a/src/backend/minioServer.go b/src/backend/minioServer.go index 42cbcb3..98cfd39 100644 --- a/src/backend/minioServer.go +++ b/src/backend/minioServer.go @@ -532,7 +532,7 @@ func createMinIOServer(username string, URL string, accessToken string, secretTo } } - // We need to return some informations like + // We need to return some information like // the minIO IP address, the TCPPORT // as to properly configure the reverse proxy and route the traffic to it // We also need to implement the user loopback as to configure the reverse proxy diff --git a/src/credential/projects.go b/src/credential/projects.go index 8486459..f3c6462 100644 --- a/src/credential/projects.go +++ b/src/credential/projects.go @@ -680,7 +680,7 @@ func getPlayerCode(w http.ResponseWriter, path string, Host string, private int) contentString := strings.Replace(string(content), "MODELSOURCE", fullPath, 1) - // We must use the NEWCODE stuff to request additionnal object parts + // We must use the NEWCODE stuff to request additional object parts code := "" if ( partNbInt != -1 ) { @@ -979,7 +979,7 @@ func recomputeProject(w http.ResponseWriter, r *http.Request, path string, priva data.Key = keys[0] data.SecretKey = secretKey data.URI = urlhost - // We need to substract the base port + // We need to subtract the base port // from the urlport i, _ := strconv.Atoi(urlport) i = i - base.MinIOServerBasePort @@ -1078,7 +1078,7 @@ func userCallback(w http.ResponseWriter, r *http.Request) { case http.MethodGet: context := strings.Split(r.URL.Path, "/") // Check anonymous call - // We must do that test only if the retreived data is private + // We must do that test only if the retrieved data is private // If it is not private if ( checkAccess(w,r,context[2]) ) { keyWords := strings.Split(r.URL.Path, "/") @@ -1265,10 +1265,10 @@ func main() { print("| Private use only |\n") print("=============================== \n") - // The project backend data are stored within a minio instances - // These datas are the metadatas of the end user and we shall be sure that - // they are resilient to system crash etc - // We also need to be sure that they scale per server + // The project backend data is stored within a minio instance + // This data is the metadata of the end user and we should be sure that + // it is resilient to system crashes etc... + // We also need to be sure that it scales per server start_minio() diff --git a/src/credential/users.go b/src/credential/users.go index 3af5dd5..e541831 100644 --- a/src/credential/users.go +++ b/src/credential/users.go @@ -92,14 +92,14 @@ func userGetInfo(nickname string) (*userPublic) { return_value.TokenAuth = temp_value.TokenAuth return_value.TokenAuthRW = "0" return_value.TokenSecret = temp_value.TokenSecret - return_value.TokenSecretLABEL = "TokenType, TokenAuth and TokenSecret are private values that you shouldn't share with anybody. They are automatically assigned to you as to provide you unique authentication capabilities to JustYour.Parts services. Use them to connect you to the service through FreeCAD or an Amazon s3 compliant client. Please refer to our end user documentation for further informations." + return_value.TokenSecretLABEL = "TokenType, TokenAuth and TokenSecret are private values that you shouldn't share with anybody. They are automatically assigned to you as to provide you unique authentication capabilities to JustYour.Parts services. Use them to connect you to the service through FreeCAD or an Amazon s3 compliant client. Please refer to our end user documentation for further information." return_value.TokenSecretRW = "0" return_value.CreationDate = temp_value.CreationDate return_value.CreationDateRW = "0" return_value.Lastlogin = temp_value.Lastlogin return_value.LastloginRW = "0" return_value.Email = temp_value.Email - return_value.EmailLABEL = "Your primary email address. It won't be shared with anybody except if you explicitely activate that feature into the privacy field. Warning your email address must be verified each time you change it. During that process your account is disabled and can't be recovered without contacting us." + return_value.EmailLABEL = "Your primary email address. It won't be shared with anybody except if you explicitly activate that feature into the privacy field. Warning your email address must be verified each time you change it. During that process your account is disabled and can't be recovered without contacting us." return_value.EmailRW = "1" } @@ -143,7 +143,7 @@ func updateAccount(username string, w http.ResponseWriter, r *http.Request) (boo _ = json.Unmarshal(getJSON, &newData) - // So now let's run some comparaison + // So now let's run some comparison if ( updatedData.Active == 0 ) { http.Error(w, "401 User not activated Please check email", 401) return false diff --git a/src/frontend/master.go b/src/frontend/master.go index 6b13ff9..3fc6598 100644 --- a/src/frontend/master.go +++ b/src/frontend/master.go @@ -293,7 +293,7 @@ func home(w http.ResponseWriter, r *http.Request) { // This code is looking for the TCP port and the URL of the minio server corresponding // to the user defined with its public key - // We excute there the original request + // We execute there the original request keys := strings.Split(words[1],":") cacheURI := os.Getenv("CACHE_URI") diff --git a/src/static/html/myAccountWarning.html b/src/static/html/myAccountWarning.html index a50965c..f3388c2 100644 --- a/src/static/html/myAccountWarning.html +++ b/src/static/html/myAccountWarning.html @@ -1,13 +1,13 @@