summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/locales/de.yml1
-rw-r--r--config/locales/en.yml2
-rw-r--r--config/locales/fr.yml2
-rw-r--r--config/settings.yml4
4 files changed, 9 insertions, 0 deletions
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 8c069a4bb..c29cd60c4 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1026,6 +1026,7 @@ de:
setting_non_working_week_days: Arbeitsfreie Tage
setting_openid: Erlaube OpenID-Anmeldung und -Registrierung
setting_password_min_length: Mindestlänge des Kennworts
+ setting_password_max_age: Erzwinge Passwortwechsel nach
setting_per_page_options: Objekte pro Seite
setting_plain_text_mail: Nur reinen Text (kein HTML) senden
setting_protocol: Protokoll
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f1a04a0ce..1f205b0ff 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -204,6 +204,7 @@ en:
error_attachment_too_big: "This file cannot be uploaded because it exceeds the maximum allowed file size (%{max_size})"
error_session_expired: "Your session has expired. Please login again."
warning_attachments_not_saved: "%{count} file(s) could not be saved."
+ error_password_expired: "Your password has expired or the administrator requires you to change it."
mail_subject_lost_password: "Your %{value} password"
mail_body_lost_password: 'To change your password, click on the following link:'
@@ -386,6 +387,7 @@ en:
setting_file_max_size_displayed: Maximum size of text files displayed inline
setting_repository_log_display_limit: Maximum number of revisions displayed on file log
setting_openid: Allow OpenID login and registration
+ setting_password_max_age: Require password change after
setting_password_min_length: Minimum password length
setting_new_project_user_role_id: Role given to a non-admin user who creates a project
setting_default_projects_modules: Default enabled modules for new projects
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 17b9a4cda..54dc13a61 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -224,6 +224,7 @@ fr:
error_attachment_too_big: Ce fichier ne peut pas être attaché car il excède la taille maximale autorisée (%{max_size})
error_session_expired: "Votre session a expiré. Veuillez vous reconnecter."
warning_attachments_not_saved: "%{count} fichier(s) n'ont pas pu être sauvegardés."
+ error_password_expired: "Votre mot de passe a expiré ou nécessite d'être changé."
mail_subject_lost_password: "Votre mot de passe %{value}"
mail_body_lost_password: 'Pour changer votre mot de passe, cliquez sur le lien suivant :'
@@ -406,6 +407,7 @@ fr:
setting_file_max_size_displayed: Taille maximum des fichiers texte affichés en ligne
setting_repository_log_display_limit: "Nombre maximum de révisions affichées sur l'historique d'un fichier"
setting_openid: "Autoriser l'authentification et l'enregistrement OpenID"
+ setting_password_max_age: Expiration des mots de passe après
setting_password_min_length: Longueur minimum des mots de passe
setting_new_project_user_role_id: Rôle donné à un utilisateur non-administrateur qui crée un projet
setting_default_projects_modules: Modules activés par défaut pour les nouveaux projets
diff --git a/config/settings.yml b/config/settings.yml
index d2f0ff9bc..e5093dd58 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -36,6 +36,10 @@ unsubscribe:
password_min_length:
format: int
default: 8
+# Maximum password age in days
+password_max_age:
+ format: int
+ default: 0
# Maximum number of additional email addresses per user
max_additional_emails:
format: int