From a9684792106e4de3aa622d33a0ed7780cbd67ad0 Mon Sep 17 00:00:00 2001 From: Thomas Lange 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/standard/html/403.php | 4 ++-- template/standard/html/404.php | 4 ++-- template/standard/html/home.php | 4 ++-- template/standard/html/main.php | 8 ++++---- template/standard/html/page/item.php | 2 +- template/standard/html/page/list.php | 2 +- template/standard/html/page/main.php | 4 ++-- template/standard/html/post/item.php | 2 +- template/standard/html/post/list.php | 2 +- template/standard/html/post/main.php | 4 ++-- template/standard/html/search/main.php | 6 +++--- template/standard/html/search/result.php | 6 +++--- template/standard/html/user/list.php | 2 +- template/standard/html/user/main.php | 2 +- template/standard/lang/de.php | 2 +- template/standard/lang/en.php | 2 +- 16 files changed, 28 insertions(+), 28 deletions(-) (limited to 'template/standard') 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 @@ # # #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# ?> -

template('403_heading_text')?>

-

template('403_heading_desc')?>

\ No newline at end of file +

text('403_heading_text')?>

+

text('403_heading_desc')?>

\ 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 @@ # # #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# ?> -

template('404_heading_text')?>

-

template('404_heading_desc')?>

\ No newline at end of file +

text('404_heading_text')?>

+

text('404_heading_desc')?>

\ 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 @@ # # #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# ?> -

template('home_heading_text', escapeHTML(Application::get('BLOGMETA.NAME')))?>Feed

-

template('home_heading_desc', Application::get('POST.LIST_SIZE'))?>

+

text('home_heading_text', escapeHTML(Application::get('BLOGMETA.NAME')))?>Feed

+

text('home_heading_desc', Application::get('POST.LIST_SIZE'))?>