summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/locales/en.yml10
-rw-r--r--config/settings.yml3
2 files changed, 13 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b4f37f0b7..d0c72ef69 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -132,6 +132,10 @@ en:
earlier_than_minimum_start_date: "cannot be earlier than %{date} because of preceding issues"
not_a_regexp: "is not a valid regular expression"
open_issue_with_closed_parent: "An open issue cannot be attached to a closed parent task"
+ must_contain_uppercase: "must contain uppercase letters (A-Z)"
+ must_contain_lowercase: "must contain lowercase letters (a-z)"
+ must_contain_digits: "must contain digits (0-9)"
+ must_contain_special_chars: "must contain special characters (!, $, %, ...)"
actionview_instancetag_blank_option: Please select
@@ -437,6 +441,7 @@ en:
setting_openid: Allow OpenID login and registration
setting_password_max_age: Require password change after
setting_password_min_length: Minimum password length
+ setting_password_required_char_classes : Required character classes for passwords
setting_lost_password: Allow password reset via email
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
@@ -1061,6 +1066,10 @@ en:
label_issue_history_properties: Property changes
label_issue_history_notes: Notes
label_last_tab_visited: Last visited tab
+ label_password_char_class_uppercase: uppercase letters
+ label_password_char_class_lowercase: lowercase letters
+ label_password_char_class_digits: digits
+ label_password_char_class_special_chars: special characters
button_login: Login
button_submit: Submit
@@ -1152,6 +1161,7 @@ en:
text_project_identifier_info: 'Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.'
text_caracters_maximum: "%{count} characters maximum."
text_caracters_minimum: "Must be at least %{count} characters long."
+ text_characters_must_contain: "Must contain %{character_classes}."
text_length_between: "Length between %{min} and %{max} characters."
text_tracker_no_workflow: No workflow defined for this tracker
text_role_no_workflow: No workflow defined for this role
diff --git a/config/settings.yml b/config/settings.yml
index 6acfd9769..96b6eca7f 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -36,6 +36,9 @@ lost_password:
security_notifications: 1
unsubscribe:
default: 1
+password_required_char_classes:
+ serialized: true
+ default: []
password_min_length:
format: int
default: 8