From b231b8c927d02c02466ea67742b63d2d67722bed Mon Sep 17 00:00:00 2001
From: Unknwon <joe2010xtmf@163.com>
Date: Fri, 19 Dec 2014 00:24:17 -0500
Subject: [PATCH] update locale and mirror code format

---
 cmd/web.go                   |  4 ++--
 conf/locale/locale_fr-CA.ini | 44 ++++++++++++++++++------------------
 modules/mailer/mailer.go     | 20 ++++++++--------
 3 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/cmd/web.go b/cmd/web.go
index 38b802b682..27879e4a39 100644
--- a/cmd/web.go
+++ b/cmd/web.go
@@ -75,8 +75,8 @@ func checkVersion() {
 	// Check dependency version.
 	checkers := []VerChecker{
 		{"github.com/Unknwon/macaron", macaron.Version, "0.4.7"},
-		{"github.com/macaron-contrib/binding", binding.Version, "0.0.2"},
-		{"github.com/macaron-contrib/i18n", i18n.Version, "0.0.3"},
+		{"github.com/macaron-contrib/binding", binding.Version, "0.0.3"},
+		{"github.com/macaron-contrib/i18n", i18n.Version, "0.0.4"},
 		{"github.com/macaron-contrib/session", session.Version, "0.0.5"},
 	}
 	for _, c := range checkers {
diff --git a/conf/locale/locale_fr-CA.ini b/conf/locale/locale_fr-CA.ini
index d8cb1877aa..4f710b00ce 100755
--- a/conf/locale/locale_fr-CA.ini
+++ b/conf/locale/locale_fr-CA.ini
@@ -377,29 +377,29 @@ diff.stats_desc=<strong> %d fichiers modifiés</strong> avec <strong>%d ajouts</
 diff.bin=BIN
 diff.view_file=Voir le fichier
 
-release.releases=Releases
-release.new_release=New Release
-release.draft=Draft
-release.prerelease=Pre-Release
+release.releases=Versions
+release.new_release=Nouvelle version
+release.draft=Brouillon
+release.prerelease=Pré-publication
 release.stable=Stable
-release.edit=edit
-release.ahead=<strong>%d</strong> commits to %s since this release
-release.source_code=Source Code
-release.tag_name=Tag name
-release.target=Target
-release.tag_helper=Choose an existing tag, or create a new tag on publish.
-release.release_title=Release title
-release.content_with_md=Content with <a href="%s">Markdown</a>
-release.write=Write
-release.preview=Preview
-release.content_placeholder=Write some content
-release.loading=Loading...
-release.prerelease_desc=This is a pre-release
-release.prerelease_helper=We’ll point out that this release is identified as non-production ready.
-release.publish=Publish Release
-release.save_draft=Save Draft
-release.edit_release=Edit Release
-release.tag_name_already_exist=Release with this tag name has already existed.
+release.edit=Éditer
+release.ahead=<strong>%d</strong> commissions à %s depuis cette publication
+release.source_code=Code Source
+release.tag_name=Nom du tag
+release.target=Cible 
+release.tag_helper=Choisissez un tag existant ou créez-en un nouveau à publier.
+release.release_title=Titre de la publication
+release.content_with_md=Contenu avec <a href="%s">Démarque(s)</a>
+release.write=Écrire
+release.preview=Prévisualiser
+release.content_placeholder=Rédiger du contenu
+release.loading=Chargement…
+release.prerelease_desc=Il s'agit d'une version préliminaire
+release.prerelease_helper=Nous soulignerons que cette version est considérée comme non prête pour la production.
+release.publish=Publier
+release.save_draft=Sauvegarder le Brouillon
+release.edit_release=Éditer la publication
+release.tag_name_already_exist=Une publication avec ce nom de tag a déjà existée.
 
 [org]
 org_name_holder=Nom d'organisation
diff --git a/modules/mailer/mailer.go b/modules/mailer/mailer.go
index 2347235909..211ad59cdd 100644
--- a/modules/mailer/mailer.go
+++ b/modules/mailer/mailer.go
@@ -82,35 +82,35 @@ func sendMail(settings *setting.Mailer, from string, recipients []string, msgCon
 		ServerName:         host,
 	}
 
-	var conn net.Conn
-	if conn, err = net.Dial("tcp", net.JoinHostPort(host, port)); err != nil {
+	conn, err := net.Dial("tcp", net.JoinHostPort(host, port))
+	if err != nil {
 		return err
 	}
 	defer conn.Close()
 
-	connection_secure := false
+	isSecureConn := false
 	// Start TLS directly if the port ends with 465 (SMTPS protocol)
 	if strings.HasSuffix(port, "465") {
 		conn = tls.Client(conn, tlsconfig)
-		connection_secure = true
+		isSecureConn = true
 	}
 
-	var client *smtp.Client
-	if client, err = smtp.NewClient(conn, host); err != nil {
+	client, err := smtp.NewClient(conn, host)
+	if err != nil {
 		return err
 	}
 
 	// If not using SMTPS, alway use STARTTLS if available
-	has_starttls, _ := client.Extension("STARTTLS")
-	if !connection_secure && has_starttls {
+	hasStartTLS, _ := client.Extension("STARTTLS")
+	if !isSecureConn && hasStartTLS {
 		if err = client.StartTLS(tlsconfig); err != nil {
 			return err
 		}
 	}
 
-	auth_available, options := client.Extension("AUTH")
+	canAuth, options := client.Extension("AUTH")
 
-	if auth_available && len(settings.User) > 0 {
+	if canAuth && len(settings.User) > 0 {
 		var auth smtp.Auth
 
 		if strings.Contains(options, "CRAM-MD5") {