Amend install wizard

SynoCommunity · Sep 15, 2024 · 3da7d13 · 3da7d13
1 parent 117a4be
commit 3da7d13
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 22 deletions.
diff --git a/spk/owncloud/src/wizard_templates/install_uifile.sh b/spk/owncloud/src/wizard_templates/install_uifile.sh
@@ -24,45 +24,45 @@ page_append ()
 
 RESTORE_BACKUP_FILE="wizard_owncloud_restore"
 BACKUP_FILE_PATH="wizard_backup_file"
-ERROR_TEXT="{{{OWNCLOUD_BACKUP_FILE_VALIDATION_ERROR_TEXT}}}"
+RESTORE_ERROR_TEXT="{{{OWNCLOUD_BACKUP_FILE_VALIDATION_ERROR_TEXT}}}"
 
-checkBackupFile()
+checkBackupRestore()
 {
-	CHECK_BACKUP_FILE=$(/bin/cat<<EOF
+	CHECK_BACKUP_RESTORE=$(/bin/cat<<EOF
 {
-	var backupFileCheck = arguments[0];
+	var backupFilePath = arguments[0];
 	var step = arguments[2];
-	var fileRestore = step.getComponent("${RESTORE_BACKUP_FILE}");
-	if (fileRestore.checked) {
-		if (backupFileCheck === "") {
-			return "${ERROR_TEXT}";
+	var backupRestore = step.getComponent("${RESTORE_BACKUP_FILE}");
+	if (backupRestore.checked) {
+		if (backupFilePath === "") {
+			return "${RESTORE_ERROR_TEXT}";
 		}
 	}
 	return true;
 }
 EOF
 )
-	echo "$CHECK_BACKUP_FILE" | quote_json
+	echo "$CHECK_BACKUP_RESTORE" | quote_json
 }
 
-getBackupFile()
+checkBackupFile()
 {
-	BACKUP_FILE=$(/bin/cat<<EOF
+	CHECK_BACKUP_FILE=$(/bin/cat<<EOF
 {
-	var backupFile = arguments[0];
+	var backupRestore = arguments[0];
 	var step = arguments[2];
-	var filePath = step.getComponent("${BACKUP_FILE_PATH}");
-	if (backupFile) {
-		filePath.setDisabled(false);
+	var backupFilePath = step.getComponent("${BACKUP_FILE_PATH}");
+	if (backupRestore) {
+		backupFilePath.setDisabled(false);
 	} else {
-		filePath.setValue("");
-		filePath.setDisabled(true);
+		backupFilePath.setValue("");
+		backupFilePath.setDisabled(true);
 	}
 	return true;
 }
 EOF
 )
-	echo "$BACKUP_FILE" | quote_json
+	echo "$CHECK_BACKUP_FILE" | quote_json
 }
 
 jsFunction=$(/bin/cat<<EOF
@@ -175,7 +175,7 @@ PAGE_ADMIN_CONFIG=$(/bin/cat<<EOF
 			"desc": "{{{OWNCLOUD_RESTORE_LABEL}}}",
 			"defaultValue": false,
 			"validator": {
-				"fn": "$(getBackupFile)"
+				"fn": "$(checkBackupFile)"
 			}
 		}]
 	}, {
@@ -187,7 +187,7 @@ PAGE_ADMIN_CONFIG=$(/bin/cat<<EOF
 			"disabled": true,
 			"emptyText": "${SYNOPKG_PKGDEST_VOL}/${SYNOPKG_PKGNAME}/backup",
 			"validator": {
-				"fn": "$(checkBackupFile)"
+				"fn": "$(checkBackupRestore)"
 			}
 		}]
 	}, {

diff --git a/spk/owncloud/src/wizard_templates/install_uifile.yml b/spk/owncloud/src/wizard_templates/install_uifile.yml
@@ -7,7 +7,7 @@ OWNCLOUD_BACKUP_FILE_LOCATION_LABEL: "Backup file location"
 OWNCLOUD_BACKUP_FILE_VALIDATION_ERROR_TEXT: "An empty file path is not allowed when restore is enabled."
 OWNCLOUD_DATA_DIRECTORY_DESCRIPTION: "ownCloud data directory"
 OWNCLOUD_DATA_DIRECTORY_LABEL: "Share name"
-OWNCLOUD_DATA_DIRECTORY_VALIDATION_ERROR_TEXT: "Subdirectories are not supported."
+OWNCLOUD_DATA_DIRECTORY_VALIDATION_ERROR_TEXT: "The shared folder name contains invalid characters or starts/ends with a space."
 
 OWNCLOUD_ADMIN_CONFIGURATION_STEP_TITLE: "ownCloud admin configuration"
 OWNCLOUD_ADMIN_USER_NAME_DESCRIPTION: "Administrator's login. Defaults to 'admin'"

diff --git a/spk/owncloud/src/wizard_templates/install_uifile_fre.yml b/spk/owncloud/src/wizard_templates/install_uifile_fre.yml
@@ -7,7 +7,7 @@ OWNCLOUD_BACKUP_FILE_LOCATION_LABEL: "Emplacement du fichier de sauvegarde"
 OWNCLOUD_BACKUP_FILE_VALIDATION_ERROR_TEXT: "Un chemin de fichier vide n'est pas autorisé lorsque la restauration est activée."
 OWNCLOUD_DATA_DIRECTORY_DESCRIPTION: "Répertoire de données ownCloud"
 OWNCLOUD_DATA_DIRECTORY_LABEL: "Partager le nom"
-OWNCLOUD_DATA_DIRECTORY_VALIDATION_ERROR_TEXT: "Les sous-répertoires ne sont pas pris en charge."
+OWNCLOUD_DATA_DIRECTORY_VALIDATION_ERROR_TEXT: "Le nom du dossier partagé contient des caractères non valides ou commence/se termine par un espace."
 
 OWNCLOUD_ADMIN_CONFIGURATION_STEP_TITLE: "Configuration de l'administrateur d'ownCloud"
 OWNCLOUD_ADMIN_USER_NAME_DESCRIPTION: "Connexion de l'administrateur. Par défaut, 'admin'"