update locale and mirror code format

diff --git a/cmd/web.go b/cmd/web.go
index 38b802b68266ab59ff6d6171ba4c6348612ddbc6..27879e4a3995ba2309cd367452c557e8222d44c2 100644 (file)
--- 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 d8cb1877aa466b9e79a84e74104b731fdab7dd9e..4f710b00cedd832e2f1ed592b8ded2bb565c2ffe 100755 (executable)
--- 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\r
 diff.view_file=Voir le fichier\r
 \r
-release.releases=Releases\r
-release.new_release=New Release\r
-release.draft=Draft\r
-release.prerelease=Pre-Release\r
+release.releases=Versions\r
+release.new_release=Nouvelle version\r
+release.draft=Brouillon\r
+release.prerelease=Pré-publication\r
 release.stable=Stable\r
-release.edit=edit\r
-release.ahead=<strong>%d</strong> commits to %s since this release\r
-release.source_code=Source Code\r
-release.tag_name=Tag name\r
-release.target=Target\r
-release.tag_helper=Choose an existing tag, or create a new tag on publish.\r
-release.release_title=Release title\r
-release.content_with_md=Content with <a href="%s">Markdown</a>\r
-release.write=Write\r
-release.preview=Preview\r
-release.content_placeholder=Write some content\r
-release.loading=Loading...\r
-release.prerelease_desc=This is a pre-release\r
-release.prerelease_helper=We’ll point out that this release is identified as non-production ready.\r
-release.publish=Publish Release\r
-release.save_draft=Save Draft\r
-release.edit_release=Edit Release\r
-release.tag_name_already_exist=Release with this tag name has already existed.\r
+release.edit=Éditer\r
+release.ahead=<strong>%d</strong> commissions à %s depuis cette publication\r
+release.source_code=Code Source\r
+release.tag_name=Nom du tag\r
+release.target=Cible \r
+release.tag_helper=Choisissez un tag existant ou créez-en un nouveau à publier.\r
+release.release_title=Titre de la publication\r
+release.content_with_md=Contenu avec <a href="%s">Démarque(s)</a>\r
+release.write=Écrire\r
+release.preview=Prévisualiser\r
+release.content_placeholder=Rédiger du contenu\r
+release.loading=Chargement…\r
+release.prerelease_desc=Il s'agit d'une version préliminaire\r
+release.prerelease_helper=Nous soulignerons que cette version est considérée comme non prête pour la production.\r
+release.publish=Publier\r
+release.save_draft=Sauvegarder le Brouillon\r
+release.edit_release=Éditer la publication\r
+release.tag_name_already_exist=Une publication avec ce nom de tag a déjà existée.\r
 \r
 [org]\r
 org_name_holder=Nom d'organisation\r

diff --git a/modules/mailer/mailer.go b/modules/mailer/mailer.go
index 234723590909c98406e09fc1e2b4d8b2e3d0bdda..211ad59cdda15eba4208b3fb08c6b3f61c175033 100644 (file)
--- 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") {