Several changes have been made in this commit, which together with the previous commits result in version 2.3:v2.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

3 files changed, 4 insertions, 4 deletions

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']()?>