1
0
mirror of https://github.com/astaxie/beego.git synced 2024-12-25 00:50:50 +00:00
This commit is contained in:
astaxie 2016-01-17 23:48:17 +08:00
parent 9b2597be68
commit 90d1349665
9 changed files with 11 additions and 11 deletions

View File

@ -164,7 +164,7 @@ func (c *JSONConfigContainer) String(key string) string {
// DefaultString returns the string value for a given key.
// if err != nil return defaltval
func (c *JSONConfigContainer) DefaultString(key string, defaultval string) string {
// TODO FIXME should not use "" to replace non existance
// TODO FIXME should not use "" to replace non existence
if v := c.String(key); v != "" {
return v
}

2
doc.go
View File

@ -12,6 +12,6 @@ beego is inspired by Tornado, Sinatra and Flask with the added benefit of some G
beego.Run()
}
more infomation: http://beego.me
more information: http://beego.me
*/
package beego

View File

@ -19,7 +19,7 @@ import (
"strings"
)
// ExprSep define the expression seperation
// ExprSep define the expression separation
const (
ExprSep = "__"
)

View File

@ -20,7 +20,7 @@ import (
"strings"
)
// CommaSpace is the seperation
// CommaSpace is the separation
const CommaSpace = ", "
// MySQLQueryBuilder is the SQL build

View File

@ -41,7 +41,7 @@
//
// 1. appid
//
// appid is asigned to the application
// appid is assigned to the application
//
// 2. signature
//

View File

@ -80,7 +80,7 @@ func TestDestorySessionCookie(t *testing.T) {
t.Fatal("get cookie session id is not the same again.")
}
// After destory session , will get a new session id .
// After destroy session , will get a new session id .
globalSessions.SessionDestroy(w, r1)
r2, _ := http.NewRequest("GET", "/", nil)
r2.Header.Set("Cookie", w.Header().Get("Set-Cookie"))
@ -91,6 +91,6 @@ func TestDestorySessionCookie(t *testing.T) {
t.Fatal("session start error")
}
if newSession.SessionID() == session.SessionID() {
t.Fatal("after destory session and reqeust again ,get cookie session id is same.")
t.Fatal("after destroy session and reqeust again ,get cookie session id is same.")
}
}

View File

@ -31,7 +31,7 @@ var (
beegoTplFuncMap = make(template.FuncMap)
// BeeTemplates caching map and supported template file extensions.
BeeTemplates = make(map[string]*template.Template)
// BeeTemplateExt stores the template extention which will build
// BeeTemplateExt stores the template extension which will build
BeeTemplateExt = []string{"tpl", "html"}
)

View File

@ -670,7 +670,7 @@ func MapGet(arg1 interface{}, arg2 ...interface{}) (interface{}, error) {
if arg1Type.Kind() == reflect.Map && len(arg2) > 0 {
// check whether arg2[0] type equals to arg1 key type
// if they are different, make convertion
// if they are different, make conversion
arg2Val := reflect.ValueOf(arg2[0])
arg2Type := reflect.TypeOf(arg2[0])
if arg2Type.Kind() != arg1Type.Key().Kind() {

View File

@ -158,7 +158,7 @@ func (c *Captcha) Handler(ctx *context.Context) {
}
}
// CreateCaptchaHTML tempalte func for output html
// CreateCaptchaHTML template func for output html
func (c *Captcha) CreateCaptchaHTML() template.HTML {
value, err := c.CreateCaptcha()
if err != nil {
@ -255,7 +255,7 @@ func NewCaptcha(urlPrefix string, store cache.Cache) *Captcha {
}
// NewWithFilter create a new captcha.Captcha and auto AddFilter for serve captacha image
// and add a tempalte func for output html
// and add a template func for output html
func NewWithFilter(urlPrefix string, store cache.Cache) *Captcha {
cpt := NewCaptcha(urlPrefix, store)