From a9684792106e4de3aa622d33a0ed7780cbd67ad0 Mon Sep 17 00:00:00 2001
From: Thomas Lange <code@nerdmind.de>
Date: Fri, 11 Aug 2017 03:24:07 +0200
Subject: Several changes have been made in this commit, which together with
 the previous commits result in version 2.3:

+ Optimization: Originally, the core and template languages were completely separated in the logic of the Language class and you had to use "$Language->text()" to get a core language string and "$Language->template()" to get a template language string. Since this commit, the core and template language strings are still located in different files, but you now have to use "$Language->text()" for core and template language strings both. Thus, you can now even overwrite a core language string from the language file of a template if the core language string does not satisfy you.

+ Deprecated: The method "$Language->template()" was marked as deprecated and will be removed in further versions (currently, it's just an alias for "$Language->text()").

Template upgrade to version 2.3 (only for customized templates):
SEARCH:  $Language->template
REPLACE: $Language->text
---
 template/admin/html/post/delete.php |  2 +-
 template/admin/html/post/form.php   | 30 +++++++++++++++---------------
 template/admin/html/post/index.php  |  2 +-
 template/admin/html/post/insert.php |  2 +-
 template/admin/html/post/item.php   |  2 +-
 template/admin/html/post/update.php |  2 +-
 6 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'template/admin/html/post')

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
-- 
cgit v1.2.3