fix: left project/circle page and intl default localisation
This commit is contained in:
parent
6e46f26615
commit
1f1286973f
@ -184,6 +184,24 @@ html(lang="en")
|
|||||||
)
|
)
|
||||||
include views/page-profile.pug
|
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
|
.loggedIn-loader.bg-color-grey.global-loader
|
||||||
div
|
div
|
||||||
div.loader
|
div.loader
|
||||||
|
@ -179,7 +179,9 @@ class JsI18n {
|
|||||||
t(key) {
|
t(key) {
|
||||||
var translations = this.locales[this.locale];
|
var translations = this.locales[this.locale];
|
||||||
if (translations == undefined) {
|
if (translations == undefined) {
|
||||||
translations = this.locales[this.defaultLocale];
|
if(this.locales.length > 1) {
|
||||||
|
translations = this.locales[this.defaultLocale];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if(translations != undefined) {
|
if(translations != undefined) {
|
||||||
let translation = key.toString().split('.').reduce((o, i) => (o ? o[i] : undefined), translations);
|
let translation = key.toString().split('.').reduce((o, i) => (o ? o[i] : undefined), translations);
|
||||||
|
@ -9,13 +9,6 @@
|
|||||||
no-render
|
no-render
|
||||||
)
|
)
|
||||||
include partials/admin/page-admin-circles.pug
|
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(
|
div(
|
||||||
id=`admin-${component.route}-create`
|
id=`admin-${component.route}-create`
|
||||||
hidden
|
hidden
|
||||||
@ -31,13 +24,6 @@
|
|||||||
no-render
|
no-render
|
||||||
)
|
)
|
||||||
include partials/admin/page-admin-projects.pug
|
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(
|
div(
|
||||||
id=`admin-${component.route}-create`
|
id=`admin-${component.route}-create`
|
||||||
hidden
|
hidden
|
||||||
|
Loading…
Reference in New Issue
Block a user