diff --git a/app/src/helpers/validators/customValidators.js b/app/src/helpers/validators/customValidators.js index 33bdae63..94c4aa4c 100644 --- a/app/src/helpers/validators/customValidators.js +++ b/app/src/helpers/validators/customValidators.js @@ -34,7 +34,7 @@ const emailForward = value => helpers.withParams( } )(value) -const githubLink = helpers.regex('githubLink', /^https:\/\/github.com\/[a-zA-Z0-9-_.]+\/[a-zA-Z0-9-_.]+[/]?$/) +const appRepoUrl = helpers.regex('appRepoUrl', /^https:\/\/[a-zA-Z0-9-_.]+\/[a-zA-Z0-9-_./]+\/[a-zA-Z0-9-_.]+_ynh(\/?(-\/)?tree\/[a-zA-Z0-9-_]+)?(\.git)?\/?$/) const includes = items => item => helpers.withParams( { type: 'includes', value: item }, @@ -56,7 +56,7 @@ export { emailForward, emailForwardLocalPart, emailLocalPart, - githubLink, + appRepoUrl, includes, name, unique diff --git a/app/src/i18n/locales/en.json b/app/src/i18n/locales/en.json index a312bbd5..cb14f504 100644 --- a/app/src/i18n/locales/en.json +++ b/app/src/i18n/locales/en.json @@ -194,7 +194,7 @@ "dynDomain": "Invalid domain name: Must be lower-case alphanumeric and dash characters only", "email": "Invalid email: must be alphanumeric and _.- characters only (e.g. someone@example.com, s0me-1@example.com)", "emailForward": "Invalid email forward: must be alphanumeric and _.-+ characters only (e.g. someone+tag@example.com, s0me-1+tag@example.com)", - "githubLink": "URL must be a valid GitHub link to a repository", + "appRepoUrl": "YunoHost app repository URLs are expected to look like https://domain.tld/path/to/repo_ynh", "name": "Names may not includes special characters except  ,.'-", "minValue": "Value must be a number equal or greater than {min}.", "maxValue": "Value must be a number equal or lesser than {max}.", diff --git a/app/src/i18n/locales/fr.json b/app/src/i18n/locales/fr.json index 5d8418a0..a527a6b2 100644 --- a/app/src/i18n/locales/fr.json +++ b/app/src/i18n/locales/fr.json @@ -374,7 +374,7 @@ "notInUsers": "L'utilisateur '{value}' existe déjà.", "minValue": "La valeur doit être un nombre égal ou supérieur à {min}.", "name": "Les noms ne peuvent pas comporter de caractères spéciaux, sauf ,.'-", - "githubLink": "L'URL doit être un lien GitHub valide vers un dépôt", + "appRepoUrl": "Les URLs de dêpôt d'app YunoHost doivent ressembler à https://domain.tld/path/to/repo_ynh", "emailForward": "Adresse de transfert de courrier électronique invalide : elle doit être composée de caractères alphanumérique et de _.-+ seulement (par exemple, someone+tag@example.com, s0me-1+tag@example.com)", "email": "Adresse de courriel invalide : elle doit être composée de caractères alphanumérique et des caractères _.- seulement (par exemple someone@example.com, s0me-1@example.com)", "dynDomain": "Nom de domaine invalide : Il doit être composé de minuscules alphanumériques et de tirets uniquement", diff --git a/app/src/views/app/AppCatalog.vue b/app/src/views/app/AppCatalog.vue index 2daf3381..c166d07f 100644 --- a/app/src/views/app/AppCatalog.vue +++ b/app/src/views/app/AppCatalog.vue @@ -155,7 +155,7 @@