summaryrefslogtreecommitdiffstats
path: root/user_guide_src/source/libraries
diff options
context:
space:
mode:
Diffstat (limited to 'user_guide_src/source/libraries')
-rw-r--r--user_guide_src/source/libraries/language.rst7
-rw-r--r--user_guide_src/source/libraries/output.rst1
2 files changed, 7 insertions, 1 deletions
diff --git a/user_guide_src/source/libraries/language.rst b/user_guide_src/source/libraries/language.rst
index 3014d8f09..6949c11c9 100644
--- a/user_guide_src/source/libraries/language.rst
+++ b/user_guide_src/source/libraries/language.rst
@@ -66,6 +66,11 @@ file extension), and language is the language set containing it (ie,
english). If the second parameter is missing, the default language set
in your **application/config/config.php** file will be used.
+You can also load multiple language files at the same time by passing an array of language files as first parameter.
+::
+
+ $this->lang->load(array('filename1', 'filename2'));
+
.. note:: The *language* parameter can only consist of letters.
Fetching a Line of Text
@@ -110,7 +115,7 @@ Class Reference
.. method:: load($langfile[, $idiom = ''[, $return = FALSE[, $add_suffix = TRUE[, $alt_path = '']]]])
- :param string $langfile: Language file to load
+ :param mixed $langfile: Language file to load or array with multiple files
:param string $idiom: Language name (i.e. 'english')
:param bool $return: Whether to return the loaded array of translations
:param bool $add_suffix: Whether to add the '_lang' suffix to the language file name
diff --git a/user_guide_src/source/libraries/output.rst b/user_guide_src/source/libraries/output.rst
index 218ec5896..e808561bd 100644
--- a/user_guide_src/source/libraries/output.rst
+++ b/user_guide_src/source/libraries/output.rst
@@ -220,6 +220,7 @@ Class Reference
call it manually unless you are aborting script execution using ``exit()`` or ``die()`` in your code.
Example::
+
$response = array('status' => 'OK');
$this->output