5 files changed, 18 insertions, 2 deletions
diff --git a/config/initializers/10-patches.rb b/config/initializers/10-patches.rb
index 63532b491..e01b4c2d7 100644
--- a/config/initializers/10-patches.rb
+++ b/config/initializers/10-patches.rb
@@ -5,8 +5,7 @@ module ActiveRecord
     include Redmine::I18n
     # Translate attribute names for validation errors display
     def self.human_attribute_name(attr, *args)
-      attr = attr.to_s.sub(/_id$/, '')
-
+      attr = attr.to_s.sub(/_id$/, '').sub(/^.+\./, '')
       l("field_#{name.underscore.gsub('/', '_')}_#{attr}", :default => ["field_#{attr}".to_sym, attr])
     end
   end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 86d9b50b0..afa401f10 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -227,6 +227,7 @@ en:
   field_firstname: First name
   field_lastname: Last name
   field_mail: Email
+  field_address: Email
   field_filename: File
   field_filesize: Size
   field_downloads: Downloads
@@ -413,6 +414,7 @@ en:
   setting_force_default_language_for_anonymous: Force default language for anonymous users
   setting_force_default_language_for_loggedin: Force default language for logged-in users
   setting_link_copied_issue: Link issues on copy
+  setting_max_additional_emails: Maximum number of additional email addresses
 
   permission_add_project: Create project
   permission_add_subprojects: Create subprojects
@@ -931,6 +933,10 @@ en:
   label_search_attachments_no: Do not search attachments
   label_search_attachments_only: Search attachments only
   label_search_open_issues_only: Open issues only
+  label_email_address_plural: Emails
+  label_email_address_add: Add email address
+  label_enable_notifications: Enable notifications
+  label_disable_notifications: Disable notifications
 
   button_login: Login
   button_submit: Submit
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 1c5fbf889..369eac349 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -247,6 +247,7 @@ fr:
   field_firstname: Prénom
   field_lastname: Nom
   field_mail: Email
+  field_address: Email
   field_filename: Fichier
   field_filesize: Taille
   field_downloads: Téléchargements
@@ -433,6 +434,7 @@ fr:
   setting_force_default_language_for_anonymous: Forcer la langue par défault pour les utilisateurs anonymes
   setting_force_default_language_for_loggedin: Forcer la langue par défault pour les utilisateurs identifiés
   setting_link_copied_issue: Lier les demandes lors de la copie
+  setting_max_additional_emails: Nombre maximal d'adresses email additionnelles
 
   permission_add_project: Créer un projet
   permission_add_subprojects: Créer des sous-projets
@@ -951,6 +953,10 @@ fr:
   label_search_attachments_no: Ne pas rechercher les fichiers
   label_search_attachments_only: Rechercher les fichiers uniquement
   label_search_open_issues_only: Demandes ouvertes uniquement
+  label_email_address_plural: Emails
+  label_email_address_add: Ajouter une adresse email
+  label_enable_notifications: Activer les notifications
+  label_disable_notifications: Désactiver les notifications
 
   button_login: Connexion
   button_submit: Soumettre
diff --git a/config/routes.rb b/config/routes.rb
index d330802de..8eb9b4d27 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -75,6 +75,7 @@ Rails.application.routes.draw do
 
   resources :users do
     resources :memberships, :controller => 'principal_memberships'
+    resources :email_addresses, :only => [:index, :create, :update, :destroy]
   end
 
   post 'watchers/watch', :to => 'watchers#watch', :as => 'watch'
diff --git a/config/settings.yml b/config/settings.yml
index 40e4428f0..a0f920da0 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -36,6 +36,10 @@ unsubscribe:
 password_min_length:
   format: int
   default: 8
+# Maximum number of additional email addresses per user
+max_additional_emails:
+  format: int
+  default: 5
 # Maximum lifetime of user sessions in minutes
 session_lifetime:
   format: int