diff options
| author | Derek Jones <derek.jones@ellislab.com> | 2008-06-27 19:14:46 +0200 |
|---|---|---|
| committer | Derek Jones <derek.jones@ellislab.com> | 2008-06-27 19:14:46 +0200 |
| commit | cc1be0f6fbf032896b5b1f6373cb247df648f6c8 (patch) | |
| tree | 36598df1c2a9be1dd5fd811abcff6a992ccf2f34 | |
| parent | 727ec3141beefb5ee6e2852ec83309c259828e4e (diff) | |
Moved the <label> output ability from the language library to a language helper (hotfix for 1.6.3)
| -rw-r--r-- | system/helpers/language_helper.php | 58 | ||||
| -rw-r--r-- | system/libraries/Language.php | 9 | ||||
| -rw-r--r-- | user_guide/changelog.html | 3 | ||||
| -rw-r--r-- | user_guide/helpers/language_helper.html | 98 | ||||
| -rw-r--r-- | user_guide/libraries/language.html | 7 |
5 files changed, 160 insertions, 15 deletions
diff --git a/system/helpers/language_helper.php b/system/helpers/language_helper.php new file mode 100644 index 000000000..b065ebeb6 --- /dev/null +++ b/system/helpers/language_helper.php @@ -0,0 +1,58 @@ +<?php if (!defined('BASEPATH')) exit('No direct script access allowed'); +/** + * CodeIgniter + * + * An open source application development framework for PHP 4.3.2 or newer + * + * @package CodeIgniter + * @author ExpressionEngine Dev Team + * @copyright Copyright (c) 2006, EllisLab, Inc. + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com + * @since Version 1.0 + * @filesource + */ + +// ------------------------------------------------------------------------ + +/** + * CodeIgniter Language Helpers + * + * @package CodeIgniter + * @subpackage Helpers + * @category Helpers + * @author ExpressionEngine Dev Team + * @link http://codeigniter.com/user_guide/helpers/language_helper.html + */ + +// ------------------------------------------------------------------------ + +/** + * Lang + * + * Fetches a language variable and optionally outputs a form label + * + * @access public + * @param string the language line + * @param string the id of the form element + * @return string + */ +if ( ! function_exists('lang')) +{ + function lang($line, $id = '') + { + $CI =& get_instance(); + $line = $CI->lang->line($line); + + if ($id != '') + { + $line = '<label for="'.$id.'">'.$line."</label>"; + } + + return $line; + } +} + +// ------------------------------------------------------------------------ +/* End of file language_helper.php */ +/* Location: ./system/helpers/language_helper.php */
\ No newline at end of file diff --git a/system/libraries/Language.php b/system/libraries/Language.php index a1f73d03b..be86c2b89 100644 --- a/system/libraries/Language.php +++ b/system/libraries/Language.php @@ -109,18 +109,11 @@ class CI_Language { *
* @access public
* @param string $line the language line
- * @param string $label optional label
* @return string
*/
- function line($line = '', $label = '')
+ function line($line = '')
{
$line = ($line == '' OR ! isset($this->language[$line])) ? FALSE : $this->language[$line];
-
- if ($label != '')
- {
- $line = '<label for="'.$label.'">'.$line."</label>";
- }
-
return $line;
}
diff --git a/user_guide/changelog.html b/user_guide/changelog.html index dd9ae7670..36af562a6 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -78,7 +78,7 @@ SVN Revision: XXXX</p> <h2>Version 1.6.3</h2>
<p>Release Date: June 26, 2008<br />
-SVN Revision: 1227</p>
+SVN Revision: 1232</p>
<p>Version 1.6.3 is a security and maintenance release and is recommended for all users.</p>
<ul>
<li>Database
@@ -99,6 +99,7 @@ SVN Revision: 1227</p> </li>
<li>Helpers
<ul>
+ <li>Added a <a href="helpers/language_helper.html">Language helper</a>.</li>
<li>Added a <a href="helpers/number_helper.html">Number helper</a>.</li>
<li><a href="helpers/form_helper.html">Form helper</a> refactored to allow <kbd>form_open()</kbd> and <kbd>form_fieldset()</kbd> to accept arrays or strings as arguments.</li>
</ul>
diff --git a/user_guide/helpers/language_helper.html b/user_guide/helpers/language_helper.html new file mode 100644 index 000000000..53a611488 --- /dev/null +++ b/user_guide/helpers/language_helper.html @@ -0,0 +1,98 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> + +<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> +<title>Language Helper : CodeIgniter User Guide</title> + +<style type='text/css' media='all'>@import url('../userguide.css');</style> +<link rel='stylesheet' type='text/css' media='all' href='../userguide.css' /> + +<script type="text/javascript" src="../nav/nav.js"></script> +<script type="text/javascript" src="../nav/prototype.lite.js"></script> +<script type="text/javascript" src="../nav/moo.fx.js"></script> +<script type="text/javascript" src="../nav/user_guide_menu.js"></script> + +<meta http-equiv='expires' content='-1' /> +<meta http-equiv= 'pragma' content='no-cache' /> +<meta name='robots' content='all' /> +<meta name='author' content='ExpressionEngine Dev Team' /> +<meta name='description' content='CodeIgniter User Guide' /> + +</head> +<body> + +<!-- START NAVIGATION --> +<div id="nav"><div id="nav_inner"><script type="text/javascript">create_menu('../');</script></div></div> +<div id="nav2"><a name="top"></a><a href="javascript:void(0);" onclick="myHeight.toggle();"><img src="../images/nav_toggle.jpg" width="153" height="44" border="0" title="Toggle Table of Contents" alt="Toggle Table of Contents" /></a></div> +<div id="masthead"> +<table cellpadding="0" cellspacing="0" border="0" style="width:100%"> +<tr> +<td><h1>CodeIgniter User Guide Version 1.6.3</h1></td> +<td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td> +</tr> +</table> +</div> +<!-- END NAVIGATION --> + + +<!-- START BREADCRUMB --> + +<table cellpadding="0" cellspacing="0" border="0" style="width:100%"> +<tr> +<td id="breadcrumb"> +<a href="http://codeigniter.com/">CodeIgniter Home</a> › +<a href="../index.html">User Guide Home</a> › +Language Helper +</td> +<td id="searchbox"><form method="get" action="http://www.google.com/search"><input type="hidden" name="as_sitesearch" id="as_sitesearch" value="codeigniter.com/user_guide/" />Search User Guide <input type="text" class="input" style="width:200px;" name="q" id="q" size="31" maxlength="255" value="" /> <input type="submit" class="submit" name="sa" value="Go" /></form></td> +</tr> +</table> +<!-- END BREADCRUMB --> + +<br clear="all" /> + + +<!-- START CONTENT --> +<div id="content"> + + +<h1>Language Helper</h1> + +<p>The Language Helper file contains functions that assist in working with language files.</p> + + +<h2>Loading this Helper</h2> + +<p>This helper is loaded using the following code:</p> +<code>$this->load->helper('language');</code> + +<p>The following functions are available:</p> + +<h2>lang('<var>language line</var>', '<var>element id</var>')</h2> + +<p>This function returns a line of text from a loaded language file with simplified syntax + that may be more desirable for view files than calling <kbd>$this->lang->line()</kbd>. + The optional second parameter will also output a form label for you. Example:</p> + +<code>echo lang('<samp>language_key</samp>', '<samp>form_item_id</samp>');<br /> +// becomes <label for="form_item_id">language_key</label></code> + + +</div> +<!-- END CONTENT --> + + +<div id="footer"> +<p> +Previous Topic: <a href="date_helper.html">Date Helper</a> + · +<a href="#top">Top of Page</a> · +<a href="../index.html">User Guide Home</a> · +Next Topic: <a href="download_helper.html">Download Helper</a> +</p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006-2008 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p> +</div> + +</body> +</html>
\ No newline at end of file diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html index b776b7d26..4d93cf9d9 100644 --- a/user_guide/libraries/language.html +++ b/user_guide/libraries/language.html @@ -113,12 +113,7 @@ is the language set containing it (ie, english). If the second parameter is mis <h3>Using language lines as form labels</h3>
-<p>If your application requires it, a language line can automatically be output as a <label> by specifying a second parameter, which will become the "for" attribute of the label.</p>
-
-<code>
-$this->lang->line('<samp>language_key</samp>', '<samp>form_item_id</samp>'); <br />
-// becomes <label for="form_item_id">language_key</label>
-</code>
+<p class="important">This feature has been deprecated from the language library and moved to the <kbd>lang()</kbd> function of the <a href="../helpers/language_helper.html">Language helper</a>.</p>
<h2>Auto-loading Languages</h2>
<p>If you find that you need a particular language globally throughout your application, you can tell CodeIgniter to <a href="../general/autoloader.html">auto-load</a> it during system initialization. This is done by opening the application/config/autoload.php file and adding the language(s) to the autoload array.</p>
|