From 47dffca74413565943f102301438cdd6b3414087 Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Wed, 15 Mar 2017 23:51:12 +0100 Subject: [PATCH 1/2] Allow underscore in backup name Allow underscore in backup name, to allow backup with the name of multi-instance apps. If there are no reason to avoid this character. --- data/actionsmap/yunohost.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/actionsmap/yunohost.yml b/data/actionsmap/yunohost.yml index ef951496c..c37a2c2f1 100644 --- a/data/actionsmap/yunohost.yml +++ b/data/actionsmap/yunohost.yml @@ -678,7 +678,7 @@ backup: help: Name of the backup archive extra: pattern: &pattern_backup_archive_name - - !!str ^[\w\-\.]{1,30}(? Date: Tue, 28 Mar 2017 01:33:20 +0200 Subject: [PATCH 2/2] Mention limit of 30 characters in message --- locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/en.json b/locales/en.json index 62acc4e10..f5db98595 100644 --- a/locales/en.json +++ b/locales/en.json @@ -153,7 +153,7 @@ "packages_upgrade_critical_later": "Critical packages ({packages:s}) will be upgraded later", "packages_upgrade_failed": "Unable to upgrade all of the packages", "path_removal_failed": "Unable to remove path {:s}", - "pattern_backup_archive_name": "Must be a valid filename with alphanumeric and -_. characters only", + "pattern_backup_archive_name": "Must be a valid filename with max 30 characters, and alphanumeric and -_. characters only", "pattern_domain": "Must be a valid domain name (e.g. my-domain.org)", "pattern_email": "Must be a valid email address (e.g. someone@domain.org)", "pattern_firstname": "Must be a valid first name",