mirror of
https://github.com/overleaf/overleaf.git
synced 2024-11-21 20:47:08 -05:00
Merge branch 'master' of github.com:sharelatex/web-sharelatex
This commit is contained in:
commit
c8ab1bd394
4 changed files with 8 additions and 7 deletions
|
@ -137,7 +137,7 @@ module.exports = ProjectController =
|
|||
return next(error) if error?
|
||||
|
||||
viewModel = {
|
||||
title:'Your Projects'
|
||||
title:'your_projects'
|
||||
priority_title: true
|
||||
projects: projects
|
||||
tags: tags
|
||||
|
|
|
@ -141,7 +141,7 @@ module.exports = (app)->
|
|||
|
||||
app.use (req, res, next)->
|
||||
subdomain = _.find Settings.i18n.subdomainLang, (subdomain)->
|
||||
subdomain.lngCode == req.showUserOtherLng
|
||||
subdomain.lngCode == req.showUserOtherLng and !subdomain.hide
|
||||
res.locals.recomendSubdomain = subdomain
|
||||
res.locals.currentLngCode = req.lng
|
||||
next()
|
||||
|
|
|
@ -15,7 +15,7 @@ module.exports = SecurityManager =
|
|||
restricted : (req, res, next)->
|
||||
if req.session.user?
|
||||
res.render 'user/restricted',
|
||||
title:'Restricted'
|
||||
title:'restricted'
|
||||
else
|
||||
logger.log "user not logged in and trying to access #{req.url}, being redirected to login"
|
||||
res.redirect '/register'
|
||||
|
|
|
@ -19,10 +19,11 @@ footer.site-footer
|
|||
ul.dropdown-menu(role="menu")
|
||||
li.dropdown-header #{translate("language")}
|
||||
each subdomainDetails, subdomain in settings.i18n.subdomainLang
|
||||
li.lngOption
|
||||
a.menu-indent(href=subdomainDetails.url+currentUrl)
|
||||
img(src="/img/flags/24/#{subdomainDetails.lngCode}.png")
|
||||
| #{translate(subdomainDetails.lngCode)}
|
||||
if !subdomainDetails.hide
|
||||
li.lngOption
|
||||
a.menu-indent(href=subdomainDetails.url+currentUrl)
|
||||
img(src="/img/flags/24/#{subdomainDetails.lngCode}.png")
|
||||
| #{translate(subdomainDetails.lngCode)}
|
||||
|
||||
each item in nav.left_footer
|
||||
li
|
||||
|
|
Loading…
Reference in a new issue