From 1f1286973f4a6d16500de204d37ed8ad7e495fe2 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Pasquier <contact@jbpasquier.eu>
Date: Wed, 17 Mar 2021 11:19:32 +0100
Subject: [PATCH] fix: left project/circle page and intl default localisation
---
src/index.pug | 18 ++++++++++++++++++
src/scripts/intl.js | 4 +++-
src/views/page-admin.pug | 14 --------------
3 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/src/index.pug b/src/index.pug
index cc354039..6e6d1525 100644
--- a/src/index.pug
+++ b/src/index.pug
@@ -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
diff --git a/src/scripts/intl.js b/src/scripts/intl.js
index 1b5e916c..5c02ae43 100644
--- a/src/scripts/intl.js
+++ b/src/scripts/intl.js
@@ -179,7 +179,9 @@ class JsI18n {
t(key) {
var translations = this.locales[this.locale];
if (translations == undefined) {
- translations = this.locales[this.defaultLocale];
+ 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);
diff --git a/src/views/page-admin.pug b/src/views/page-admin.pug
index dc4f4c4f..805c28b4 100644
--- a/src/views/page-admin.pug
+++ b/src/views/page-admin.pug
@@ -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
--
GitLab