About us - Diff from 2.0.4 to 2.0.5

diff-about-us-v2.0.4-v2.0.5.diff

diff --git a/README.md b/README.md
index c868d16..6515969 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ Author: Christian Schnegelberger
 
 URL: http://www.crizzo.de
 
-Version: v2.0.4 
+Version: v2.0.5
 
 ## Install instructions:
 1. Download the extension
@@ -19,4 +19,10 @@ Version: v2.0.4
 2. Delete all files of the extension from phpBB/ext/crizzo/aboutus
 3. Upload all the new files to the same locations
 4. Go to you phpBB-Board > Admin Control Panel > Customise > Manage extensions > About us: enable
-5. Purge the board cache
\ No newline at end of file
+5. Purge the board cache
+
+## Automated Testing
+
+We use automated unit tests to prevent regressions. Check out our travis build below:
+
+2.0.x: [![Build Status](https://travis-ci.org/Crizz0/phpbb3-about-us.png?branch=version2_0)](https://travis-ci.org/Crizz0/phpbb3-about-us/)
\ No newline at end of file
diff --git a/acp/acp_aboutus_info.php b/acp/acp_aboutus_info.php
index 7ac9dd3..7cf86e7 100644
--- a/acp/acp_aboutus_info.php
+++ b/acp/acp_aboutus_info.php
@@ -17,7 +17,7 @@ class acp_aboutus_info
 		return array(
 			'filename'	=> '\crizzo\aboutus\acp\acp_aboutus_module',
 			'title'		=> 'ACP_ABOUTUS_SETTINGS',
-			'version'	=> '2.0.4',
+			'version'	=> '2.0.5',
 			'modes'		=> array(
 			'config_aboutus'	=> array('title' => 'ACP_ABOUTUS_SETTINGS', 'auth' => 'ext_crizzo/aboutus && acl_a_board', 'cat' => array('ACP_ABOUTUS_SETTINGS')),
 			),
diff --git a/acp/acp_aboutus_module.php b/acp/acp_aboutus_module.php
index 6314c17..db158df 100644
--- a/acp/acp_aboutus_module.php
+++ b/acp/acp_aboutus_module.php
@@ -25,22 +25,22 @@ class acp_aboutus_module
 	public function main($id, $mode)
 	{
 		global $user, $request, $template;
-		global $config, $phpbb_root_path, $phpEx, $phpbb_container; 
-		
+		global $config, $phpbb_root_path, $phpEx, $phpbb_container;
+
 		$user->add_lang(array('acp/board', 'posting'));
-		
+
 		$this->tpl_name = 'acp_aboutus';
 		$this->page_title = 'ABOUTUS_SETTINGS';
-		
+
 		$form_name = 'ABOUTUS_setting';
 		add_form_key($form_name);
 		$error = '';
-		
+
 		if (!function_exists('display_custom_bbcodes'))
 		{
 			include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
 		}
-		
+
 		if (!class_exists('parse_message'))
 		{
 			include($phpbb_root_path . 'includes/message_parser.' . $phpEx);
@@ -52,12 +52,12 @@ class acp_aboutus_module
 		'aboutus_info_bitfield',
 		'aboutus_info_flags',
 		));
-		
+
 		$aboutus_info	= $aboutus_data['aboutus_info'];
 		$aboutus_info_uid	= $aboutus_data['aboutus_info_uid'];
 		$aboutus_info_bitfield= $aboutus_data['aboutus_info_bitfield'];
 		$aboutus_info_flags	= $aboutus_data['aboutus_info_flags'];
-		
+
 		if ($request->is_set_post('submit') || $request->is_set_post('preview'))
 		{
 			if (!check_form_key($form_name))
@@ -89,15 +89,15 @@ class acp_aboutus_module
 				trigger_error($user->lang['ABOUTUS_UPDATED'] . adm_back_link($this->u_action));
 			}
 		}
-		
+
 		$aboutus_info_preview = '';
-		
+
 		if ($request->is_set_post('preview'))
 		{
 			$aboutus_info_preview = generate_text_for_display($aboutus_info, $aboutus_info_uid, $aboutus_info_bitfield, $aboutus_info_flags);
 		}
 		$aboutus_edit = generate_text_for_edit($aboutus_info, $aboutus_info_uid, $aboutus_info_flags);
-		
+
 		$template->assign_vars(array(
 			'ERRORS'						=> $error,
 			'ACP_ABOUTUS_INFO'				=> $aboutus_edit['text'],
diff --git a/adm/style/acp_aboutus.html b/adm/style/acp_aboutus.html
index 8158b0d..4a902c8 100644
--- a/adm/style/acp_aboutus.html
+++ b/adm/style/acp_aboutus.html
@@ -1,4 +1,4 @@
-<!-- INCLUDE overall_header.html -->
+{% include 'overall_header.html' %}
 
 <script type="text/javascript">
 	// <![CDATA[
@@ -14,77 +14,77 @@
 
 <a id="maincontent"></a>
 
-<h1>{L_ACP_ABOUTUS_SETTINGS}</h1>
+<h1>{{ lang('ACP_ABOUTUS_SETTINGS') }}</h1>
 
-<p>{L_ACP_ABOUTUS_SETTINGS_EXPLAIN}</p>
+<p>{{ lang('ACP_ABOUTUS_SETTINGS_EXPLAIN') }}</p>
 
-<form id="acp_aboutus" method="post" action="{U_ACTION}">
-	<!-- IF ACP_ABOUTUS_INFO_PREVIEW -->
+<form id="acp_aboutus" method="post" action="{{ U_ACTION }}">
+	{% if ACP_ABOUTUS_INFO_PREVIEW %}
 	<fieldset>
-		<legend>{L_ACP_ABOUTUS_INFO_PREVIEW}</legend>
-		<p>{ACP_ABOUTUS_INFO_PREVIEW}</p>
+		<legend>{{ lang('ACP_ABOUTUS_INFO_PREVIEW') }}</legend>
+		<p>{{ ACP_ABOUTUS_INFO_PREVIEW }}</p>
 	</fieldset>
-	<!-- ENDIF -->
+	{% endif %}
 
 	<fieldset>
-		<legend>{L_ACP_ABOUTUS_INFO}</legend>
-		<p>{L_ACP_ABOUTUS_INFO_EXPLAIN}</p>
+		<legend>{{ lang('ACP_ABOUTUS_INFO') }}</legend>
+		<p>{{ lang('ACP_ABOUTUS_INFO_EXPLAIN') }}</p>
 
-		<!-- INCLUDE acp_posting_buttons.html -->
+		{% include 'acp_posting_buttons.html' %}
 
 		<dl class="responsive-columns">
 			<dt style="width: 90px;" id="color_palette_placeholder" data-orientation="v" data-height="12" data-width="15" data-bbcode="true">
 			</dt>
 
-			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px;">
-				<textarea name="aboutus_info" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" data-bbcode="true">{ACP_ABOUTUS_INFO}</textarea>
+			<dd style="margin-{{ S_CONTENT_FLOW_BEGIN }}: 90px;">
+				<textarea name="aboutus_info" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" data-bbcode="true">{{ ACP_ABOUTUS_INFO }}</textarea>
 			</dd>
 
 			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 5px;">
-				<!-- IF S_BBCODE_ALLOWED -->
-				<label><input type="checkbox" class="radio" name="disable_bbcode"<!-- IF S_BBCODE_DISABLE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_DISABLE_BBCODE}</label>
-				<!-- ENDIF -->
-				<!-- IF S_SMILIES_ALLOWED -->
-				<label><input type="checkbox" class="radio" name="disable_smilies"<!-- IF S_SMILIES_DISABLE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_DISABLE_SMILIES}</label>
-				<!-- ENDIF -->
-				<!-- IF S_LINKS_ALLOWED -->
-				<label><input type="checkbox" class="radio" name="disable_magic_url"<!-- IF S_MAGIC_URL_DISABLE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_DISABLE_MAGIC_URL}</label>
-				<!-- ENDIF -->
+				{% if S_BBCODE_ALLOWED %}
+				<label><input type="checkbox" class="radio" name="disable_bbcode"{% if S_BBCODE_DISABLE_CHECKED %} checked="checked"{% endif %} /> {{ lang('DISABLE_BBCODE') }}</label>
+				{% endif %}
+				{% if S_SMILIES_ALLOWED %}
+				<label><input type="checkbox" class="radio" name="disable_smilies"{% if S_SMILIES_DISABLE_CHECKED %} checked="checked"{% endif %} /> {{ lang('DISABLE_SMILIES') }}</label>
+				{% endif %}
+				{% if S_LINKS_ALLOWED %}
+				<label><input type="checkbox" class="radio" name="disable_magic_url"{% if S_MAGIC_URL_DISABLE_CHECKED %} checked="checked"{% endif %} /> {{ lang('DISABLE_MAGIC_URL') }}</label>
+				{% endif %}
 			</dd>
-			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 10px;"><strong>{L_OPTIONS}{L_COLON} </strong>{BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS}</dd>
+			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 10px;"><strong>{{ lang('OPTIONS') }}{{ lang('COLON') }} </strong>{{ BBCODE_STATUS }} :: {{ IMG_STATUS }} :: {{ FLASH_STATUS }} :: {{ URL_STATUS }} :: {{ SMILIES_STATUS }}</dd>
 		</dl>
 	</fieldset>
 
 	<fieldset>
-		<legend>{L_GENERAL_OPTIONS}</legend>
+		<legend>{{ lang('GENERAL_OPTIONS') }}</legend>
 		<dl>
-			<dt><label for="acp_aboutus_termsofuse_enable">{L_ACP_TERMS_OF_USE_ENABLE}{L_COLON}</label><br /><span>{L_ACP_TERMS_OF_USE_ENABLE_EXPLAIN}</span></dt>
+			<dt><label for="acp_aboutus_termsofuse_enable">{{ lang('ACP_TERMS_OF_USE_ENABLE') }}{{ lang('COLON') }}</label><br /><span>{{ lang('ACP_TERMS_OF_USE_ENABLE_EXPLAIN') }}</span></dt>
 			<dd>
-				<label><input type="radio" class="radio" id="acp_aboutus_termsofuse_enable" name="acp_aboutus_termsofuse_enable" value="1"<!-- IF TERMS_OF_USE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="acp_aboutus_termsofuse_enable" value="0"<!-- IF not TERMS_OF_USE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+				<label><input type="radio" class="radio" id="acp_aboutus_termsofuse_enable" name="acp_aboutus_termsofuse_enable" value="1"{% if TERMS_OF_USE %} checked="checked"{% endif %} /> {{ lang('YES') }}</label>
+				<label><input type="radio" class="radio" name="acp_aboutus_termsofuse_enable" value="0"{% if not TERMS_OF_USE %} checked="checked"{% endif %} /> {{ lang('NO') }}</label>
 			</dd>
 		</dl>
 		<dl>
-			<dt><label for="acp_aboutus_privacy_enable">{L_ACP_PRIVACY_ENABLE}{L_COLON}</label><br /><span>{L_ACP_PRIVACY_ENABLE_EXPLAIN}</span></dt>
+			<dt><label for="acp_aboutus_privacy_enable">{{ lang('ACP_PRIVACY_ENABLE') }}{{ lang('COLON') }}</label><br /><span>{{ lang('ACP_PRIVACY_ENABLE_EXPLAIN') }}</span></dt>
 			<dd>
-				<label><input type="radio" class="radio" id="acp_aboutus_privacy_enable" name="acp_aboutus_privacy_enable" value="1"<!-- IF PRIVACY --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="acp_aboutus_privacy_enable" value="0"<!-- IF not PRIVACY --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+				<label><input type="radio" class="radio" id="acp_aboutus_privacy_enable" name="acp_aboutus_privacy_enable" value="1"{% if PRIVACY %} checked="checked"{% endif %} /> {{ lang('YES') }}</label>
+				<label><input type="radio" class="radio" name="acp_aboutus_privacy_enable" value="0"{% if not PRIVACY %} checked="checked"{% endif %} /> {{ lang('NO') }}</label>
 			</dd>
 		</dl>
 		<dl>
-			<dt><label for="acp_aboutus_enable">{L_ACP_ABOUTUS_ENABLE}{L_COLON}</label><br /><span>{L_ACP_ABOUTUS_ENABLE_EXPLAIN}</span></dt>
+			<dt><label for="acp_aboutus_enable">{{ lang('ACP_ABOUTUS_ENABLE') }}{{ lang('COLON') }}</label><br /><span>{{ lang('ACP_ABOUTUS_ENABLE_EXPLAIN') }}</span></dt>
 			<dd>
-				<label><input type="radio" class="radio" id="acp_abouts_enable" name="acp_aboutus_enable" value="1"<!-- IF ABOUTUS_ENABLE -->checked="checked"<!-- ENDIF --> /> {L_YES} </label>
-				<label><input type="radio" class="radio" name="acp_aboutus_enable" value="0"<!-- IF not ABOUTUS_ENABLE -->checked="checked"<!-- ENDIF --> /> {L_NO} </label>
+				<label><input type="radio" class="radio" id="acp_aboutus_enable" name="acp_aboutus_enable" value="1"{% if ABOUTUS_ENABLE %}checked="checked"{% endif %} /> {{ lang('YES') }} </label>
+				<label><input type="radio" class="radio" name="acp_aboutus_enable" value="0"{% if not ABOUTUS_ENABLE %}checked="checked"{% endif %} /> {{ lang('NO') }} </label>
 			</dd>
 		</dl>
 	</fieldset>
 
 	<fieldset class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="submit" name="preview" value="{L_PREVIEW}" />
-		{S_FORM_TOKEN}
+		<input class="button1" type="submit" id="submit" name="submit" value="{{ lang('SUBMIT') }}" />&nbsp;
+		<input class="button2" type="submit" name="preview" value="{{ lang('PREVIEW') }}" />
+		{{ S_FORM_TOKEN }}
 	</fieldset>
 </form>
 
-<!-- INCLUDE overall_footer.html -->
+{% include 'overall_footer.html' %}
diff --git a/composer.json b/composer.json
index 48aef96..9960330 100644
--- a/composer.json
+++ b/composer.json
@@ -3,12 +3,11 @@
 	"type": "phpbb-extension",
 	"description": "About us is an extension which adds to phpBB 3.1 a about us or legal notice-page, where you can add your contact details and more.",
 	"homepage": "https://github.com/Crizz0/phpbb3-about-us",
-	"version": "2.0.4",
-	"time": "2015-10-23",
+	"version": "2.0.5",
+	"time": "2017-09-30",
 	"license": "GPL-2.0",
 	"authors": [{
 			"name": "Christian Schnegelberger",
-			"username": "Crizzo",
 			"email": "kontakt@crizzo.de",
 			"homepage": "http://www.crizzo.de",
 			"role": "Developer/Founder"
@@ -16,10 +15,13 @@
 	"require": {
 		"php": ">=5.3.3"
 	},
+	"require-dev": {
+		"phpbb/translation-validator": "1.3.*"
+	},
 	"extra": {
 		"display-name": "About us",
 		"soft-require": {
-			"phpbb/phpbb": ">=3.1.2"
+			"phpbb/phpbb": ">=3.1.2,<3.2@dev"
 		},
 		"version-check": {
 			"host": "www.crizzo.de",
diff --git a/config/services.yml b/config/services.yml
index 6e40225..eee4d9d 100644
--- a/config/services.yml
+++ b/config/services.yml
@@ -7,7 +7,6 @@ services:
             - @controller.helper
             - @template
             - @user
-            - %core.php_ext%
     crizzo.aboutus.listener:
         class: crizzo\aboutus\event\main_listener
         arguments:
diff --git a/controller/main.php b/controller/main.php
index a9a333d..c5088aa 100644
--- a/controller/main.php
+++ b/controller/main.php
@@ -2,7 +2,7 @@
 /**
 *
 * About us extension for the phpBB Forum Software package.
-* 
+*
 * @copyright (c) 2014-2015 Crizzo <http://www.crizzo.de>
 * @license GNU General Public License, version 2 (GPL-2.0)
 *
@@ -31,8 +31,6 @@ class main
 	/* @var \phpbb\user */
 	protected $user;
 
-	/* @var string phpEx */
-	protected $php_ext;
 	/**
 	* Constructor
 	*
@@ -41,15 +39,13 @@ class main
 	* @param \phpbb\controller\helper	$helper
 	* @param \phpbb\template\template	$template
 	* @param \phpbb\user				$user
-	* @param string						$php_ext	phpEx
 	*/
-	public function __construct(\phpbb\config\config $config, \phpbb\config\db_text $config_text, \phpbb\controller\helper $helper, \phpbb\template\template $template, \phpbb\user $user, $php_ext)
+	public function __construct(\phpbb\config\config $config, \phpbb\config\db_text $config_text, \phpbb\controller\helper $helper, \phpbb\template\template $template, \phpbb\user $user)
 	{
 		$this->config 	= $config;
 		$this->helper 	= $helper;
 		$this->template = $template;
 		$this->user 	= $user;
-		$this->php_ext 	= $php_ext;
 		$this->config_text = $config_text;
 	}
 
@@ -65,7 +61,7 @@ class main
 			'FORUM_NAME'		=> $this->user->lang['ABOUTUS'],
 			'U_VIEW_FORUM'		=> $this->helper->route('crizzo_aboutus'),
 		));
-		
+
 		$aboutus_data			= $this->config_text->get_array(array(
 				'aboutus_info',
 				'aboutus_info_uid',
@@ -94,5 +90,4 @@ class main
 	{
 		redirect($this->helper->route('crizzo_aboutus'));
 	}
-
-}
\ No newline at end of file
+}
diff --git a/event/main_listener.php b/event/main_listener.php
index ae37ce1..aae9871 100644
--- a/event/main_listener.php
+++ b/event/main_listener.php
@@ -60,7 +60,7 @@ class main_listener implements EventSubscriberInterface
 	}
 
 	public function load_language_on_setup($event)
-	{	
+	{
 		$lang_set_ext = $event['lang_set_ext'];
 		$lang_set_ext[] = array(
 			'ext_name' => 'crizzo/aboutus',
diff --git a/ext.php b/ext.php
deleted file mode 100644
index c6dc44d..0000000
--- a/ext.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
-*
-* About us extension for the phpBB Forum Software package.
-*
-* @copyright (c) 2014-2015 Crizzo <http://www.crizzo.de>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-*/
-
-namespace crizzo\aboutus;
-
-/**
-* @ignore
-*/
-
-class ext extends \phpbb\extension\base
-{
-}
diff --git a/language/ar/common.php b/language/ar/common.php
index f52c13b..63575fb 100644
--- a/language/ar/common.php
+++ b/language/ar/common.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* About us extension for the phpBB Forum Software package. 
+* About us extension for the phpBB Forum Software package.
 * Arabic - Translated By : Basil Taha Alhitary - www.alhitary.net
 *
 * @copyright (c) 2014-2015 Crizzo <http://www.crizzo.de>
diff --git a/language/et/common.php b/language/et/common.php
index f02a679..34a8ab5 100644
--- a/language/et/common.php
+++ b/language/et/common.php
@@ -44,8 +44,8 @@ $lang = array_merge($lang, array(
 	'ABOUTUS_UPDATED'				=> 'Lehekülg “Meist” on edukalt uuendatud.',
 	'ABOUTUS_AND'					=> 'ja',
 
- 	'ACP_ABOUTUS_ENABLE'			=> 'Luba näidata lehekülge “Meist”', 
- 	'ACP_ABOUTUS_ENABLE_EXPLAIN'	=> 'Kui lehekülg “Meist” on keelatud, siis ei näidata jaluses linki antud leheküljele - ükskõik kas URLile “app.php/aboutus” saab ligi või mitte. ', 
+	'ACP_ABOUTUS_ENABLE'			=> 'Luba näidata lehekülge “Meist”',
+	'ACP_ABOUTUS_ENABLE_EXPLAIN'	=> 'Kui lehekülg “Meist” on keelatud, siis ei näidata jaluses linki antud leheküljele - ükskõik kas URLile “app.php/aboutus” saab ligi või mitte. ',
 	'ACP_ABOUTUS_INFO'				=> 'Lehekülje “Meist” tekst',
 	'ACP_ABOUTUS_INFO_EXPLAIN'		=> 'Siin sa saad muuta teksti mida näidatakse leheküljel “Meist”.',
 	'ACP_ABOUTUS_INFO_PREVIEW'		=> 'Lehekülje “Meist” eelvaade',
diff --git a/language/fr/common.php b/language/fr/common.php
index a626bfd..c45a284 100644
--- a/language/fr/common.php
+++ b/language/fr/common.php
@@ -45,7 +45,7 @@ $lang = array_merge($lang, array(
 	'ABOUTUS_AND'					=> 'et',
 
 	'ACP_ABOUTUS_ENABLE'			=> 'Activer l’extension « À propos »',
-	'ACP_ABOUTUS_ENABLE_EXPLAIN'	=> 'Si la page « À propos » est désactivée, son lien dans le pied de page ne sera pas affiché. Néanmoins, avec l’adresse URL « app.php/aboutus » ou « /aboutus » il sera possible de consulter cette page. ',
+	'ACP_ABOUTUS_ENABLE_EXPLAIN'	=> 'Si la page « À propos » est désactivée, son lien dans le pied de page ne sera pas affiché. Néanmoins, avec l’adresse URL « app.php/aboutus » ou « /aboutus » il sera possible de consulter cette page. ',
 	'ACP_ABOUTUS_INFO'				=> 'Texte de la page « À propos »',
 	'ACP_ABOUTUS_INFO_EXPLAIN'		=> 'Éditeur complet et aperçu du texte qui sera affiché sur la page « À propos ».',
 	'ACP_ABOUTUS_INFO_PREVIEW'		=> 'Aperçu de la page « À propos »',
diff --git a/language/tr/common.php b/language/tr/common.php
index e0cfe9f..9e05a24 100644
--- a/language/tr/common.php
+++ b/language/tr/common.php
@@ -43,7 +43,7 @@ $lang = array_merge($lang, array(
 	'ABOUTUS_SETTINGS'				=> 'Hakkımızda ayarları',
 	'ABOUTUS_UPDATED'				=> 'Hakkımızda başarıyla güncellendi.',
 	'ABOUTUS_AND'					=> 've',
-	
+
 	'ACP_ABOUTUS_ENABLE'			=> 'Hakkımızda sayfasını aktive et',
 	'ACP_ABOUTUS_ENABLE_EXPLAIN'	=> 'Eğer “Hakkımızda” sayfası kapatılırsa “Hakkımızda” sayfası linki sitenizin altında gösterilmeyecek. Ne var ki “app.php/aboutus” URLsi ile “Hakkımızda” sayfasına ulaşabilirsiniz. ',
 	'ACP_ABOUTUS_INFO'				=> 'Hakkımızda metni',
diff --git a/styles/prosilver/template/aboutus.html b/styles/prosilver/template/aboutus.html
index d1b68c6..e885bfe 100644
--- a/styles/prosilver/template/aboutus.html
+++ b/styles/prosilver/template/aboutus.html
@@ -1,25 +1,25 @@
-<!-- INCLUDE overall_header.html -->
+{% include 'overall_header.html' %}
 
-<h2>{L_ABOUTUS}</h2>
+<h2>{{ lang('ABOUTUS') }}</h2>
 
 <div class="panel aboutus">
 	<div class="inner">
 		<div class="content">
-		{ABOUTUS_OUTPUT}
+		{{ ABOUTUS_OUTPUT }}
 		</div>
-		<!-- IF TERMS_OF_USE or PRIVACY -->
-			<!-- IF TERMS_OF_USE and PRIVACY -->
-				<h2>{L_TERMS_USE} {L_ABOUTUS_AND} {L_PRIVACY}</h2>
-				<p>{L_DESCRIPTION_PRIVACY_TERMS_OF_USE} <a href="{U_TERMS_USE}">{L_TERMS_USE}</a> {L_ABOUTUS_AND} <a href="{U_PRIVACY}">{L_PRIVACY}</a></p>
-			<!-- ELSEIF PRIVACY -->
-				<h2>{L_PRIVACY}</h2>
-				<p>{L_DESCRIPTION_PRIVACY} <a href="{U_PRIVACY}">{L_PRIVACY}</a></p>
-			<!-- ELSEIF TERMS_OF_USE -->
-				<h2>{L_TERMS_USE}</h2>
-				<p>{L_DESCRIPTION_TERMS_OF_USE} <a href="{U_TERMS_USE}">{L_TERMS_USE}</a></p>
-			<!-- ENDIF -->
-		<!-- ENDIF -->
+		{% if TERMS_OF_USE or PRIVACY %}
+			{% if TERMS_OF_USE and PRIVACY %}
+				<h2>{{ lang('TERMS_USE') }} {{ lang('ABOUTUS_AND') }} {{ lang('PRIVACY') }}</h2>
+				<p>{{ lang('DESCRIPTION_PRIVACY_TERMS_OF_USE') }} <a href="{{ U_TERMS_USE }}">{{ lang('TERMS_USE') }}</a> {{ lang('ABOUTUS_AND') }} <a href="{{ U_PRIVACY }}">{{ lang('PRIVACY') }}</a></p>
+			{% elseif PRIVACY %}
+				<h2>{{ lang('PRIVACY') }}</h2>
+				<p>{{ lang('DESCRIPTION_PRIVACY') }} <a href="{{ U_PRIVACY }}">{{ lang('PRIVACY') }}</a></p>
+			{% elseif TERMS_OF_USE %}
+				<h2>{{ lang('TERMS_USE') }}</h2>
+				<p>{{ lang('DESCRIPTION_TERMS_OF_USE') }} <a href="{{ U_TERMS_USE }}">{{ lang('TERMS_USE') }}</a></p>
+			{% endif %}
+		{% endif %}
 	</div>
 </div>
 
-<!-- INCLUDE overall_footer.html -->
+{% include 'overall_footer.html' %}
diff --git a/styles/prosilver/template/event/overall_footer_teamlink_after.html b/styles/prosilver/template/event/overall_footer_teamlink_after.html
index 11e8c23..adc203d 100644
--- a/styles/prosilver/template/event/overall_footer_teamlink_after.html
+++ b/styles/prosilver/template/event/overall_footer_teamlink_after.html
@@ -1 +1 @@
-<!-- IF ABOUTUS_ENABLE --><li class="small-icon icon-team rightside" data-last-responsive="true"><a href="{U_ABOUTUS}">{L_ABOUTUS}</a></li><!-- ENDIF -->
\ No newline at end of file
+{% if ABOUTUS_ENABLE %}<li class="small-icon icon-team rightside" data-last-responsive="true"><a href="{{ U_ABOUTUS }}">{{ lang('ABOUTUS') }}</a></li>{% endif %}
diff --git a/styles/prosilver/template/event/overall_header_head_append.html b/styles/prosilver/template/event/overall_header_head_append.html
index e092271..24de345 100644
--- a/styles/prosilver/template/event/overall_header_head_append.html
+++ b/styles/prosilver/template/event/overall_header_head_append.html
@@ -1 +1 @@
-<!-- INCLUDECSS @crizzo_aboutus/aboutus.css -->
\ No newline at end of file
+{% INCLUDECSS '@crizzo_aboutus/aboutus.css' %}