summaryrefslogtreecommitdiffstats
path: root/user_guide_src
diff options
context:
space:
mode:
authorGabriel Potkány <gadelat@gmail.com>2014-11-06 11:35:46 +0100
committerGabriel Potkány <gadelat@gmail.com>2014-11-06 11:35:46 +0100
commit0e924ceed7a71ac343e929270f3e529ecf85f2a5 (patch)
tree0d72d665b11df2b92030d8c3873424a3c53d87aa /user_guide_src
parentda20a575f893f7ff45dc047ba928e233557f70b9 (diff)
Ability to pass array of language files to Language Library similar to Loader Library
Diffstat (limited to 'user_guide_src')
-rw-r--r--user_guide_src/source/changelog.rst1
-rw-r--r--user_guide_src/source/libraries/language.rst7
2 files changed, 7 insertions, 1 deletions
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 49250defc..25f6f2cea 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -519,6 +519,7 @@ Release Date: Not Released
- :doc:`Language Library <libraries/language>` changes include:
- Changed method ``load()`` to filter the language name with ``ctype_alpha()``.
+ - Changed method ``load()`` to also accept an array of language files.
- Added an optional second parameter to method ``line()`` to disable error logging for line keys that were not found.
- Language files are now loaded in a cascading style with the one in **system/** always loaded and overriden afterwards, if another one is found.
diff --git a/user_guide_src/source/libraries/language.rst b/user_guide_src/source/libraries/language.rst
index 3014d8f09..6e7ef009f 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 as an string or an 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