Merge branch 'dev' of github.com:gogits/gogs into dev

conf/locale/locale_en-US.ini

@@ -61,7 +61,7 @@ domain = Domain
 domain_helper = This affects SSH clone URLs.
 app_url = Application URL
 app_url_helper = This affects HTTP/HTTPS clone URL and somewhere in e-mail.
-email_title = Email Service Settings(Optional)
+email_title = E-mail Service Settings(Optional)
 smtp_host = SMTP Host
 mailer_user = Sender E-mail
 mailer_password = Sender Password 
@@ -109,7 +109,7 @@ confirmation_mail_sent_prompt = A new confirmation e-mail has been sent to <b>%s
 sign_in_email = Sign in to your e-mail
 active_your_account = Activate Your Account
 resent_limit_prompt = Sorry, you are sending an activation e-mail too frequently. Please wait 3 minutes.
-has_unconfirmed_mail = Hi %s, you have an unconfirmed email address(<b>%s</b>). If you haven't received a confirmation e-mail or need to resend a new one, please click on the button below.
+has_unconfirmed_mail = Hi %s, you have an unconfirmed e-mail address(<b>%s</b>). If you haven't received a confirmation e-mail or need to resend a new one, please click on the button below.
 resend_mail = Click here to resend your activation e-mail
 email_not_associate = This e-mail address does not associate to any account.
 send_reset_mail = Click here to (re)send your password reset e-mail
@@ -192,7 +192,7 @@ delete = Delete Account
 uid = Uid
 
 public_profile = Public Profile
-profile_desc = Your Email address is public and will be used for any account related notifications, and any web based operations made via the site.
+profile_desc = Your E-mail address is public and will be used for any account related notifications, and any web based operations made via the site.
 full_name = Full Name
 website = Website
 location = Location
@@ -217,6 +217,15 @@ new_password = New Password
 password_incorrect = Current password is not correct.
 change_password_success = Password is changed successfully. You can now sign in via new password.
 
+emails = E-mail Addresses
+manage_emails = Manage e-mail addresses
+email_desc = Current e-mail addresses
+primary = Primary
+primary_email = Make primary
+delete_email = Delete
+add_new_email = Add new e-mail address
+add_email = Add e-mail
+
 manage_ssh_keys = Manage SSH Keys
 add_key = Add Key
 ssh_desc = This is a list of SSH keys associated with your account. Remove any keys that you do not recognize.
@@ -404,7 +413,7 @@ release.tag_name_already_exist = Release with this tag name has already existed.
 [org]
 org_name_holder = Organization Name
 org_name_helper = Great organization names are short and memorable.
-org_email_helper = Organization's Email receives all notifications and confirmations.
+org_email_helper = Organization's E-mail receives all notifications and confirmations.
 create_org = Create Organization
 repo_updated = Updated
 people = People
@@ -619,7 +628,7 @@ config.db_ssl_mode_helper = (for "postgres" only)
 config.db_path = Path
 config.db_path_helper = (for "sqlite3" only)
 config.service_config = Service Configuration
-config.register_email_confirm = Register Email Confirmation
+config.register_email_confirm = Register E-mail Confirmation
 config.disable_register = Disable Registration
 config.require_sign_in_view = Require Sign In View
 config.mail_notify = Mail Notification

models/user.go

@@ -629,7 +629,7 @@ func GetUserIdsByNames(names []string) []int64 {
 // Get all email addresses
 func GetEmailAddresses(uid int64) ([]*EmailAddress, error) {
 	emails := make([]*EmailAddress, 0, 5)
-	err := x.Where("owner_id=?", uid).Find(&emails)
+	err := x.Where("uid=?", uid).Find(&emails)
 	if err != nil {
 		return nil, err
 	}

templates/user/settings/email.tmpl

@@ -16,7 +16,7 @@
                             {{range .Emails}}
                             <li class="email clear">
                                 <div class="email-content left">
-									<p><strong>{{.Email}}</strong></p>
+									<p><strong>{{.Email}}</strong> {{if .IsPrimary}} <span class="email-primary">{{$.i18n.Tr "settings.primary"}}</span> {{end}}</p>
 							   </div>
 							   {{if not .IsPrimary}}
 							   {{if .IsActivated}}
@@ -40,7 +40,7 @@
 							{{.CsrfTokenHtml}}
 							<p class="panel-header"><strong>{{.i18n.Tr "settings.add_new_email"}}</strong></p>
 							<p class="field">
-                                <label class="req" for="email">{{.i18n.Tr "settings.email"}}</label>
+                                <label class="req" for="email">{{.i18n.Tr "email"}}</label>
                                 <input class="ipt ipt-radius" id="email" name="email" type="text" required />
                             </p>
                             <p class="field">