autonomic-cooperative/hubl
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: left project/circle page and intl default localisation

Browse Source
This commit is contained in:
Jean-Baptiste Pasquier 2021-03-17 11:19:32 +01:00
parent 6e46f26615
commit 1f1286973f
3 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/index.pug
View File

@ -184,6 +184,24 @@ html(lang="en")
)
include views/page-profile.pug
if componentSet.has('circles')
div.scrollbar-content.bg-color-white(
id=`${getComponent('circles').route}-left`
hidden
data-view=`${getComponent('circles').route}-left`
no-render
)
include views/partials/circle/page-circle-left.pug
if componentSet.has('projects')
div.scrollbar-content.bg-color-white(
id=`${getComponent('projects').route}-left`
hidden
data-view=`${getComponent('projects').route}-left`
no-render
)
include views/partials/project/page-project-left.pug
.loggedIn-loader.bg-color-grey.global-loader
div
div.loader

2
src/scripts/intl.js
View File

@ -179,8 +179,10 @@ class JsI18n {
t(key) {
var translations = this.locales[this.locale];
if (translations == undefined) {
if(this.locales.length > 1) {
translations = this.locales[this.defaultLocale];
}
}
if(translations != undefined) {
let translation = key.toString().split('.').reduce((o, i) => (o ? o[i] : undefined), translations);
if (typeof translation == "string") {

14
src/views/page-admin.pug
View File

@ -9,13 +9,6 @@
no-render
)
include partials/admin/page-admin-circles.pug
div(
id=`${component.route}-left`
hidden
data-view=`${component.route}-left`
no-render
)
include partials/circle/page-circle-left.pug
div(
id=`admin-${component.route}-create`
hidden
@ -31,13 +24,6 @@
no-render
)
include partials/admin/page-admin-projects.pug
div(
id=`${component.route}-left`
hidden
data-view=`${component.route}-left`
no-render
)
include partials/project/page-project-left.pug
div(
id=`admin-${component.route}-create`
hidden