Browse Source

better wording

tags/v0.9.99
Unknwon 8 years ago
parent
commit
cbb78b6a63
3 changed files with 7 additions and 6 deletions
  1. 3
    3
      models/models.go
  2. 2
    2
      modules/setting/setting.go
  3. 2
    1
      routers/install.go

+ 3
- 3
models/models.go View File

@@ -122,7 +122,7 @@ func getEngine() (*xorm.Engine, error) {
func NewTestEngine(x *xorm.Engine) (err error) {
x, err = getEngine()
if err != nil {
return fmt.Errorf("connect to database: %v", err)
return fmt.Errorf("Connect to database: %v", err)
}

x.SetMapper(core.GonicMapper{})
@@ -132,7 +132,7 @@ func NewTestEngine(x *xorm.Engine) (err error) {
func SetEngine() (err error) {
x, err = getEngine()
if err != nil {
return fmt.Errorf("connect to database: %v", err)
return fmt.Errorf("Connect to database: %v", err)
}

x.SetMapper(core.GonicMapper{})
@@ -144,7 +144,7 @@ func SetEngine() (err error) {

f, err := os.Create(logPath)
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))


+ 2
- 2
modules/setting/setting.go View File

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

switch CacheAdapter {

+ 2
- 1
routers/install.go View File

@@ -72,7 +72,7 @@ func GlobalInit() {
log.NewGitLogger(path.Join(setting.LogRootPath, "http.log"))
}
if models.EnableSQLite3 {
log.Info("SQLite3 Enabled")
log.Info("SQLite3 Supported")
}
checkRunMode()
}
@@ -213,6 +213,7 @@ func InstallPost(ctx *middleware.Context, form auth.InstallForm) {

// Check admin password.
if form.AdminPasswd != form.AdminConfirmPasswd {
ctx.Data["Err_Admin"] = true
ctx.Data["Err_AdminPasswd"] = true
ctx.RenderWithErr(ctx.Tr("form.password_not_match"), INSTALL, form)
return

Loading…
Cancel
Save