From 8a09256941ab0e2ca81e98ac35081f6dc04bb22a Mon Sep 17 00:00:00 2001
From: Unknwon <joe2010xtmf@163.com>
Date: Wed, 17 Sep 2014 14:22:51 -0400
Subject: [PATCH] Mirror fix and fix #481

---
 README.md                  |  2 +-
 README_ZH.md               |  2 +-
 conf/app.ini               |  8 ++++----
 gogs.go                    |  2 +-
 models/repo.go             |  2 +-
 modules/base/template.go   |  2 +-
 modules/setting/setting.go | 12 +++++++-----
 templates/.VERSION         |  2 +-
 8 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 43d75c264b..08eed1348f 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ The goal of this project is to make the easiest, fastest and most painless way t
 - Slack webhook integration
 - Supports MySQL, PostgreSQL and SQLite3
 - Social account login(GitHub, Google, QQ, Weibo)
-- Multi-language support(English, Chinese, Germany etc.)
+- Multi-language support(English, Chinese, Germany, French etc.)
 
 ## System Requirements
 
diff --git a/README_ZH.md b/README_ZH.md
index bf6c1d03a1..4f59e00187 100644
--- a/README_ZH.md
+++ b/README_ZH.md
@@ -35,7 +35,7 @@ Gogs 的目标是打造一个最简单、最快速和最轻松的方式搭建自
 - Slack Web 钩子集成
 - 支持 MySQL、PostgreSQL 以及 SQLite3 数据库
 - 社交帐号登录（GitHub、Google、QQ、微博）
-- 多语言支持（英文、简体中文、德语等等）
+- 多语言支持（英文、简体中文、德语、法语等等）
 
 ## 系统要求
 
diff --git a/conf/app.ini b/conf/app.ini
index 099e80525e..ba73a0e8b2 100644
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -252,9 +252,9 @@ DRIVER =
 ; Based on xorm, e.g.: root:root@localhost/gogs?charset=utf8
 CONN =
 
+[git]
+MAX_GITDIFF_LINES = 10000
+
 [i18n]
 LANGS = en-US,zh-CN,de-DE,fr-CA
-NAMES = English,简体中文,Deutsch,Français
-
-[git]
-MAX_GITDIFF_LINES = 10000
\ No newline at end of file
+NAMES = English,简体中文,Deutsch,Français
\ No newline at end of file
diff --git a/gogs.go b/gogs.go
index 8ae7449e2b..c5249b2512 100644
--- a/gogs.go
+++ b/gogs.go
@@ -17,7 +17,7 @@ import (
 	"github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.5.2.0916 Beta"
+const APP_VER = "0.5.2.0917 Beta"
 
 func init() {
 	runtime.GOMAXPROCS(runtime.NumCPU())
diff --git a/models/repo.go b/models/repo.go
index 2e16270431..ccfaae2ca2 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -656,7 +656,7 @@ func TransferOwnership(u *User, newOwner string, repo *Repository) error {
 	}
 
 	// Check if new owner has repository with same name.
-	has, err := IsRepositoryExist(u, repo.Name)
+	has, err := IsRepositoryExist(newUser, repo.Name)
 	if err != nil {
 		return err
 	} else if has {
diff --git a/modules/base/template.go b/modules/base/template.go
index 6419572912..338fe677bc 100644
--- a/modules/base/template.go
+++ b/modules/base/template.go
@@ -14,8 +14,8 @@ import (
 	"runtime"
 	"strings"
 	"time"
-	"code.google.com/p/mahonia"
 
+	"github.com/gogits/gogs/modules/mahonia"
 	"github.com/gogits/gogs/modules/setting"
 	"github.com/saintfish/chardet"
 )
diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index c56ad2421a..5fb1d52d0b 100644
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -65,7 +65,6 @@ var (
 	// Picture settings.
 	PictureService  string
 	DisableGravatar bool
-	MaxGitDiffLines int
 
 	// Log settings.
 	LogRootPath string
@@ -94,6 +93,12 @@ var (
 	SessionProvider string
 	SessionConfig   *session.Config
 
+	// Git settings.
+	MaxGitDiffLines int
+
+	// I18n settings.
+	Langs, Names []string
+
 	// Global setting objects.
 	Cfg          *goconfig.ConfigFile
 	ConfRootPath string
@@ -101,9 +106,6 @@ var (
 	ProdMode     bool
 	RunUser      string
 	IsWindows    bool
-
-	// I18n settings.
-	Langs, Names []string
 )
 
 func init() {
@@ -245,7 +247,7 @@ func NewConfigContext() {
 		[]string{"server"})
 	DisableGravatar = Cfg.MustBool("picture", "DISABLE_GRAVATAR")
 
-	MaxGitDiffLines = Cfg.MustInt("git", "MAX_GITDIFF_LINES", 5000)
+	MaxGitDiffLines = Cfg.MustInt("git", "MAX_GITDIFF_LINES", 10000)
 
 	Langs = Cfg.MustValueArray("i18n", "LANGS", ",")
 	Names = Cfg.MustValueArray("i18n", "NAMES", ",")
diff --git a/templates/.VERSION b/templates/.VERSION
index aada89d11a..29de2fdfe1 100644
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.5.2.0916 Beta
\ No newline at end of file
+0.5.2.0917 Beta
\ No newline at end of file