magic_rb/forgejo
Template
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo synced 2024-11-28 04:36:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

better wording

Browse source
This commit is contained in:
Unknwon 2015-08-02 12:36:35 +08:00
parent d496d0cc4d
commit cbb78b6a63
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
models/models.go
View file

@ -122,7 +122,7 @@ func getEngine() (*xorm.Engine, error) {
func NewTestEngine(x *xorm.Engine) (err error) { func NewTestEngine(x *xorm.Engine) (err error) {
x, err = getEngine() x, err = getEngine()
if err != nil { if err != nil {
return fmt.Errorf("connect to database: %v", err) return fmt.Errorf("Connect to database: %v", err)
} }
x.SetMapper(core.GonicMapper{}) x.SetMapper(core.GonicMapper{})
@ -132,7 +132,7 @@ func NewTestEngine(x *xorm.Engine) (err error) {
func SetEngine() (err error) { func SetEngine() (err error) {
x, err = getEngine() x, err = getEngine()
if err != nil { if err != nil {
return fmt.Errorf("connect to database: %v", err) return fmt.Errorf("Connect to database: %v", err)
} }
x.SetMapper(core.GonicMapper{}) x.SetMapper(core.GonicMapper{})
@ -144,7 +144,7 @@ func SetEngine() (err error) {
f, err := os.Create(logPath) f, err := os.Create(logPath)
if err != nil { if err != nil {
return fmt.Errorf("models.init(fail to create xorm.log): %v", err) return fmt.Errorf("Fail to create xorm.log: %v", err)
} }
x.SetLogger(xorm.NewSimpleLogger(f)) x.SetLogger(xorm.NewSimpleLogger(f))

4
modules/setting/setting.go
View file

@ -460,10 +460,10 @@ func newLogService() {
func newCacheService() { func newCacheService() {
CacheAdapter = Cfg.Section("cache").Key("ADAPTER").In("memory", []string{"memory", "redis", "memcache"}) CacheAdapter = Cfg.Section("cache").Key("ADAPTER").In("memory", []string{"memory", "redis", "memcache"})
if EnableRedis { if EnableRedis {
log.Info("Redis Enabled") log.Info("Redis Supported")
} }
if EnableMemcache { if EnableMemcache {
log.Info("Memcache Enabled") log.Info("Memcache Supported")
} }
switch CacheAdapter { switch CacheAdapter {

3
routers/install.go
View file

@ -72,7 +72,7 @@ func GlobalInit() {
log.NewGitLogger(path.Join(setting.LogRootPath, "http.log")) log.NewGitLogger(path.Join(setting.LogRootPath, "http.log"))
} }
if models.EnableSQLite3 { if models.EnableSQLite3 {
log.Info("SQLite3 Enabled") log.Info("SQLite3 Supported")
} }
checkRunMode() checkRunMode()
} }
@ -213,6 +213,7 @@ func InstallPost(ctx *middleware.Context, form auth.InstallForm) {
// Check admin password. // Check admin password.
if form.AdminPasswd != form.AdminConfirmPasswd { if form.AdminPasswd != form.AdminConfirmPasswd {
ctx.Data["Err_Admin"] = true
ctx.Data["Err_AdminPasswd"] = true ctx.Data["Err_AdminPasswd"] = true
ctx.RenderWithErr(ctx.Tr("form.password_not_match"), INSTALL, form) ctx.RenderWithErr(ctx.Tr("form.password_not_match"), INSTALL, form)
return return