diff options
44 files changed, 154 insertions, 148 deletions
diff --git a/core/namespace/Application.php b/core/namespace/Application.php index 4fa80cc..4a6414a 100644 --- a/core/namespace/Application.php +++ b/core/namespace/Application.php @@ -58,7 +58,9 @@ class Application { $template_lang = self::get('TEMPLATE.LANG'); $Language = new Language(self::get('CORE.LANGUAGE')); - $Language->loadLanguage(sprintf(ROOT.'template/%s/lang/%s.php', $template_name, $template_lang)); + $Language->load(sprintf(ROOT.'core/language/%s.php', Application::get('CORE.LANGUAGE'))); + $Language->load(sprintf(ROOT.'template/%s/lang/%s.php', $template_name, $template_lang)); + self::$Language = $Language; } diff --git a/core/namespace/Language.php b/core/namespace/Language.php index c8a018e..fdaf104 100644 --- a/core/namespace/Language.php +++ b/core/namespace/Language.php @@ -1,48 +1,52 @@ <?php class Language { - private $language = []; - private $template = []; + private $code = ''; + private $text = []; - public function __construct($lang) { - require ROOT."core/language/{$lang}.php"; - $this->language = $LANGUAGE; + public function __construct($code) { + $this->code = $code; } - public function loadLanguage($filename) { - require $filename; - $this->template = $LANGUAGE; + #=============================================================================== + # Return the language code + #=============================================================================== + public function getCode() { + return $this->code; } - public function template($name, $params = FALSE) { - if(isset($this->template[$name])) { - if($params) { - return vsprintf($this->template[$name], $params); - } - - return $this->template[$name]; + #=============================================================================== + # Load another language file + #=============================================================================== + public function load($filename) { + if(file_exists($filename) AND is_readable($filename)) { + require $filename; + $this->text = array_merge($this->text, $LANGUAGE ?? []); } - - return "{{$name}}"; } - private function get($name, $params = FALSE) { - if(isset($this->language[$name])) { - if($params) { - return vsprintf($this->language[$name], $params); - } + #=============================================================================== + # Set language string + #=============================================================================== + public function set($name, $value) { + return $this->text[$name] = $value; + } - return $this->language[$name]; + #=============================================================================== + # Return language string with included arguments + #=============================================================================== + public function text($name, $arguments = NULL): string { + if(!isset($this->text[$name])) { + return "{{$name}}"; } - return "{{$name}}"; + return vsprintf($this->text[$name], $arguments); } - public function text($name, $params = FALSE) { - return $this->get($name, $params); - } - - public function set($name, $value) { - return $this->language[$name] = $value; + #=============================================================================== + # DEPRECATED: This method will be removed in the future! + #=============================================================================== + public function template($name, $params = FALSE): string { + return $this->text($name, $params); } } ?>
\ No newline at end of file diff --git a/template/admin/html/403.php b/template/admin/html/403.php index aebddb7..f9a0afd 100644 --- a/template/admin/html/403.php +++ b/template/admin/html/403.php @@ -1,2 +1,2 @@ -<h1><i class="fa fa-exclamation-triangle"></i><?=$Language->template('403_heading_text')?></h1> -<p><?=$Language->template('403_heading_desc')?></p> +<h1><i class="fa fa-exclamation-triangle"></i><?=$Language->text('403_heading_text')?></h1> +<p><?=$Language->text('403_heading_desc')?></p> diff --git a/template/admin/html/404.php b/template/admin/html/404.php index 4f841b6..aa264cd 100644 --- a/template/admin/html/404.php +++ b/template/admin/html/404.php @@ -1,2 +1,2 @@ -<h1><i class="fa fa-exclamation-triangle"></i><?=$Language->template('404_heading_text')?></h1> -<p><?=$Language->template('404_heading_desc')?></p>
\ No newline at end of file +<h1><i class="fa fa-exclamation-triangle"></i><?=$Language->text('404_heading_text')?></h1> +<p><?=$Language->text('404_heading_desc')?></p>
\ No newline at end of file diff --git a/template/admin/html/auth.php b/template/admin/html/auth.php index 186c096..6aec620 100644 --- a/template/admin/html/auth.php +++ b/template/admin/html/auth.php @@ -1,5 +1,5 @@ -<h1><?=$Language->template('authentication_text')?></h1> -<p><?=$Language->template('authentication_desc')?></p> +<h1><?=$Language->text('authentication_text')?></h1> +<p><?=$Language->text('authentication_desc')?></p> <form action="" method="POST"> <input type="hidden" name="token" value="<?=$FORM['TOKEN']?>" /> @@ -17,18 +17,18 @@ <div class="flex"> <div class="flex-item"> <div class="form-icon-flex"><i class="fa fa-user-secret"></i></div> - <div class="form-label-flex"><label for="form_username"><?=$Language->template('label_username')?></label></div> + <div class="form-label-flex"><label for="form_username"><?=$Language->text('label_username')?></label></div> <div class="form-field-flex"><input id="form_username" name="username" value="<?=escapeHTML($FORM['DATA']['USERNAME'])?>" /></div> </div> </div> <div class="flex"> <div class="flex-item"> <div class="form-icon-flex"><i class="fa fa-key"></i></div> - <div class="form-label-flex"><label for="form_password"><?=$Language->template('label_password')?></label></div> + <div class="form-label-flex"><label for="form_password"><?=$Language->text('label_password')?></label></div> <div class="form-field-flex"><input type="password" id="form_password" name="password" /></div> </div> </div> <div class="flex flex-padding background"> - <input type="submit" name="auth" value="Auth" /> + <input type="submit" name="auth" value="<?=$Language->text('login')?>" /> </div> </form>
\ No newline at end of file diff --git a/template/admin/html/database.php b/template/admin/html/database.php index 319bf02..983dee7 100644 --- a/template/admin/html/database.php +++ b/template/admin/html/database.php @@ -1,5 +1,5 @@ -<h1><i class="fa fa-database"></i><?=$Language->template('overview_database_text')?></h1> -<p><?=$Language->template('overview_database_desc')?></p> +<h1><i class="fa fa-database"></i><?=$Language->text('overview_database_text')?></h1> +<p><?=$Language->text('overview_database_desc')?></p> <form action="" method="POST"> <input type="hidden" name="token" value="<?=$FORM['TOKEN']?>" /> @@ -15,7 +15,7 @@ <?php endif; ?> <div class="flex"> - <textarea id="content-editor" placeholder="<?=$Language->template('database_warning')?>" name="command"><?=escapeHTML($FORM['COMMAND'])?></textarea> + <textarea id="content-editor" placeholder="<?=$Language->text('database_warning')?>" name="command"><?=escapeHTML($FORM['COMMAND'])?></textarea> </div> <?php if($FORM['RESULT']): ?> diff --git a/template/admin/html/home.php b/template/admin/html/home.php index 6701f35..6ade82d 100644 --- a/template/admin/html/home.php +++ b/template/admin/html/home.php @@ -1,17 +1,17 @@ -<h1><i class="fa fa-dashboard"></i><?=$Language->template('overview_dashboard_text')?></h1> -<p><?=$Language->template('overview_dashboard_desc')?></p> +<h1><i class="fa fa-dashboard"></i><?=$Language->text('overview_dashboard_text')?></h1> +<p><?=$Language->text('overview_dashboard_desc')?></p> -<h2><i class="fa fa-newspaper-o"></i><?=$Language->template('last_post')?></h2> +<h2><i class="fa fa-newspaper-o"></i><?=$Language->text('last_post')?></h2> <p><strong><?=$Language->text('posts')?>:</strong> <?=$COUNT['POST']?> | <a href="<?=Application::getAdminURL('post/')?>"><?=$Language->text('post_overview')?></a> | <a href="<?=Application::getAdminURL('post/insert.php')?>"><?=$Language->text('insert')?></a></p> <?php if(!empty($LAST['POST'])): ?> <ul class="item-list"> <?=$LAST['POST']?> </ul> <?php else: ?> - <p><em><?=$Language->template('home_no_posts')?></em></p> + <p><em><?=$Language->text('home_no_posts')?></em></p> <?php endif; ?> -<h2><i class="fa fa-file-text-o"></i><?=$Language->template('last_page')?></h2> +<h2><i class="fa fa-file-text-o"></i><?=$Language->text('last_page')?></h2> <p><strong><?=$Language->text('pages')?>:</strong> <?=$COUNT['PAGE']?> | <a href="<?=Application::getAdminURL('page/')?>"><?=$Language->text('page_overview')?></a> | <a href="<?=Application::getAdminURL('page/insert.php')?>"><?=$Language->text('insert')?></a></p> <?php if(!empty($LAST['PAGE'])): ?> @@ -19,10 +19,10 @@ <?=$LAST['PAGE']?> </ul> <?php else: ?> - <p><em><?=$Language->template('home_no_pages')?></em></p> + <p><em><?=$Language->text('home_no_pages')?></em></p> <?php endif; ?> -<h2><i class="fa fa-user"></i><?=$Language->template('last_user')?></h2> +<h2><i class="fa fa-user"></i><?=$Language->text('last_user')?></h2> <p><strong><?=$Language->text('users')?>:</strong> <?=$COUNT['USER']?> | <a href="<?=Application::getAdminURL('user/')?>"><?=$Language->text('user_overview')?></a> | <a href="<?=Application::getAdminURL('user/insert.php')?>"><?=$Language->text('insert')?></a></p> <?php if(!empty($LAST['USER'])): ?> @@ -30,5 +30,5 @@ <?=$LAST['USER']?> </ul> <?php else: ?> - <p><em><?=$Language->template('home_no_users')?></em></p> + <p><em><?=$Language->text('home_no_users')?></em></p> <?php endif; ?> diff --git a/template/admin/html/main.php b/template/admin/html/main.php index d7b6148..fafc8d0 100644 --- a/template/admin/html/main.php +++ b/template/admin/html/main.php @@ -22,18 +22,18 @@ <nav id="main-navi"> <?php if(Application::isAuthenticated()): ?> <ul> - <li><a href="<?=Application::getAdminURL()?>" title="<?=$Language->template('overview_dashboard_text')?>"><i class="fa fa-dashboard"></i><span>Dashboard</span></a></li> + <li><a href="<?=Application::getAdminURL()?>" title="<?=$Language->text('overview_dashboard_text')?>"><i class="fa fa-dashboard"></i><span>Dashboard</span></a></li> <li><a href="<?=Application::getAdminURL('post/')?>" title="<?=$Language->text('post_overview')?>"><i class="fa fa-newspaper-o"></i><span><?=$Language->text('posts')?></span></a></li> <li><a href="<?=Application::getAdminURL('page/')?>" title="<?=$Language->text('page_overview')?>"><i class="fa fa-file-text-o"></i><span><?=$Language->text('pages')?></span></a></li> <li><a href="<?=Application::getAdminURL('user/')?>" title="<?=$Language->text('user_overview')?>"><i class="fa fa-user"></i><span><?=$Language->text('users')?></span></a></li> - <li><a href="<?=Application::getAdminURL('database.php')?>" title="<?=$Language->template('overview_database_text')?>"><i class="fa fa-database"></i><span><?=$Language->template('overview_database_text')?></span></a></li> + <li><a href="<?=Application::getAdminURL('database.php')?>" title="<?=$Language->text('overview_database_text')?>"><i class="fa fa-database"></i><span><?=$Language->text('overview_database_text')?></span></a></li> </ul> <ul> - <li><a href="<?=Application::getAdminURL('auth.php?action=logout&token='.Application::getSecurityToken())?>"><i class="fa fa-sign-out"></i><span>Logout</span></a></li> + <li><a href="<?=Application::getAdminURL('auth.php?action=logout&token='.Application::getSecurityToken())?>"><i class="fa fa-sign-out"></i><span><?=$Language->text('logout')?></span></a></li> </ul> <?php else: ?> <ul> - <li><a href="<?=Application::getAdminURL('auth.php')?>"><i class="fa fa-sign-in"></i><span>Login</span></a></li> + <li><a href="<?=Application::getAdminURL('auth.php')?>"><i class="fa fa-sign-in"></i><span><?=$Language->text('login')?></span></a></li> </ul> <?php endif; ?> </nav> diff --git a/template/admin/html/page/delete.php b/template/admin/html/page/delete.php index 95451d8..ccc569f 100644 --- a/template/admin/html/page/delete.php +++ b/template/admin/html/page/delete.php @@ -1,4 +1,4 @@ <h1><i class="fa fa-trash-o"></i><?=$Language->text('delete_page')?></h1> -<p><?=$Language->template('delete_page_desc')?></p> +<p><?=$Language->text('delete_page_desc')?></p> <?=$HTML?>
\ No newline at end of file diff --git a/template/admin/html/page/form.php b/template/admin/html/page/form.php index c0bc7e4..ad7387f 100644 --- a/template/admin/html/page/form.php +++ b/template/admin/html/page/form.php @@ -20,7 +20,7 @@ </div> <div class="flex-item"> <div class="form-icon-flex"><i class="fa fa-user"></i></div> - <div class="form-label-flex"><label for="form_user"><?=$Language->template('label_user')?></label></div> + <div class="form-label-flex"><label for="form_user"><?=$Language->text('label_user')?></label></div> <div class="form-field-flex"> <select id="form_user" name="user"> <?php foreach($FORM['USER_LIST'] as $user): ?> @@ -33,39 +33,39 @@ <div class="flex flex-responsive"> <div class="flex-item"> <div class="form-icon-flex"><i class="fa fa-file-text-o"></i></div> - <div class="form-label-flex"><label for="form_name"><?=$Language->template('label_name')?></label></div> + <div class="form-label-flex"><label for="form_name"><?=$Language->text('label_name')?></label></div> <div class="form-field-flex"><input id="form_name" name="name" value="<?=escapeHTML($FORM['DATA']['NAME'])?>" /></div> </div> <div class="flex-item"> <div class="form-icon-flex"><i class="fa fa-link"></i></div> - <div class="form-label-flex"><label for="form_slug"><?=$Language->template('label_slug')?></label></div> + <div class="form-label-flex"><label for="form_slug"><?=$Language->text('label_slug')?></label></div> <div class="form-field-flex"><input id="form_slug" name="slug" value="<?=escapeHTML($FORM['DATA']['SLUG'])?>" /></div> </div> </div> <div class="flex flex-responsive"> <div class="flex-item"> <div class="form-icon-flex"><i class="fa fa-clock-o"></i></div> - <div class="form-label-flex"><label for="form_time_insert"><?=$Language->template('label_insert')?></label></div> + <div class="form-label-flex"><label for="form_time_insert"><?=$Language->text('label_insert')?></label></div> <div class="form-field-flex"><input id="form_time_insert" name="time_insert" placeholder="[YYYY-MM-DD HH:II:SS]" value="<?=escapeHTML($FORM['DATA']['TIME_INSERT'])?>" /></div> </div> <div class="flex-item"> <div class="form-icon-flex"><i class="fa fa-clock-o"></i></div> - <div class="form-label-flex"><label for="form_time_update"><?=$Language->template('label_update')?></label></div> + <div class="form-label-flex"><label for="form_time_update"><?=$Language->text('label_update')?></label></div> <div class="form-field-flex"><input id="form_time_update" name="time_update" placeholder="<?=escapeHTML($FORM['DATA']['TIME_UPDATE'] ? $FORM['DATA']['TIME_UPDATE'] : '[CURRENT_TIMESTAMP]')?>" value="" /></div> </div> </div> <div class="flex flex-direction-column"> <div id="button-list-wrapper"> <ul id="markdown-list" class="button-list markdown"> - <li data-markdown="bold" class="fa fa-bold" title="<?=$Language->template('markdown_bold')?>"></li> - <li data-markdown="italic" class="fa fa-italic" title="<?=$Language->template('markdown_italic')?>"></li> - <li data-markdown="heading" class="fa fa-header" title="<?=$Language->template('markdown_heading')?>"></li> - <li data-markdown="link" class="fa fa-link" title="<?=$Language->template('markdown_link')?>"></li> - <li data-markdown="image" class="fa fa-picture-o" title="<?=$Language->template('markdown_image')?>"></li> - <li data-markdown="code" class="fa fa-code" title="<?=$Language->template('markdown_code')?>"></li> - <li data-markdown="quote" class="fa fa-quote-right" title="<?=$Language->template('markdown_quote')?>"></li> - <li data-markdown="list_ul" class="fa fa-list-ul" title="<?=$Language->template('markdown_list_ul')?>"></li> - <li data-markdown="list_ol" class="fa fa-list-ol" title="<?=$Language->template('markdown_list_ol')?>"></li> + <li data-markdown="bold" class="fa fa-bold" title="<?=$Language->text('markdown_bold')?>"></li> + <li data-markdown="italic" class="fa fa-italic" title="<?=$Language->text('markdown_italic')?>"></li> + <li data-markdown="heading" class="fa fa-header" title="<?=$Language->text('markdown_heading')?>"></li> + <li data-markdown="link" class="fa fa-link" title="<?=$Language->text('markdown_link')?>"></li> + <li data-markdown="image" class="fa fa-picture-o" title="<?=$Language->text('markdown_image')?>"></li> + <li data-markdown="code" class="fa fa-code" title="<?=$Language->text('markdown_code')?>"></li> + <li data-markdown="quote" class="fa fa-quote-right" title="<?=$Language->text('markdown_quote')?>"></li> + <li data-markdown="list_ul" class="fa fa-list-ul" title="<?=$Language->text('markdown_list_ul')?>"></li> + <li data-markdown="list_ol" class="fa fa-list-ol" title="<?=$Language->text('markdown_list_ol')?>"></li> </ul> </div> <textarea id="content-editor" name="body" placeholder="[…]"><?=escapeHTML($FORM['DATA']['BODY'])?></textarea> @@ -92,7 +92,7 @@ <?php elseif($FORM['TYPE'] === 'UPDATE'): ?> <input id="update-button" type="submit" name="update" value="<?=$Language->text('update')?>" /> <?php elseif($FORM['TYPE'] === 'DELETE'): ?> - <input id="delete-button" type="submit" name="delete" value="<?=$Language->text('delete')?>" data-text="<?=$Language->template('sure')?>" /> + <input id="delete-button" type="submit" name="delete" value="<?=$Language->text('delete')?>" data-text="<?=$Language->text('sure')?>" /> <?php endif; ?> </div> </form>
\ No newline at end of file diff --git a/template/admin/html/page/index.php b/template/admin/html/page/index.php index 8fff434..0989796 100644 --- a/template/admin/html/page/index.php +++ b/template/admin/html/page/index.php @@ -1,5 +1,5 @@ <h1><i class="fa fa-file-text-o"></i><?=$Language->text('page_overview')?><a class="brackets" href="<?=Application::getAdminURL("page/insert.php")?>"><?=$Language->text('insert')?></a></h1> -<p><?=$Language->template('overview_page_desc')?></p> +<p><?=$Language->text('overview_page_desc')?></p> <ul class="item-list page"> <?php foreach($LIST['PAGES'] as $page): ?> diff --git a/template/admin/html/page/insert.php b/template/admin/html/page/insert.php index d45d79c..535fca8 100644 --- a/template/admin/html/page/insert.php +++ b/template/admin/html/page/insert.php @@ -1,4 +1,4 @@ <h1><i class="fa fa-file-text-o"></i><?=$Language->text('insert_page')?></h1> -<p><?=$Language->template('insert_page_desc')?></p> +<p><?=$Language->text('insert_page_desc')?></p> <?=$HTML?>
\ No newline at end of file diff --git a/template/admin/html/page/item.php b/template/admin/html/page/item.php index 8afeb15..4f0f884 100644 --- a/template/admin/html/page/item.php +++ b/template/admin/html/page/item.php @@ -3,7 +3,7 @@ <h2><i class="fa fa-file-text-o"></i><?=escapeHTML($PAGE['ATTR']['NAME'])?><span>#<?=$PAGE['ATTR']['ID']?></span></h2> <div> <a class="brackets" href="<?=Application::getAdminURL("user/update.php?id={$USER['ATTR']['ID']}")?>"><?=escapeHTML($USER['ATTR']['FULLNAME'])?></a> - <time class="brackets" datetime="<?=$PAGE['ATTR']['TIME_INSERT']?>"><?=parseDatetime($PAGE['ATTR']['TIME_INSERT'], $Language->template('date_format'))?></time> + <time class="brackets" datetime="<?=$PAGE['ATTR']['TIME_INSERT']?>"><?=parseDatetime($PAGE['ATTR']['TIME_INSERT'], $Language->text('date_format'))?></time> </div> </header> <blockquote cite="<?=$PAGE['URL']?>"> diff --git a/template/admin/html/page/update.php b/template/admin/html/page/update.php index d15d784..a0ba51f 100644 --- a/template/admin/html/page/update.php +++ b/template/admin/html/page/update.php @@ -1,4 +1,4 @@ <h1><i class="fa fa-file-text-o"></i><?=$Language->text('update_page')?></h1> -<p><?=$Language->template('update_page_desc')?></p> +<p><?=$Language->text('update_page_desc')?></p> <?=$HTML?>
\ No newline at end of file diff --git a/template/admin/html/post/delete.php b/template/admin/html/post/delete.php index 9be4566..6654377 100644 --- a/template/admin/html/post/delete.php +++ b/template/admin/html/post/delete.php @@ -1,4 +1,4 @@ <h1><i class="fa fa-trash-o"></i><?=$Language->text('delete_post')?></h1> -<p><?=$Language->template('delete_post_desc')?></p> +<p><?=$Language->text('delete_post_desc')?></p> <?=$HTML?>
\ No newline at end of file diff --git a/template/admin/html/post/form.php b/template/admin/html/post/form.php index 89d4478..1123ff3 100644 --- a/template/admin/html/post/form.php +++ b/template/admin/html/post/form.php @@ -20,7 +20,7 @@ </div> <div class="flex-item"> <div class="form-icon-flex"><i class="fa fa-user"></i></div> - <div class="form-label-flex"><label for="form_user"><?=$Language->template('label_user')?></label></div> + <div class="form-label-flex"><label for="form_user"><?=$Language->text('label_user')?></label></div> <div class="form-field-flex"> <select id="form_user" name="user"> <?php foreach($FORM['USER_LIST'] as $user): ?> @@ -33,39 +33,39 @@ <div class="flex flex-responsive"> <div class="flex-item"> <div class="form-icon-flex"><i class="fa fa-newspaper-o"></i></div> - <div class="form-label-flex"><label for="form_name"><?=$Language->template('label_name')?></label></div> + <div class="form-label-flex"><label for="form_name"><?=$Language->text('label_name')?></label></div> <div class="form-field-flex"><input id="form_name" name="name" value="<?=escapeHTML($FORM['DATA']['NAME'])?>" /></div> </div> <div class="flex-item"> <div class="form-icon-flex"><i class="fa fa-link"></i></div> - <div class="form-label-flex"><label for="form_slug"><?=$Language->template('label_slug')?></label></div> + <div class="form-label-flex"><label for="form_slug"><?=$Language->text('label_slug')?></label></div> <div class="form-field-flex"><input id="form_slug" name="slug" value="<?=escapeHTML($FORM['DATA']['SLUG'])?>" /></div> </div> </div> <div class="flex flex-responsive"> <div class="flex-item"> <div class="form-icon-flex"><i class="fa fa-clock-o"></i></div> - <div class="form-label-flex"><label for="form_time_insert"><?=$Language->template('label_insert')?></label></div> + <div class="form-label-flex"><label for="form_time_insert"><?=$Language->text('label_insert')?></label></div> <div class="form-field-flex"><input id="form_time_insert" name="time_insert" placeholder="[YYYY-MM-DD HH:II:SS]" value="<?=escapeHTML($FORM['DATA']['TIME_INSERT'])?>" /></div> </div> <div class="flex-item"> <div class="form-icon-flex"><i class="fa fa-clock-o"></i></div> - <div class="form-label-flex"><label for="form_time_update"><?=$Language->template('label_update')?></label></div> + <div class="form-label-flex"><label for="form_time_update"><?=$Language->text('label_update')?></label></div> <div class="form-field-flex"><input id="form_time_update" name="time_update" placeholder="<?=escapeHTML($FORM['DATA']['TIME_UPDATE'] ? $FORM['DATA']['TIME_UPDATE'] : '[CURRENT_TIMESTAMP]')?>" value="" /></div> </div> </div> <div class="flex flex-direction-column"> <div id="button-list-wrapper"> <ul id="markdown-list" class="button-list markdown"> - <li data-markdown="bold" class="fa fa-bold" title="<?=$Language->template('markdown_bold')?>"></li> - <li data-markdown="italic" class="fa fa-italic" title="<?=$Language->template('markdown_italic')?>"></li> - <li data-markdown="heading" class="fa fa-header" title="<?=$Language->template('markdown_heading')?>"></li> - <li data-markdown="link" class="fa fa-link" title="<?=$Language->template('markdown_link')?>"></li> - <li data-markdown="image" class="fa fa-picture-o" title="<?=$Language->template('markdown_image')?>"></li> - <li data-markdown="code" class="fa fa-code" title="<?=$Language->template('markdown_code')?>"></li> - <li data-markdown="quote" class="fa fa-quote-right" title="<?=$Language->template('markdown_quote')?>"></li> - <li data-markdown="list_ul" class="fa fa-list-ul" title="<?=$Language->template('markdown_list_ul')?>"></li> - <li data-markdown="list_ol" class="fa fa-list-ol" title="<?=$Language->template('markdown_list_ol')?>"></li> + <li data-markdown="bold" class="fa fa-bold" title="<?=$Language->text('markdown_bold')?>"></li> + <li data-markdown="italic" class="fa fa-italic" title="<?=$Language->text('markdown_italic')?>"></li> + <li data-markdown="heading" class="fa fa-header" title="<?=$Language->text('markdown_heading')?>"></li> + <li data-markdown="link" class="fa fa-link" title="<?=$Language->text('markdown_link')?>"></li> + <li data-markdown="image" class="fa fa-picture-o" title="<?=$Language->text('markdown_image')?>"></li> + <li data-markdown="code" class="fa fa-code" title="<?=$Language->text('markdown_code')?>"></li> + <li data-markdown="quote" class="fa fa-quote-right" title="<?=$Language->text('markdown_quote')?>"></li> + <li data-markdown="list_ul" class="fa fa-list-ul" title="<?=$Language->text('markdown_list_ul')?>"></li> + <li data-markdown="list_ol" class="fa fa-list-ol" title="<?=$Language->text('markdown_list_ol')?>"></li> </ul> </div> <textarea id="content-editor" name="body" placeholder="[…]"><?=escapeHTML($FORM['DATA']['BODY'])?></textarea> @@ -92,7 +92,7 @@ <?php elseif($FORM['TYPE'] === 'UPDATE'): ?> <input id="update-button" type="submit" name="update" value="<?=$Language->text('update')?>" /> <?php elseif($FORM['TYPE'] === 'DELETE'): ?> - <input id="delete-button" type="submit" name="delete" value="<?=$Language->text('delete')?>" data-text="<?=$Language->template('sure')?>" /> + <input id="delete-button" type="submit" name="delete" value="<?=$Language->text('delete')?>" data-text="<?=$Language->text('sure')?>" /> <?php endif; ?> </div> </form>
\ No newline at end of file diff --git a/template/admin/html/post/index.php b/template/admin/html/post/index.php index c997955..124d39b 100644 --- a/template/admin/html/post/index.php +++ b/template/admin/html/post/index.php @@ -1,5 +1,5 @@ <h1><i class="fa fa-newspaper-o"></i><?=$Language->text('post_overview')?><a class="brackets" href="<?=Application::getAdminURL("post/insert.php")?>"><?=$Language->text('insert')?></a></h1> -<p><?=$Language->template('overview_post_desc')?></p> +<p><?=$Language->text('overview_post_desc')?></p> <ul class="item-list post"> <?php foreach($LIST['POSTS'] as $post): ?> diff --git a/template/admin/html/post/insert.php b/template/admin/html/post/insert.php index df4b26d..802ccf1 100644 --- a/template/admin/html/post/insert.php +++ b/template/admin/html/post/insert.php @@ -1,4 +1,4 @@ <h1><i class="fa fa-newspaper-o"></i><?=$Language->text('insert_post')?></h1> -<p><?=$Language->template('insert_post_desc')?></p> +<p><?=$Language->text('insert_post_desc')?></p> <?=$HTML?>
\ No newline at end of file diff --git a/template/admin/html/post/item.php b/template/admin/html/post/item.php index a49e2a5..19b81c1 100644 --- a/template/admin/html/post/item.php +++ b/template/admin/html/post/item.php @@ -3,7 +3,7 @@ <h2><i class="fa fa-newspaper-o"></i><?=escapeHTML($POST['ATTR']['NAME'])?><span>#<?=$POST['ATTR']['ID']?></span></h2> <div> <a class="brackets" href="<?=Application::getAdminURL("user/update.php?id={$USER['ATTR']['ID']}")?>"><?=escapeHTML($USER['ATTR']['FULLNAME'])?></a> - <time class="brackets" datetime="<?=$POST['ATTR']['TIME_INSERT']?>"><?=parseDatetime($POST['ATTR']['TIME_INSERT'], $Language->template('date_format'))?></time> + <time class="brackets" datetime="<?=$POST['ATTR']['TIME_INSERT']?>"><?=parseDatetime($POST['ATTR']['TIME_INSERT'], $Language->text('date_format'))?></time> </div> </header> <blockquote cite="<?=$POST['URL']?>"> diff --git a/template/admin/html/post/update.php b/template/admin/html/post/update.php index baa119e..b17225c 100644 --- a/template/admin/html/post/update.php +++ b/template/admin/html/post/update.php @@ -1,4 +1,4 @@ <h1><i class="fa fa-newspaper-o"></i><?=$Language->text('update_post')?></h1> -<p><?=$Language->template('update_post_desc')?></p> +<p><?=$Language->text('update_post_desc')?></p> <?=$HTML?>
\ No newline at end of file diff --git a/template/admin/html/user/delete.php b/template/admin/html/user/delete.php index dac4185..01927b2 100644 --- a/template/admin/html/user/delete.php +++ b/template/admin/html/user/delete.php @@ -1,6 +1,6 @@ <h1><i class="fa fa-trash-o"></i><?=$Language->text('delete_user')?></h1> -<p><?=$Language->template('delete_user_desc')?></p> +<p><?=$Language->text('delete_user_desc')?></p> -<p class="red"><?=$Language->template('delete_user_warning')?></p> +<p class="red"><?=$Language->text('delete_user_warning')?></p> <?=$HTML?>
\ No newline at end of file diff --git a/template/admin/html/user/form.php b/template/admin/html/user/form.php index 2d3625c..a9d4b0a 100644 --- a/template/admin/html/user/form.php +++ b/template/admin/html/user/form.php @@ -20,58 +20,58 @@ </div> <div class="flex-item"> <div class="form-icon-flex"><i class="fa fa-key"></i></div> - <div class="form-label-flex"><label for="form_password"><?=$Language->template('label_password')?></label></div> + <div class="form-label-flex"><label for="form_password"><?=$Language->text('label_password')?></label></div> <div class="form-field-flex"><input id="form_password" name="password" placeholder="[NO CHANGE]" type="password" /></div> </div> </div> <div class="flex flex-responsive"> <div class="flex-item"> <div class="form-icon-flex"><i class="fa fa-user"></i></div> - <div class="form-label-flex"><label for="form_fullname"><?=$Language->template('label_fullname')?></label></div> + <div class="form-label-flex"><label for="form_fullname"><?=$Language->text('label_fullname')?></label></div> <div class="form-field-flex"><input id="form_fullname" name="fullname" value="<?=escapeHTML($FORM['DATA']['FULLNAME'])?>" /></div> </div> <div class="flex-item"> <div class="form-icon-flex"><i class="fa fa-envelope-o"></i></div> - <div class="form-label-flex"><label for="form_mailaddr"><?=$Language->template('label_mailaddr')?></label></div> + <div class="form-label-flex"><label for="form_mailaddr"><?=$Language->text('label_mailaddr')?></label></div> <div class="form-field-flex"><input id="form_mailaddr" name="mailaddr" value="<?=escapeHTML($FORM['DATA']['MAILADDR'])?>" /></div> </div> </div> <div class="flex flex-responsive"> <div class="flex-item"> <div class="form-icon-flex"><i class="fa fa-user-secret"></i></div> - <div class="form-label-flex"><label for="form_username"><?=$Language->template('label_username')?></label></div> + <div class="form-label-flex"><label for="form_username"><?=$Language->text('label_username')?></label></div> <div class="form-field-flex"><input id="form_username" name="username" value="<?=escapeHTML($FORM['DATA']['USERNAME'])?>" /></div> </div> <div class="flex-item"> <div class="form-icon-flex"><i class="fa fa-link"></i></div> - <div class="form-label-flex"><label for="form_slug"><?=$Language->template('label_slug')?></label></div> + <div class="form-label-flex"><label for="form_slug"><?=$Language->text('label_slug')?></label></div> <div class="form-field-flex"><input id="form_slug" name="slug" value="<?=escapeHTML($FORM['DATA']['SLUG'])?>" /></div> </div> </div> <div class="flex flex-responsive"> <div class="flex-item"> <div class="form-icon-flex"><i class="fa fa-clock-o"></i></div> - <div class="form-label-flex"><label for="form_time_insert"><?=$Language->template('label_insert')?></label></div> + <div class="form-label-flex"><label for="form_time_insert"><?=$Language->text('label_insert')?></label></div> <div class="form-field-flex"><input id="form_time_insert" name="time_insert" placeholder="[YYYY-MM-DD HH:II:SS]" value="<?=escapeHTML($FORM['DATA']['TIME_INSERT'])?>" /></div> </div> <div class="flex-item"> <div class="form-icon-flex"><i class="fa fa-clock-o"></i></div> - <div class="form-label-flex"><label for="form_time_update"><?=$Language->template('label_update')?></label></div> + <div class="form-label-flex"><label for="form_time_update"><?=$Language->text('label_update')?></label></div> <div class="form-field-flex"><input id="form_time_update" name="time_update" placeholder="<?=escapeHTML($FORM['DATA']['TIME_UPDATE'] ? $FORM['DATA']['TIME_UPDATE'] : '[CURRENT_TIMESTAMP]')?>" value="" /></div> </div> </div> <div class="flex flex-direction-column"> <div id="button-list-wrapper"> <ul id="markdown-list" class="button-list markdown"> - <li data-markdown="bold" class="fa fa-bold" title="<?=$Language->template('markdown_bold')?>"></li> - <li data-markdown="italic" class="fa fa-italic" title="<?=$Language->template('markdown_italic')?>"></li> - <li data-markdown="heading" class="fa fa-header" title="<?=$Language->template('markdown_heading')?>"></li> - <li data-markdown="link" class="fa fa-link" title="<?=$Language->template('markdown_link')?>"></li> - <li data-markdown="image" class="fa fa-picture-o" title="<?=$Language->template('markdown_image')?>"></li> - <li data-markdown="code" class="fa fa-code" title="<?=$Language->template('markdown_code')?>"></li> - <li data-markdown="quote" class="fa fa-quote-right" title="<?=$Language->template('markdown_quote')?>"></li> - <li data-markdown="list_ul" class="fa fa-list-ul" title="<?=$Language->template('markdown_list_ul')?>"></li> - <li data-markdown="list_ol" class="fa fa-list-ol" title="<?=$Language->template('markdown_list_ol')?>"></li> + <li data-markdown="bold" class="fa fa-bold" title="<?=$Language->text('markdown_bold')?>"></li> + <li data-markdown="italic" class="fa fa-italic" title="<?=$Language->text('markdown_italic')?>"></li> + <li data-markdown="heading" class="fa fa-header" title="<?=$Language->text('markdown_heading')?>"></li> + <li data-markdown="link" class="fa fa-link" title="<?=$Language->text('markdown_link')?>"></li> + <li data-markdown="image" class="fa fa-picture-o" title="<?=$Language->text('markdown_image')?>"></li> + <li data-markdown="code" class="fa fa-code" title="<?=$Language->text('markdown_code')?>"></li> + <li data-markdown="quote" class="fa fa-quote-right" title="<?=$Language->text('markdown_quote')?>"></li> + <li data-markdown="list_ul" class="fa fa-list-ul" title="<?=$Language->text('markdown_list_ul')?>"></li> + <li data-markdown="list_ol" class="fa fa-list-ol" title="<?=$Language->text('markdown_list_ol')?>"></li> </ul> </div> <textarea id="content-editor" name="body" placeholder="[…]"><?=escapeHTML($FORM['DATA']['BODY'])?></textarea> @@ -98,7 +98,7 @@ <?php elseif($FORM['TYPE'] === 'UPDATE'): ?> <input id="update-button" type="submit" name="update" value="<?=$Language->text('update')?>" /> <?php elseif($FORM['TYPE'] === 'DELETE'): ?> - <input id="delete-button" type="submit" name="delete" value="<?=$Language->text('delete')?>" data-text="<?=$Language->template('sure')?>" /> + <input id="delete-button" type="submit" name="delete" value="<?=$Language->text('delete')?>" data-text="<?=$Language->text('sure')?>" /> <?php endif; ?> </div> </form>
\ No newline at end of file diff --git a/template/admin/html/user/index.php b/template/admin/html/user/index.php index cbeea9b..bc34402 100644 --- a/template/admin/html/user/index.php +++ b/template/admin/html/user/index.php @@ -1,5 +1,5 @@ <h1><i class="fa fa-user"></i><?=$Language->text('user_overview')?><a class="brackets" href="<?=Application::getAdminURL("user/insert.php")?>"><?=$Language->text('insert')?></a></h1> -<p><?=$Language->template('overview_user_desc')?></p> +<p><?=$Language->text('overview_user_desc')?></p> <ul class="item-list user"> <?php foreach($LIST['USERS'] as $user): ?> diff --git a/template/admin/html/user/insert.php b/template/admin/html/user/insert.php index 54598ee..4613da3 100644 --- a/template/admin/html/user/insert.php +++ b/template/admin/html/user/insert.php @@ -1,4 +1,4 @@ <h1><i class="fa fa-user"></i><?=$Language->text('insert_user')?></h1> -<p><?=$Language->template('insert_user_desc')?></p> +<p><?=$Language->text('insert_user_desc')?></p> <?=$HTML?>
\ No newline at end of file diff --git a/template/admin/html/user/item.php b/template/admin/html/user/item.php index 5efbae3..6cb9e7a 100644 --- a/template/admin/html/user/item.php +++ b/template/admin/html/user/item.php @@ -2,7 +2,7 @@ <header> <h2><i class="fa fa-user"></i><?=escapeHTML($USER['ATTR']['FULLNAME'])?><span>#<?=$USER['ATTR']['ID']?></span></h2> <div> - <time class="brackets" datetime="<?=$USER['ATTR']['TIME_INSERT']?>"><?=parseDatetime($USER['ATTR']['TIME_INSERT'], $Language->template('date_format'))?></time> + <time class="brackets" datetime="<?=$USER['ATTR']['TIME_INSERT']?>"><?=parseDatetime($USER['ATTR']['TIME_INSERT'], $Language->text('date_format'))?></time> </div> </header> <blockquote cite="<?=$USER['URL']?>"> diff --git a/template/admin/html/user/update.php b/template/admin/html/user/update.php index 6f7ddae..6748cae 100644 --- a/template/admin/html/user/update.php +++ b/template/admin/html/user/update.php @@ -1,4 +1,4 @@ <h1><i class="fa fa-user"></i><?=$Language->text('update_user')?></h1> -<p><?=$Language->template('update_user_desc')?></p> +<p><?=$Language->text('update_user_desc')?></p> <?=$HTML?>
\ No newline at end of file diff --git a/template/admin/lang/de.php b/template/admin/lang/de.php index f21df4b..ec79d0a 100644 --- a/template/admin/lang/de.php +++ b/template/admin/lang/de.php @@ -4,7 +4,7 @@ #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# # # # This file contains template internationalization strings for the DE language # -# and is completely independent from the core internationalization strings. # +# and can also overwrite the existing core internationalization strings. # # # #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# diff --git a/template/admin/lang/en.php b/template/admin/lang/en.php index 707041a..d5c189a 100644 --- a/template/admin/lang/en.php +++ b/template/admin/lang/en.php @@ -4,7 +4,7 @@ #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# # # # This file contains template internationalization strings for the EN language # -# and is completely independent from the core internationalization strings. # +# and can also overwrite the existing core internationalization strings. # # # #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# diff --git a/template/standard/html/403.php b/template/standard/html/403.php index 5039678..092988e 100644 --- a/template/standard/html/403.php +++ b/template/standard/html/403.php @@ -7,5 +7,5 @@ # # #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# ?> -<h1><i class="fa fa-exclamation-triangle"></i><?=$Language->template('403_heading_text')?></h1> -<p><?=$Language->template('403_heading_desc')?></p>
\ No newline at end of file +<h1><i class="fa fa-exclamation-triangle"></i><?=$Language->text('403_heading_text')?></h1> +<p><?=$Language->text('403_heading_desc')?></p>
\ No newline at end of file diff --git a/template/standard/html/404.php b/template/standard/html/404.php index acb7ab9..a45eecc 100644 --- a/template/standard/html/404.php +++ b/template/standard/html/404.php @@ -7,5 +7,5 @@ # # #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# ?> -<h1><i class="fa fa-exclamation-triangle"></i><?=$Language->template('404_heading_text')?></h1> -<p><?=$Language->template('404_heading_desc')?></p>
\ No newline at end of file +<h1><i class="fa fa-exclamation-triangle"></i><?=$Language->text('404_heading_text')?></h1> +<p><?=$Language->text('404_heading_desc')?></p>
\ No newline at end of file diff --git a/template/standard/html/home.php b/template/standard/html/home.php index 64206e9..e516204 100644 --- a/template/standard/html/home.php +++ b/template/standard/html/home.php @@ -7,8 +7,8 @@ # # #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# ?> -<h1><i class="fa fa-home"></i><?=$Language->template('home_heading_text', escapeHTML(Application::get('BLOGMETA.NAME')))?><span class="head-link brackets"><i class="fa fa-rss"></i><a href="<?=Application::getURL('feed/')?>" title="<?=$Language->text('feed_name_items', escapeHTML($BLOGMETA['NAME']))?>">Feed</a></span></h1> -<p><?=$Language->template('home_heading_desc', Application::get('POST.LIST_SIZE'))?></p> +<h1><i class="fa fa-home"></i><?=$Language->text('home_heading_text', escapeHTML(Application::get('BLOGMETA.NAME')))?><span class="head-link brackets"><i class="fa fa-rss"></i><a href="<?=Application::getURL('feed/')?>" title="<?=$Language->text('feed_name_items', escapeHTML($BLOGMETA['NAME']))?>">Feed</a></span></h1> +<p><?=$Language->text('home_heading_desc', Application::get('POST.LIST_SIZE'))?></p> <ul class="item-list post"> <?php foreach($LIST['POSTS'] as $post): ?> diff --git a/template/standard/html/main.php b/template/standard/html/main.php index 4572422..12364e5 100644 --- a/template/standard/html/main.php +++ b/template/standard/html/main.php @@ -64,8 +64,8 @@ $BLOGMETA_DESC = escapeHTML($BLOGMETA['DESC']); <input type="checkbox" id="toogle-nav" /> <ul> <li> - <a href="<?=Application::getURL()?>" title="<?=$Language->template('navigation_home_desc', $BLOGMETA_NAME)?>"> - <i class="fa fa-home"></i><?=$Language->template('navigation_home_text')?> + <a href="<?=Application::getURL()?>" title="<?=$Language->text('navigation_home_desc', $BLOGMETA_NAME)?>"> + <i class="fa fa-home"></i><?=$Language->text('navigation_home_text')?> </a> </li> <li> @@ -84,8 +84,8 @@ $BLOGMETA_DESC = escapeHTML($BLOGMETA['DESC']); </a> </li> <li> - <a href="<?=Application::getURL('search/')?>" title="<?=$Language->template('navigation_search_desc')?>"> - <i class="fa fa-search"></i><?=$Language->template('navigation_search_text')?> + <a href="<?=Application::getURL('search/')?>" title="<?=$Language->text('navigation_search_desc')?>"> + <i class="fa fa-search"></i><?=$Language->text('navigation_search_text')?> </a> </li> </ul> diff --git a/template/standard/html/page/item.php b/template/standard/html/page/item.php index 6065354..3199a39 100644 --- a/template/standard/html/page/item.php +++ b/template/standard/html/page/item.php @@ -11,7 +11,7 @@ <header> <h2> <a href="<?=$PAGE['URL']?>"><?=escapeHTML($PAGE['ATTR']['NAME'])?></a> - <time class="brackets info" datetime="<?=$PAGE['ATTR']['TIME_INSERT']?>"><?=parseDatetime($PAGE['ATTR']['TIME_INSERT'], $Language->template('date_format'))?></time> + <time class="brackets info" datetime="<?=$PAGE['ATTR']['TIME_INSERT']?>"><?=parseDatetime($PAGE['ATTR']['TIME_INSERT'], $Language->text('date_format'))?></time> </h2> </header> <blockquote cite="<?=$PAGE['URL']?>"> diff --git a/template/standard/html/page/list.php b/template/standard/html/page/list.php index 2bc71a4..da75330 100644 --- a/template/standard/html/page/list.php +++ b/template/standard/html/page/list.php @@ -8,7 +8,7 @@ #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# ?> <h1><i class="fa fa-file-text-o"></i><?=$Language->text('page_overview')?><span class="head-link brackets"><i class="fa fa-rss"></i><a href="<?=Application::getURL('feed/page/')?>" title="<?=$Language->text('feed_name_pages', escapeHTML($BLOGMETA['NAME']))?>">Feed</a></span></h1> -<p><?=$Language->template('page_overview_heading_desc', $PAGINATION['THIS'])?></p> +<p><?=$Language->text('page_overview_heading_desc', $PAGINATION['THIS'])?></p> <ul class="item-list page"> <?php foreach($LIST['PAGES'] as $page): ?> diff --git a/template/standard/html/page/main.php b/template/standard/html/page/main.php index 3b62571..cfe26fd 100644 --- a/template/standard/html/page/main.php +++ b/template/standard/html/page/main.php @@ -8,10 +8,10 @@ #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# $user = "<a href=\"{$USER['URL']}\" title=\"alias »{$USER['ATTR']['USERNAME']}«\">{$USER['ATTR']['FULLNAME']}</a>"; -$time = "<time datetime=\"{$PAGE['ATTR']['TIME_INSERT']}\" title=\"".parseDatetime($PAGE['ATTR']['TIME_INSERT'], '[W]')."\">".parseDatetime($PAGE['ATTR']['TIME_INSERT'], $Language->template('date_format'))."</time>"; +$time = "<time datetime=\"{$PAGE['ATTR']['TIME_INSERT']}\" title=\"".parseDatetime($PAGE['ATTR']['TIME_INSERT'], '[W]')."\">".parseDatetime($PAGE['ATTR']['TIME_INSERT'], $Language->text('date_format'))."</time>"; ?> <h1><i class="fa fa-file-text-o"></i><?=escapeHTML($PAGE['ATTR']['NAME'])?></h1> -<p><?=$Language->template('page_main_heading_desc', [$user, $time])?></p> +<p><?=$Language->text('page_main_heading_desc', [$user, $time])?></p> <section id="content" class="page"> <?=$PAGE['BODY']['HTML']()?> diff --git a/template/standard/html/post/item.php b/template/standard/html/post/item.php index 19ff3f9..f606840 100644 --- a/template/standard/html/post/item.php +++ b/template/standard/html/post/item.php @@ -11,7 +11,7 @@ <header> <h2> <a href="<?=$POST['URL']?>"><?=escapeHTML($POST['ATTR']['NAME'])?></a> - <time class="brackets info" datetime="<?=$POST['ATTR']['TIME_INSERT']?>"><?=parseDatetime($POST['ATTR']['TIME_INSERT'], $Language->template('date_format'))?></time> + <time class="brackets info" datetime="<?=$POST['ATTR']['TIME_INSERT']?>"><?=parseDatetime($POST['ATTR']['TIME_INSERT'], $Language->text('date_format'))?></time> </h2> </header> <blockquote cite="<?=$POST['URL']?>"> diff --git a/template/standard/html/post/list.php b/template/standard/html/post/list.php index 24e4020..adb4fd6 100644 --- a/template/standard/html/post/list.php +++ b/template/standard/html/post/list.php @@ -8,7 +8,7 @@ #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# ?> <h1><i class="fa fa-newspaper-o"></i><?=$Language->text('post_overview')?><span class="head-link brackets"><i class="fa fa-rss"></i><a href="<?=Application::getURL('feed/post/')?>" title="<?=$Language->text('feed_name_posts', escapeHTML($BLOGMETA['NAME']))?>">Feed</a></span></h1> -<p><?=$Language->template('post_overview_heading_desc', $PAGINATION['THIS'])?></p> +<p><?=$Language->text('post_overview_heading_desc', $PAGINATION['THIS'])?></p> <ul class="item-list post"> <?php foreach($LIST['POSTS'] as $post): ?> diff --git a/template/standard/html/post/main.php b/template/standard/html/post/main.php index 22974dc..709e719 100644 --- a/template/standard/html/post/main.php +++ b/template/standard/html/post/main.php @@ -8,10 +8,10 @@ #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# $user = "<a href=\"{$USER['URL']}\" title=\"alias »{$USER['ATTR']['USERNAME']}«\">{$USER['ATTR']['FULLNAME']}</a>"; -$time = "<time datetime=\"{$POST['ATTR']['TIME_INSERT']}\" title=\"".parseDatetime($POST['ATTR']['TIME_INSERT'], '[W]')."\">".parseDatetime($POST['ATTR']['TIME_INSERT'], $Language->template('date_format'))."</time>"; +$time = "<time datetime=\"{$POST['ATTR']['TIME_INSERT']}\" title=\"".parseDatetime($POST['ATTR']['TIME_INSERT'], '[W]')."\">".parseDatetime($POST['ATTR']['TIME_INSERT'], $Language->text('date_format'))."</time>"; ?> <h1><i class="fa fa-newspaper-o"></i><?=escapeHTML($POST['ATTR']['NAME'])?></h1> -<p><?=$Language->template('post_main_heading_desc', [$user, $time])?></p> +<p><?=$Language->text('post_main_heading_desc', [$user, $time])?></p> <section id="content" class="post"> <?=$POST['BODY']['HTML']()?> diff --git a/template/standard/html/search/main.php b/template/standard/html/search/main.php index 39d251d..61bd6a5 100644 --- a/template/standard/html/search/main.php +++ b/template/standard/html/search/main.php @@ -1,12 +1,12 @@ -<h1><i class="fa fa-search"></i><?=$Language->template('search_base_heading_text')?></h1> -<p><?=$Language->template('search_base_heading_desc')?></p> +<h1><i class="fa fa-search"></i><?=$Language->text('search_base_heading_text')?></h1> +<p><?=$Language->text('search_base_heading_desc')?></p> <?php if($SEARCH['INFO']): ?> <div class="red"><?=$SEARCH['INFO']?></div> <?php endif; ?> <form action="" method="GET"> - <input autofocus type="search" name="q" placeholder="<?=$Language->template('search_form_placeholder')?>" value="<?=escapeHTML($SEARCH['TEXT'])?>" /> + <input autofocus type="search" name="q" placeholder="<?=$Language->text('search_form_placeholder')?>" value="<?=escapeHTML($SEARCH['TEXT'])?>" /> <select name="d"> <option value=""><?=$Language->text('date_d')?></option> diff --git a/template/standard/html/search/result.php b/template/standard/html/search/result.php index c07dec9..1558c3c 100644 --- a/template/standard/html/search/result.php +++ b/template/standard/html/search/result.php @@ -1,8 +1,8 @@ -<h1><?=$Language->template('search_result_heading_text', escapeHTML($SEARCH['TEXT']))?></h1> -<p><?=$Language->template('search_result_heading_desc')?></p> +<h1><?=$Language->text('search_result_heading_text', escapeHTML($SEARCH['TEXT']))?></h1> +<p><?=$Language->text('search_result_heading_desc')?></p> <form action="" method="GET"> - <input autofocus type="search" name="q" placeholder="<?=$Language->template('search_form_placeholder')?>" value="<?=escapeHTML($SEARCH['TEXT'])?>" /> + <input autofocus type="search" name="q" placeholder="<?=$Language->text('search_form_placeholder')?>" value="<?=escapeHTML($SEARCH['TEXT'])?>" /> <select name="d"> <option value=""><?=$Language->text('date_d')?></option> diff --git a/template/standard/html/user/list.php b/template/standard/html/user/list.php index 5c8f6a6..d95bd0c 100644 --- a/template/standard/html/user/list.php +++ b/template/standard/html/user/list.php @@ -8,7 +8,7 @@ #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# ?> <h1><i class="fa fa-user"></i><?=$Language->text('user_overview')?></h1> -<p><?=$Language->template('user_overview_heading_desc', $PAGINATION['THIS'])?></p> +<p><?=$Language->text('user_overview_heading_desc', $PAGINATION['THIS'])?></p> <ul class="item-list user"> <?php foreach($LIST['USERS'] as $user): ?> diff --git a/template/standard/html/user/main.php b/template/standard/html/user/main.php index 473b00b..2a195a4 100644 --- a/template/standard/html/user/main.php +++ b/template/standard/html/user/main.php @@ -8,7 +8,7 @@ #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# ?> <h1><i class="fa fa-user"></i><?=escapeHTML($USER['ATTR']['FULLNAME'])?></h1> -<p><em><?=$Language->template('user_main_heading_desc', [escapeHTML($USER['ATTR']['USERNAME']), $COUNT['POST'], $COUNT['PAGE']])?></em></p> +<p><em><?=$Language->text('user_main_heading_desc', [escapeHTML($USER['ATTR']['USERNAME']), $COUNT['POST'], $COUNT['PAGE']])?></em></p> <section id="content" class="user"> <?=$USER['BODY']['HTML']()?> diff --git a/template/standard/lang/de.php b/template/standard/lang/de.php index fa8544f..2c5008e 100644 --- a/template/standard/lang/de.php +++ b/template/standard/lang/de.php @@ -4,7 +4,7 @@ #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# # # # This file contains template internationalization strings for the DE language # -# and is completely independent from the core internationalization strings. # +# and can also overwrite the existing core internationalization strings. # # # #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# diff --git a/template/standard/lang/en.php b/template/standard/lang/en.php index 6afef98..3d42fe0 100644 --- a/template/standard/lang/en.php +++ b/template/standard/lang/en.php @@ -4,7 +4,7 @@ #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# # # # This file contains template internationalization strings for the EN language # -# and is completely independent from the core internationalization strings. # +# and can also overwrite the existing core internationalization strings. # # # #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# |