From 016754b67c2cd762cccfc3f5cd30e6dc8ee58599 Mon Sep 17 00:00:00 2001 From: Diego Najar Date: Sun, 16 Jun 2019 22:31:48 +0200 Subject: [PATCH] Fix some english phrases --- bl-kernel/admin/views/about.php | 2 +- bl-kernel/admin/views/edit-user.php | 2 +- bl-kernel/admin/views/new-user.php | 2 +- bl-kernel/functions.php | 6 +++++- bl-kernel/pagex.class.php | 4 +++- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/bl-kernel/admin/views/about.php b/bl-kernel/admin/views/about.php index 8da2783b..734b70d0 100644 --- a/bl-kernel/admin/views/about.php +++ b/bl-kernel/admin/views/about.php @@ -10,7 +10,7 @@ echo ' echo ''; echo 'Bludit Edition'; if (defined('BLUDIT_PRO')) { - echo 'PRO - '.$L->g('Thanks for support Bludit').' '; + echo 'PRO - '.$L->g('Thanks for supporting Bludit').' '; } else { echo 'Standard - '.$L->g('Upgrade to Bludit PRO').''; } diff --git a/bl-kernel/admin/views/edit-user.php b/bl-kernel/admin/views/edit-user.php index 9226917d..8f0060cf 100644 --- a/bl-kernel/admin/views/edit-user.php +++ b/bl-kernel/admin/views/edit-user.php @@ -56,7 +56,7 @@ 'options'=>array('author'=>$L->g('Author'), 'editor'=>$L->g('Editor'), 'admin'=>$L->g('Administrator')), 'selected'=>$user->role(), 'class'=>'', - 'tip'=>'Author: Can write and edit his own content. Editor: Can write and edit the content of others.' + 'tip'=>$L->g('author-can-write-and-edit-their-own-content') )); } diff --git a/bl-kernel/admin/views/new-user.php b/bl-kernel/admin/views/new-user.php index 53eb7d38..4ca3e2ef 100644 --- a/bl-kernel/admin/views/new-user.php +++ b/bl-kernel/admin/views/new-user.php @@ -51,7 +51,7 @@ 'options'=>array('author'=>$L->g('Author'), 'editor'=>$L->g('Editor'), 'admin'=>$L->g('Administrator')), 'selected'=>'Author', 'class'=>'', - 'tip'=>'Author: Can write and edit his own content. Editor: Can write and edit the content of others.' + 'tip'=>$L->g('author-can-write-and-edit-their-own-content') )); echo Bootstrap::formInputText(array( diff --git a/bl-kernel/functions.php b/bl-kernel/functions.php index d360c088..79ed77d8 100644 --- a/bl-kernel/functions.php +++ b/bl-kernel/functions.php @@ -588,7 +588,7 @@ function editSettings($args) { // Add syslog $syslog->add(array( - 'dictionaryKey'=>'changes-on-settings', + 'dictionaryKey'=>'settings-changes', 'notes'=>'' )); @@ -790,6 +790,10 @@ function activateTheme($themeDirectory) { global $L, $language; if (Sanitize::pathFile(PATH_THEMES.$themeDirectory)) { + if (Sanitize::pathFile(PATH_THEMES.$themeDirectory, 'install.php')) { + include_once(PATH_THEMES.$themeDirectory.'install.php'); + } + $site->set(array('theme'=>$themeDirectory)); $syslog->add(array( diff --git a/bl-kernel/pagex.class.php b/bl-kernel/pagex.class.php index eec1393d..f55066db 100644 --- a/bl-kernel/pagex.class.php +++ b/bl-kernel/pagex.class.php @@ -269,8 +269,10 @@ class Page { $tmp['description'] = $this->description(); $tmp['type'] = $this->type(); $tmp['slug'] = $this->slug(); - $tmp['date'] = $this->dateRaw(); + $tmp['date'] = $this->date(); + $tmp['dateRaw'] = $this->dateRaw(); $tmp['tags'] = $this->tags(false); + $tmp['username'] = $this->username(); $tmp['dateUTC'] = Date::convertToUTC($this->dateRaw(), DB_DATE_FORMAT, DB_DATE_FORMAT); $tmp['permalink'] = $this->permalink(true); $tmp['coverImage'] = $this->coverImage(true);