From 05ea4f4a8b6a7957092ec82414fda14f50fd584a Mon Sep 17 00:00:00 2001
From: tgtje <the_guardian2@hotmail.com>
Date: Sat, 9 Apr 2016 19:27:43 +0200
Subject: [PATCH] reworked : using language folder + use of standard e107::lan

---
 .../bootstrap3/languages/English_admin.php    | 23 +++++++++++++++++++
 e107_themes/bootstrap3/theme_config.php       | 16 +++++++------
 2 files changed, 32 insertions(+), 7 deletions(-)
 create mode 100644 e107_themes/bootstrap3/languages/English_admin.php

diff --git a/e107_themes/bootstrap3/languages/English_admin.php b/e107_themes/bootstrap3/languages/English_admin.php
new file mode 100644
index 000000000..d156d8b55
--- /dev/null
+++ b/e107_themes/bootstrap3/languages/English_admin.php
@@ -0,0 +1,23 @@
+<?php
+/*
++ ----------------------------------------------------------------------------+
+|     e107 website system - 
+|
+
++----------------------------------------------------------------------------+
+*/
+
+define("LAN_THEMEPREF_00", "Branding:");
+define("LAN_THEMEPREF_01", "Navbar Alignment:");
+define("LAN_THEMEPREF_02", "Signup/Login Placement:");
+define("LAN_THEMEPREF_03", "Bootswatch Styles:");
+define("LAN_THEMEPREF_04", "Site Name");
+define("LAN_THEMEPREF_05", "Logo");
+define("LAN_THEMEPREF_06", "Logo &amp; Site Name");
+define("LAN_THEMEPREF_07", "left");
+define("LAN_THEMEPREF_08", "right");
+define("LAN_THEMEPREF_09", "top");
+define("LAN_THEMEPREF_10", "bottom");
+ 
+
+?>
\ No newline at end of file
diff --git a/e107_themes/bootstrap3/theme_config.php b/e107_themes/bootstrap3/theme_config.php
index 22b23e58d..ab24cca60 100644
--- a/e107_themes/bootstrap3/theme_config.php
+++ b/e107_themes/bootstrap3/theme_config.php
@@ -2,6 +2,8 @@
 
 if (!defined('e107_INIT')) { exit; }
 
+e107::lan('theme', 'admin',true); // e_PLUGIN.'tinymce4/languages/'.e_LANGUAGE.'_admin.php'
+
 // Dummy Theme Configuration File.
 class theme_bootstrap3 implements e_theme_config
 {
@@ -23,18 +25,18 @@ class theme_bootstrap3 implements e_theme_config
 	{
 		$frm = e107::getForm();
 
-		$brandingOpts = array('sitename'=>'Site Name', 'logo' => 'Logo', 'sitenamelogo'=>'Logo &amp; Site Name');
+		$brandingOpts = array('sitename'=>LAN_THEMEPREF_04, 'logo' => LAN_THEMEPREF_05, 'sitenamelogo'=>LAN_THEMEPREF_06);
 
-		$var[0]['caption'] 	= "Branding";
+		$var[0]['caption'] 	= LAN_THEMEPREF_00;
 		$var[0]['html'] 	= $frm->select('branding', $brandingOpts, e107::pref('theme', 'branding', 'sitename'));
 		$var[0]['help']		= "";
 
-		$var[1]['caption'] 	= "Navbar Alignment";
-		$var[1]['html'] 	= $frm->select('nav_alignment', array('left', 'right'), e107::pref('theme', 'nav_alignment', 'left'),'useValues=1' );
+		$var[1]['caption'] 	= LAN_THEMEPREF_01;
+		$var[1]['html'] 	= $frm->select('nav_alignment', array(LAN_THEMEPREF_07, LAN_THEMEPREF_08), e107::pref('theme', 'nav_alignment', 'left'),'useValues=1' );
 		$var[1]['help']		= "";
 
-		$var[2]['caption'] 	= "Signup/Login Placement";
-		$var[2]['html'] 	= $frm->select('usernav_placement', array('top', 'bottom'), e107::pref('theme', 'usernav_placement', 'top'),'useValues=1' );
+		$var[2]['caption'] 	= LAN_THEMEPREF_02;
+		$var[2]['html'] 	= $frm->select('usernav_placement', array(LAN_THEMEPREF_09, LAN_THEMEPREF_10), e107::pref('theme', 'usernav_placement', 'top'),'useValues=1' );
 		$var[2]['help']		= "";
 
 
@@ -61,7 +63,7 @@ class theme_bootstrap3 implements e_theme_config
 
 		$previewLink = " <a class='btn btn-default e-modal' data-modal-caption=\"Use the 'Themes' menu to view the selection.\" href='http://bootswatch.com/default/'>".LAN_PREVIEW."</a>";
 
-		$var[3]['caption'] 	= "Bootswatch Styles";
+		$var[3]['caption'] 	= LAN_THEMEPREF_03;
 		$var[3]['html'] 	= "<div class='form-inline'>".$frm->select('bootswatch', $bootswatch, e107::pref('theme', 'bootswatch', ''),null,LAN_DEFAULT ).$previewLink."</div>";
 		$var[3]['help']		= "";