Merge branch 'master'

modules/templates/helper.go

@@ -20,6 +20,8 @@ import (
 	"strings"
 	"time"
 
+	"code.gitea.io/gitea/modules/util"
+
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/base"
 	"code.gitea.io/gitea/modules/log"
@@ -61,6 +63,9 @@ func NewFuncMap() []template.FuncMap {
 		"DisableGravatar": func() bool {
 			return setting.DisableGravatar
 		},
+		"DefaultShowFullName": func() bool {
+			return setting.UI.DefaultShowFullName
+		},
 		"ShowFooterTemplateLoadTime": func() bool {
 			return setting.ShowFooterTemplateLoadTime
 		},
@@ -115,6 +120,8 @@ func NewFuncMap() []template.FuncMap {
 		"EscapePound": func(str string) string {
 			return strings.NewReplacer("%", "%25", "#", "%23", " ", "%20", "?", "%3F").Replace(str)
 		},
+		"PathEscapeSegments":       util.PathEscapeSegments,
+		"URLJoin":                  util.URLJoin,
 		"RenderCommitMessage":      RenderCommitMessage,
 		"RenderCommitMessageLink":  RenderCommitMessageLink,
 		"RenderCommitBody":         RenderCommitBody,
@@ -219,6 +226,13 @@ func NewFuncMap() []template.FuncMap {
 			}
 			return dict, nil
 		},
+		"percentage": func(n int, values ...int) float32 {
+			var sum = 0
+			for i := 0; i < len(values); i++ {
+				sum += values[i]
+			}
+			return float32(n) * 100 / float32(sum)
+		},
 	}}
 }
 
@@ -482,6 +496,12 @@ var trNLangRules = map[string]func(int64) int{
 	"zh-TW": func(cnt int64) int {
 		return 0
 	},
+	"fr-FR": func(cnt int64) int {
+		if cnt > -2 && cnt < 2 {
+			return 0
+		}
+		return 1
+	},
 }
 
 // TrN returns key to be used for plural text translation