diff --git a/app/models/setting.js b/app/models/setting.js index a20d561e1..a46a809f1 100644 --- a/app/models/setting.js +++ b/app/models/setting.js @@ -11,7 +11,7 @@ export default Model.extend(ValidationEngine, { coverImage: attr('string'), icon: attr('string'), accentColor: attr('string'), - defaultLocale: attr('string'), + lang: attr('string'), activeTimezone: attr('string', {defaultValue: 'Etc/UTC'}), codeinjectionHead: attr('string'), codeinjectionFoot: attr('string'), diff --git a/app/services/custom-views.js b/app/services/custom-views.js index 55420b917..bcab6919a 100644 --- a/app/services/custom-views.js +++ b/app/services/custom-views.js @@ -126,7 +126,7 @@ export default class CustomViewsService extends Service { return; } - let views = JSON.parse(settings.get('sharedViews') || '{}'); + let views = JSON.parse(settings.get('sharedViews') || '[]'); views = isArray(views) ? views : []; let viewList = []; diff --git a/app/templates/settings/general.hbs b/app/templates/settings/general.hbs index 929536c97..12ee03ae2 100644 --- a/app/templates/settings/general.hbs +++ b/app/templates/settings/general.hbs @@ -76,23 +76,23 @@
Default: English (en); you can add translation files to your theme for any language