From 9b08a4d99150663b13b2f2f465abce0358c1e959 Mon Sep 17 00:00:00 2001
From: tgtje <the_guardian2@hotmail.com>
Date: Sun, 1 Nov 2015 15:44:42 +0100
Subject: [PATCH] text to LAN issue #6
---
e107_admin/frontpage.php | 2 +-
e107_admin/includes/infopanel.php | 2 +-
e107_admin/prefs.php | 12 ++++++------
e107_docs/help/English/Preferences | 8 +++++++-
e107_handlers/db_verify_class.php | 2 +-
e107_languages/English/admin/lan_admin.php | 3 +++
e107_languages/English/admin/lan_db.php | 1 +
e107_languages/English/admin/lan_prefs.php | 7 +++++++
8 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/e107_admin/frontpage.php b/e107_admin/frontpage.php
index 5092bc1c0..b85d68063 100644
--- a/e107_admin/frontpage.php
+++ b/e107_admin/frontpage.php
@@ -693,7 +693,7 @@ class frontpage
*/
function add_other($ob_name, $cur_val, $cur_page)
{
- $label = ($cur_val) ? "Disabled or Enter Custom URL:" : "Custom URL: ";
+ $label = ($cur_val) ? LAN_CUS_URL_DIS.':' : LAN_CUS_URL.':';
return "
<td>".$this->frm->radio($ob_name, 'other', $cur_val, array('label'=> $label))."</td>
diff --git a/e107_admin/includes/infopanel.php b/e107_admin/includes/infopanel.php
index 35423fa50..2b18f4b97 100644
--- a/e107_admin/includes/infopanel.php
+++ b/e107_admin/includes/infopanel.php
@@ -196,7 +196,7 @@ class adminstyle_infopanel
</div>";
- $text = $ns->tablerender(ucwords(USERNAME)."'s Control Panel", $mainPanel, "core-infopanel_mye107",true);
+ $text = $ns->tablerender(ucwords(USERNAME). LAN_CP, $mainPanel, "core-infopanel_mye107",true);
// ------------------------------- e107 News --------------------------------
diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php
index e0cdc98ef..8339057ad 100644
--- a/e107_admin/prefs.php
+++ b/e107_admin/prefs.php
@@ -601,7 +601,7 @@ $text .= "<fieldset class='e-hideme' id='core-prefs-email'>
</td>
</tr>
<tr>
- <td><label for='contact_visibility'>Contact Form Visibility</label></td>
+ <td><label for='contact_visibility'>".PRFLAN_258."</label></td>
<td>
".$e_userclass->uc_dropdown('contact_visibility', varset( $pref['contact_visibility'],e_UC_PUBLIC), null, "tabindex='".$frm->getNext()."'")."
<div class='smalltext field-help'>Contact form will only be visible to this userclass group.</div>
@@ -870,7 +870,7 @@ $text .= "
-$elements = array(1=>'Register & Login', 2=> 'Login Only', 0=>LAN_DISABLED);
+$elements = array(1=> PRFLAN_259, 2=> PRFLAN_260, 0=>LAN_DISABLED);
$text .= "
@@ -1028,7 +1028,7 @@ $text .= "
</colgroup>
<tbody>
<tr>
- <td>Field options</td><td><table class='table table-striped table-condensed table-bordered' style='margin-bottom:0px'>
+ <td>".PRFLAN_261."</td><td><table class='table table-striped table-condensed table-bordered' style='margin-bottom:0px'>
<colgroup>
<col class='col-label' />
<col class='col-control' />
@@ -1043,7 +1043,7 @@ $text .= "
</td>
</tr>
<tr>
- <td><label for='signup-option-password'>Password</label></td>
+ <td><label for='signup-option-password'>".LAN_PASSWORD."</label></td>
<td>
".$frm->radio('signup_option_password', 0, !$prefOptionPassword, array('label' => CUSTSIG_12))."
".$frm->radio('signup_option_password', 1, ($prefOptionPassword == 1), array('label' => CUSTSIG_14, 'disabled'=>true))."
@@ -1089,7 +1089,7 @@ $text .= "
<tr>
- <td><label for='user-reg-secureveri'>Password in Email Confirmation</label></td>
+ <td><label for='user-reg-secureveri'>".PRFLAN_262."</label></td>
<td>
".$frm->radio_switch('user_reg_secureveri', $pref['user_reg_secureveri'], CUSTSIG_12, CUSTSIG_14)."
</td>
@@ -1469,7 +1469,7 @@ $text .= "
<tr>
<td><label for='cookie-name'>".PRFLAN_55."</label></td>
<td >".$frm->text('cookie_name', $pref['cookie_name'], 20)."
- <div class='field-help'>Should be unique to this website.</div></td></tr>
+ <div class='field-help'>".PRFLAN_263.".</div></td></tr>
<tr>
<td><label for='passwordencoding'>".PRFLAN_188.":</label></td>
diff --git a/e107_docs/help/English/Preferences b/e107_docs/help/English/Preferences
index e43bdeae7..e9568210b 100644
--- a/e107_docs/help/English/Preferences
+++ b/e107_docs/help/English/Preferences
@@ -12,4 +12,10 @@ Q> Should I use Cookies or Sessions for tracking my users?
A> It's your choice, if your site is working ok with cookies (the default) then leave it like that. If you prefer to use PHP sessions, then use that (a custom session handler is used by e107 to store and handle sessions).
Q> Why should I run my site in standards mode?
-A> If your developing a theme and having trouble getting it to render correctly in Firefox/Mozilla and IE, try ticking this box. IE will then be run in standards mode and use the correct box model.
\ No newline at end of file
+A> If your developing a theme and having trouble getting it to render correctly in Firefox/Mozilla and IE, try ticking this box. IE will then be run in standards mode and use the correct box model.
+
+Q> What is meant with PLAINTEXT?
+A> A string of text that is displayed with one value for each text attribute.
+
+Q> What is meant with CHAP?
+A> Challenge-Handshake Authentication Protocol (CHAP) authenticates a user or network host to an authenticating entity. That entity may be, for example, an Internet service provider.
\ No newline at end of file
diff --git a/e107_handlers/db_verify_class.php b/e107_handlers/db_verify_class.php
index ce765aae5..2cb30d6c4 100644
--- a/e107_handlers/db_verify_class.php
+++ b/e107_handlers/db_verify_class.php
@@ -134,7 +134,7 @@ class db_verify
}
else
{
- $mes->addSuccess("Tables appear to be okay!"); //TODO LAN
+ $mes->addSuccess(DBLAN_111);
$mes->addSuccess("<a class='btn btn-primary' href='".$this->backUrl."'>".LAN_BACK."</a>");
//$debug = "<pre>".print_r($this->results,TRUE)."</pre>";
//$mes->add($debug,E_MESSAGE_DEBUG);
diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php
index 72cbdc26c..847dc2849 100644
--- a/e107_languages/English/admin/lan_admin.php
+++ b/e107_languages/English/admin/lan_admin.php
@@ -410,6 +410,9 @@ define("LAN_USER_QUICKADD","Quick Add User");
define("LAN_USER_PRUNE", "Prune Users");
define("LAN_USER_OPTIONS", "User Options");
define("LAN_USER_RANKS", "User Ranks");
+define("LAN_CP", "'s Control Panel");
+define("LAN_CUS_URL", "Custom URL");
+define("LAN_CUS_URL_DIS", "Disabled or Enter Custom URL");
diff --git a/e107_languages/English/admin/lan_db.php b/e107_languages/English/admin/lan_db.php
index ed123acdd..32a9fd969 100644
--- a/e107_languages/English/admin/lan_db.php
+++ b/e107_languages/English/admin/lan_db.php
@@ -128,5 +128,6 @@ define("DBLAN_107", "[folder] is not writable");
define("DBLAN_108", "Created:");
define("DBLAN_109", "Copied:");
define("DBLAN_110", "Couldn't copy:");
+define("DBLAN_111", "Tables appear to be okay!");
?>
diff --git a/e107_languages/English/admin/lan_prefs.php b/e107_languages/English/admin/lan_prefs.php
index b02f7b4b0..500458aeb 100644
--- a/e107_languages/English/admin/lan_prefs.php
+++ b/e107_languages/English/admin/lan_prefs.php
@@ -273,4 +273,11 @@ define("PRFLAN_255", "File Uploading");
define("PRFLAN_256", "Advanced Options");
define("PRFLAN_257", "Javascript Framework");
+define("PRFLAN_258", "Contact Form Visibility");
+define("PRFLAN_259", "Register & Login");
+define("PRFLAN_260", "Login Only");
+define("PRFLAN_261", "Field options");
+define("PRFLAN_262", "Password in Email Confirmation");
+define("PRFLAN_263", "Should be unique to this website");
+
?>
\ No newline at end of file