From b9372e6dcd2e1496893e40bf1baf4cd85a8e2f73 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Thu, 21 Aug 2014 13:02:28 +0100 Subject: [PATCH 1/3] added key for your projects --- .../web/app/coffee/Features/Project/ProjectController.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/app/coffee/Features/Project/ProjectController.coffee b/services/web/app/coffee/Features/Project/ProjectController.coffee index f47d2eedf0..840ef53d79 100644 --- a/services/web/app/coffee/Features/Project/ProjectController.coffee +++ b/services/web/app/coffee/Features/Project/ProjectController.coffee @@ -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 From 9bcf979e8a6d44a093b82e4ffa05701eb98acae2 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Thu, 21 Aug 2014 13:03:51 +0100 Subject: [PATCH 2/3] changed title for restricted to use translations key --- services/web/app/coffee/managers/SecurityManager.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/app/coffee/managers/SecurityManager.coffee b/services/web/app/coffee/managers/SecurityManager.coffee index d889f6fc07..2799b116c5 100644 --- a/services/web/app/coffee/managers/SecurityManager.coffee +++ b/services/web/app/coffee/managers/SecurityManager.coffee @@ -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' From fd8221b8690609ba37e5cce92e609ee516bb359b Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Thu, 21 Aug 2014 17:58:25 +0100 Subject: [PATCH 3/3] make it possible to hide a lng --- .../web/app/coffee/infrastructure/ExpressLocals.coffee | 2 +- services/web/app/views/layout/footer.jade | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/services/web/app/coffee/infrastructure/ExpressLocals.coffee b/services/web/app/coffee/infrastructure/ExpressLocals.coffee index 62be91eaee..0fd68ebba0 100644 --- a/services/web/app/coffee/infrastructure/ExpressLocals.coffee +++ b/services/web/app/coffee/infrastructure/ExpressLocals.coffee @@ -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() diff --git a/services/web/app/views/layout/footer.jade b/services/web/app/views/layout/footer.jade index 17907f9e3e..260a7c205b 100644 --- a/services/web/app/views/layout/footer.jade +++ b/services/web/app/views/layout/footer.jade @@ -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