From 18bbdd96283e5eb0e63e3babd983954b54afcf08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Lebleu?= Date: Mon, 16 Jun 2014 17:34:56 +0200 Subject: [PATCH] [i18n] Add translations of missing strings in the actions map --- actionsmap/yunohost.yml | 47 ++++++++++++++++++++++------------------- locales/en.json | 8 ++++++- locales/fr.json | 8 ++++++- 3 files changed, 39 insertions(+), 24 deletions(-) diff --git a/actionsmap/yunohost.yml b/actionsmap/yunohost.yml index 3e3595f6..2336e401 100644 --- a/actionsmap/yunohost.yml +++ b/actionsmap/yunohost.yml @@ -249,7 +249,7 @@ domain: extra: pattern: - '^([a-zA-Z0-9]{1}([a-zA-Z0-9\-]*[a-zA-Z0-9])*)(\.[a-zA-Z0-9]{1}([a-zA-Z0-9\-]*[a-zA-Z0-9])*)*(\.[a-zA-Z]{1}([a-zA-Z0-9\-]*[a-zA-Z0-9])*)$' - - "Must be a valid domain name (e.g. my-domain.org)" + - pattern_domain -m: full: --main help: Is the main domain @@ -272,7 +272,7 @@ domain: extra: pattern: - '^([a-zA-Z0-9]{1}([a-zA-Z0-9\-]*[a-zA-Z0-9])*)(\.[a-zA-Z0-9]{1}([a-zA-Z0-9\-]*[a-zA-Z0-9])*)*(\.[a-zA-Z]{1}([a-zA-Z0-9\-]*[a-zA-Z0-9])*)$' - - "Must be a valid domain name (e.g. my-domain.org)" + - pattern_domain ### domain_info() # info: @@ -305,6 +305,10 @@ app: -n: full: --name help: Name of the list (default fapp) + extra: + pattern: + - '^[a-z0-9_]+$' + - pattern_listname ### app_listlists() listlists: @@ -316,14 +320,13 @@ app: action_help: Remove list from the repositories api: DELETE /appslists arguments: - -n: - full: --name + name: help: Name of the list to remove extra: - ask: "List to remove" + ask: ask_list_to_remove pattern: - '^[a-z0-9_]+$' - - "Must be alphanumeric and underscore characters only" + - pattern_listname ### app_list() list: @@ -374,8 +377,7 @@ app: extra: pattern: - '^[a-z0-9_]+$' - - "Must be alphanumeric and underscore characters only" - + - pattern_username ### app_install() TODO: Write help install: @@ -453,7 +455,7 @@ app: extra: pattern: - '^([0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$' - - "Must be a valid port number (i.e. 0-65535)" + - pattern_port ### app_checkurl() checkurl: @@ -795,11 +797,8 @@ service: -n: full: --number help: Number of lines to display - default: "50" - extra: - pattern: - - '^[0-9]+$' - - "Must be a valid number" + default: 50 + type: int ############################# @@ -834,7 +833,7 @@ firewall: extra: pattern: - '^([0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$' - - "Must be a valid port number (i.e. 0-65535)" + - pattern_port protocol: help: Protocol associated with port choices: @@ -860,7 +859,7 @@ firewall: extra: pattern: - '^([0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$' - - "Must be a valid port number (i.e. 0-65535)" + - pattern_port protocol: help: Protocol associated with port choices: @@ -967,11 +966,13 @@ tools: -o: full: --old-password extra: - password: "Current admin password" + password: ask_current_admin_password + required: True -n: full: --new-password extra: - password: "New admin password" + password: ask_new_admin_password + required: True ### tools_maindomain() maindomain: @@ -985,13 +986,13 @@ tools: extra: pattern: - '^([a-zA-Z0-9]{1}([a-zA-Z0-9\-]*[a-zA-Z0-9])*)(\.[a-zA-Z0-9]{1}([a-zA-Z0-9\-]*[a-zA-Z0-9])*)*(\.[a-zA-Z]{1}([a-zA-Z0-9\-]*[a-zA-Z0-9])*)$' - - "Must be a valid domain name (e.g. my-domain.org)" + - pattern_domain -n: full: --new-domain extra: pattern: - '^([a-zA-Z0-9]{1}([a-zA-Z0-9\-]*[a-zA-Z0-9])*)(\.[a-zA-Z0-9]{1}([a-zA-Z0-9\-]*[a-zA-Z0-9])*)*(\.[a-zA-Z]{1}([a-zA-Z0-9\-]*[a-zA-Z0-9])*)$' - - "Must be a valid domain name (e.g. my-domain.org)" + - pattern_domain ### tools_postinstall() postinstall: @@ -1008,12 +1009,14 @@ tools: ask: "Main domain" pattern: - '^([a-zA-Z0-9]{1}([a-zA-Z0-9\-]*[a-zA-Z0-9])*)(\.[a-zA-Z0-9]{1}([a-zA-Z0-9\-]*[a-zA-Z0-9])*)*(\.[a-zA-Z]{1}([a-zA-Z0-9\-]*[a-zA-Z0-9])*)$' - - "Must be a valid domain name (e.g. my-domain.org)" + - pattern_domain + required: True -p: full: --password help: YunoHost admin password extra: - password: "New admin password" + password: ask_new_admin_password + required: True --dyndns: help: Subscribe domain to a DynDNS service action: store_true diff --git a/locales/en.json b/locales/en.json index ff70d920..f11efe79 100644 --- a/locales/en.json +++ b/locales/en.json @@ -142,9 +142,15 @@ "ask_lastname" : "Last name", "ask_email" : "Email address", "ask_password" : "Password", + "ask_current_admin_password" : "Current administration password", + "ask_new_admin_password" : "New administration password", + "ask_list_to_remove" : "List to remove", "pattern_username" : "Must be alphanumeric and underscore characters only", "pattern_firstname" : "Must be a valid first name", "pattern_lastname" : "Must be a valid last name", - "pattern_email" : "Must be a valid email address (e.g. someone@domain.org)" + "pattern_email" : "Must be a valid email address (e.g. someone@domain.org)", + "pattern_domain" : "Must be a valid domain name (e.g. my-domain.org)", + "pattern_listname" : "Must be alphanumeric and underscore characters only", + "pattern_port" : "Must be a valid port number (i.e. 0-65535)" } diff --git a/locales/fr.json b/locales/fr.json index 4b467d35..48df521c 100644 --- a/locales/fr.json +++ b/locales/fr.json @@ -142,9 +142,15 @@ "ask_lastname" : "Nom", "ask_email" : "Adresse mail", "ask_password" : "Mot de passe", + "ask_current_admin_password" : "Mot de passe d'administration actuel", + "ask_new_admin_password" : "Nouveau mot de passe d'administration", + "ask_list_to_remove" : "Liste à supprimer", "pattern_username" : "Doit être composé uniquement de caractères alphanumérique et de tiret bas", "pattern_firstname" : "Doit être un prénom valide", "pattern_lastname" : "Doit être un nom valide", - "pattern_email" : "Doit être une adresse mail valide (ex. : someone@domain.org)" + "pattern_email" : "Doit être une adresse mail valide (ex. : someone@domain.org)", + "pattern_domain" : "Doit être un nom de domaine valide (ex : mon-domaine.org)", + "pattern_listname" : "Doit être composé uniquement de caractères alphanumérique et de tiret bas", + "pattern_port" : "Doit être un numéro de port valide (0-65535)" }