tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-07-22 10:18:38 +00:00
Code Releases Activity

Update gitea.com/macaron/i18n (#12806)

Browse Source 
Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
zeripath
2020-09-10 22:32:58 +01:00
committed by GitHub
parent 47289344e2
commit daefdd1385
12 changed files with 80 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
vendor/gitea.com/macaron/i18n/i18n.go generated vendored
View File

@@ -12,16 +12,17 @@
// License for the specific language governing permissions and limitations
// under the License.
// Package i18n is a middleware that provides app Internationalization and Localization of Macaron.
// Package i18n provides an Internationalization and Localization middleware for Macaron applications.
package i18n
import (
"fmt"
"log"
"os"
"path"
"strings"
"gitea.com/macaron/macaron"
"github.com/unknwon/com"
"github.com/unknwon/i18n"
"golang.org/x/text/language"
)
@@ -32,6 +33,16 @@ func Version() string {
return _VERSION
}
// isFile returns true if given path is a file,
// or returns false when it's a directory or does not exist.
func isFile(filePath string) bool {
f, e := os.Stat(filePath)
if e != nil {
return false
}
return !f.IsDir()
}
// initLocales initializes language type list and Accept-Language header matcher.
func initLocales(opt Options) language.Matcher {
tags := make([]language.Tag, len(opt.Langs))
@@ -41,7 +52,7 @@ func initLocales(opt Options) language.Matcher {
// Append custom locale file.
custom := []interface{}{}
customPath := path.Join(opt.CustomDirectory, fname)
if com.IsFile(customPath) {
if isFile(customPath) {
custom = append(custom, customPath)
}
@@ -54,7 +65,7 @@ func initLocales(opt Options) language.Matcher {
err := i18n.SetMessageWithDesc(lang, opt.Names[i], locale, custom...)
if err != nil && err != i18n.ErrLangAlreadyExist {
panic(fmt.Errorf("fail to set message file(%s): %v", lang, err))
log.Printf("ERROR: failed to set message file(%s) for language %s: %v", lang, opt.Names[i], err)
}
}
return language.NewMatcher(tags)
@@ -98,6 +109,10 @@ type Options struct {
Section string
// Domain used for `lang` cookie. Default is ""
CookieDomain string
// Set the Secure flag on the `lang` cookie. Default is disabled.
Secure bool
// Set the HTTP Only flag on the `lang` cookie. Default is disabled.
CookieHttpOnly bool
}
func prepareOptions(options []Options) Options {
@@ -195,7 +210,7 @@ func I18n(options ...Options) macaron.Handler {
// Save language information in cookies.
if !hasCookie {
ctx.SetCookie("lang", curLang.Lang, 1<<31-1, "/"+strings.TrimPrefix(opt.SubURL, "/"), opt.CookieDomain)
ctx.SetCookie("lang", curLang.Lang, 1<<31-1, "/"+strings.TrimPrefix(opt.SubURL, "/"), opt.CookieDomain, opt.Secure, opt.CookieHttpOnly)
}
restLangs := make([]LangType, 0, i18n.Count()-1)
@@ -210,7 +225,7 @@ func I18n(options ...Options) macaron.Handler {
}
// Set language properties.
locale := Locale{i18n.Locale{lang}}
locale := Locale{Locale: i18n.Locale{Lang: lang}}
ctx.Map(locale)
ctx.Locale = locale
ctx.Data[opt.TmplName] = locale
@@ -221,7 +236,7 @@ func I18n(options ...Options) macaron.Handler {
ctx.Data["RestLangs"] = restLangs
if opt.Redirect && isNeedRedir {
ctx.Redirect(opt.SubURL + ctx.Req.RequestURI[:strings.Index(ctx.Req.RequestURI, "?")])
ctx.Redirect(opt.SubURL + path.Clean(ctx.Req.RequestURI[:strings.Index(ctx.Req.RequestURI, "?")]))
}
}
}