Browse Source

UI compatibility

pull/1144/head
Unknwon 10 years ago
parent
commit
75cbb32b1e
  1. 2
      conf/app.ini
  2. 0
      conf/locale/locale_fr-FR.ini
  3. 22
      modules/bindata/bindata.go
  4. 7
      modules/middleware/context.go
  5. 4
      templates/repo/issue/create.tmpl
  6. 4
      templates/repo/issue/list.tmpl
  7. 4
      templates/repo/issue/milestone.tmpl
  8. 4
      templates/repo/issue/milestone_edit.tmpl
  9. 4
      templates/repo/issue/milestone_new.tmpl
  10. 4
      templates/repo/issue/view.tmpl

2
conf/app.ini

@ -286,5 +286,5 @@ INTERVAL = 24
ARGS =
[i18n]
LANGS = en-US,zh-CN,zh-HK,de-DE,fr-CA,nl-NL,lv-LV,ru-RU,ja-JP,es-ES,pt-BR
LANGS = en-US,zh-CN,zh-HK,de-DE,fr-FR,nl-NL,lv-LV,ru-RU,ja-JP,es-ES,pt-BR
NAMES = English,简体中文,繁體中文,Deutsch,Français,Nederlands,Latviešu,Русский,日本语,Español,Português

0
conf/locale/locale_fr-CA.ini → conf/locale/locale_fr-FR.ini

22
modules/bindata/bindata.go

File diff suppressed because one or more lines are too long

7
modules/middleware/context.go

@ -180,12 +180,7 @@ func Contexter() macaron.Handler {
Session: sess,
}
// Compute current URL for real-time change language.
link := setting.AppSubUrl + ctx.Req.RequestURI
i := strings.Index(link, "?")
if i > -1 {
link = link[:i]
}
ctx.Data["Link"] = link
ctx.Data["Link"] = setting.AppSubUrl + ctx.Req.URL.Path
ctx.Data["PageStartTime"] = time.Now()

4
templates/repo/issue/create.tmpl

@ -1,4 +1,4 @@
{{template "base/head" .}}
{{template "base/head_old" .}}
{{template "base/navbar" .}}
{{template "repo/nav" .}}
{{template "repo/toolbar" .}}
@ -123,4 +123,4 @@
</form>
</div>
</div>
{{template "base/footer" .}}
{{template "base/footer_old" .}}

4
templates/repo/issue/list.tmpl

@ -1,4 +1,4 @@
{{template "base/head" .}}
{{template "base/head_old" .}}
{{template "base/navbar" .}}
{{template "repo/nav" .}}
{{template "repo/toolbar" .}}
@ -117,4 +117,4 @@
});
});
</script>
{{template "base/footer" .}}
{{template "base/footer_old" .}}

4
templates/repo/issue/milestone.tmpl

@ -1,4 +1,4 @@
{{template "base/head" .}}
{{template "base/head_old" .}}
{{template "base/navbar" .}}
{{template "repo/nav" .}}
{{template "repo/toolbar" .}}
@ -40,4 +40,4 @@
</div>
</div>
</div>
{{template "base/footer" .}}
{{template "base/footer_old" .}}

4
templates/repo/issue/milestone_edit.tmpl

@ -1,4 +1,4 @@
{{template "base/head" .}}
{{template "base/head_old" .}}
{{template "base/navbar" .}}
{{template "repo/nav" .}}
{{template "repo/toolbar" .}}
@ -58,4 +58,4 @@
});
});
</script>
{{template "base/footer" .}}
{{template "base/footer_old" .}}

4
templates/repo/issue/milestone_new.tmpl

@ -1,4 +1,4 @@
{{template "base/head" .}}
{{template "base/head_old" .}}
{{template "base/navbar" .}}
{{template "repo/nav" .}}
{{template "repo/toolbar" .}}
@ -59,4 +59,4 @@
});
});
</script>
{{template "base/footer" .}}
{{template "base/footer_old" .}}

4
templates/repo/issue/view.tmpl

@ -1,4 +1,4 @@
{{template "base/head" .}}
{{template "base/head_old" .}}
{{template "base/navbar" .}}
{{template "repo/nav" .}}
{{template "repo/toolbar" .}}
@ -279,4 +279,4 @@
</div>
</div>
</div>
{{template "base/footer" .}}
{{template "base/footer_old" .}}

Loading…
Cancel
Save