From 179a4700221aa49071b07d638c44b9326c7a14a8 Mon Sep 17 00:00:00 2001
From: MateBartus <mate.bartus@gmail.com>
Date: Tue, 14 Apr 2015 02:31:23 +0200
Subject: [ticket/13762] Moving language related functionality into a separate
 class

PHPBB3-13762
---
 .../exception/invalid_plural_rule_exception.php    |  22 +
 .../language/exception/language_exception.php      |  22 +
 .../language/exception/language_file_not_found.php |  22 +
 phpBB/phpbb/language/language.php                  | 562 +++++++++++++++++++++
 phpBB/phpbb/language/language_file_helper.php      |  71 +++
 phpBB/phpbb/language/language_file_loader.php      | 212 ++++++++
 6 files changed, 911 insertions(+)
 create mode 100644 phpBB/phpbb/language/exception/invalid_plural_rule_exception.php
 create mode 100644 phpBB/phpbb/language/exception/language_exception.php
 create mode 100644 phpBB/phpbb/language/exception/language_file_not_found.php
 create mode 100644 phpBB/phpbb/language/language.php
 create mode 100644 phpBB/phpbb/language/language_file_helper.php
 create mode 100644 phpBB/phpbb/language/language_file_loader.php

(limited to 'phpBB/phpbb/language')

diff --git a/phpBB/phpbb/language/exception/invalid_plural_rule_exception.php b/phpBB/phpbb/language/exception/invalid_plural_rule_exception.php
new file mode 100644
index 0000000000..94e3466208
--- /dev/null
+++ b/phpBB/phpbb/language/exception/invalid_plural_rule_exception.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\language\exception;
+
+/**
+ * Thrown when nonexistent plural rule is specified
+ */
+class invalid_plural_rule_exception extends language_exception
+{
+
+}
diff --git a/phpBB/phpbb/language/exception/language_exception.php b/phpBB/phpbb/language/exception/language_exception.php
new file mode 100644
index 0000000000..b1258414aa
--- /dev/null
+++ b/phpBB/phpbb/language/exception/language_exception.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\language\exception;
+
+/**
+ * Base exception class for language exceptions
+ */
+class language_exception extends \phpbb\exception\runtime_exception
+{
+
+}
diff --git a/phpBB/phpbb/language/exception/language_file_not_found.php b/phpBB/phpbb/language/exception/language_file_not_found.php
new file mode 100644
index 0000000000..89364267eb
--- /dev/null
+++ b/phpBB/phpbb/language/exception/language_file_not_found.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\language\exception;
+
+/**
+ * This exception is thrown when the language file is not found
+ */
+class language_file_not_found extends language_exception
+{
+
+}
diff --git a/phpBB/phpbb/language/language.php b/phpBB/phpbb/language/language.php
new file mode 100644
index 0000000000..9c9a3b8df1
--- /dev/null
+++ b/phpBB/phpbb/language/language.php
@@ -0,0 +1,562 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\language;
+
+use phpbb\language\exception\invalid_plural_rule_exception;
+
+/**
+ * Wrapper class for loading translations
+ */
+class language
+{
+	/**
+	 * Global fallback language
+	 *
+	 * ISO code of the language to fallback to when the specified language entries
+	 * cannot be found.
+	 *
+	 * @var string
+	 */
+	const FALLBACK_LANGUAGE = 'en';
+
+	/**
+	 * @var array	List of common language files
+	 */
+	protected $common_language_files;
+
+	/**
+	 * @var bool
+	 */
+	protected $common_language_files_loaded;
+
+	/**
+	 * @var string	ISO code of the default board language
+	 */
+	protected $default_language;
+
+	/**
+	 * @var string	ISO code of the User's language
+	 */
+	protected $user_language;
+
+	/**
+	 * @var array	Language fallback array (the order is important)
+	 */
+	protected $language_fallback;
+
+	/**
+	 * @var array	Array of language variables
+	 */
+	protected $lang;
+
+	/**
+	 * @var array	Loaded language sets
+	 */
+	protected $loaded_language_sets;
+
+	/**
+	 * @var \phpbb\language\language_file_loader Language file loader
+	 */
+	protected $loader;
+
+	/**
+	 * Constructor
+	 *
+	 * @param \phpbb\language\language_file_loader	$loader	Language file loader
+	 */
+	public function __construct(language_file_loader $loader)
+	{
+		$this->loader = $loader;
+
+		// Set up default information
+		$this->user_language		= false;
+		$this->default_language		= false;
+		$this->lang					= array(
+			// For BC with user::help array
+			'__help' => array(),
+		);
+		$this->loaded_language_sets	= array(
+			'core'	=> array(),
+			'ext'	=> array(),
+		);
+
+		// Common language files
+		$this->common_language_files = array(
+			'common',
+		);
+		$this->common_language_files_loaded = false;
+
+		$this->language_fallback = array(self::FALLBACK_LANGUAGE);
+	}
+
+	/**
+	 * Function to set user's language to display.
+	 *
+	 * @param string	$user_lang_iso	ISO code of the User's language
+	 */
+	public function set_user_language($user_lang_iso)
+	{
+		$this->user_language = $user_lang_iso;
+
+		$this->set_fallback_array();
+	}
+
+	/**
+	 * Function to set the board's default language to display.
+	 *
+	 * @param string	$default_lang_iso	ISO code of the board's default language
+	 */
+	public function set_default_language($default_lang_iso)
+	{
+		$this->default_language = $default_lang_iso;
+
+		$this->set_fallback_array();
+	}
+
+	/**
+	 * Returns language array
+	 *
+	 * Note: This function is needed for the BC purposes, until \phpbb\user::lang[] is
+	 *       not removed.
+	 *
+	 * @return array	Array of loaded language strings
+	 */
+	public function get_lang_array()
+	{
+		// Load common language files if they not loaded yet
+		if (!$this->common_language_files_loaded)
+		{
+			$this->load_common_language_files();
+		}
+
+		return $this->lang;
+	}
+
+	/**
+	 * Add Language Items
+	 *
+	 * Note: $use_help is assigned where needed (only use them to force inclusion).
+	 *
+	 * Examples:
+	 * <code>
+	 * $component = array('posting');
+	 * $component = array('posting', 'viewtopic')
+	 * $component = 'posting'
+	 * </code>
+	 *
+	 * @param string|array	$component		The name of the language component to load
+	 * @param string|null	$extension_name	Name of the extension to load component from, or null for core file
+	 */
+	public function add_lang($component, $extension_name = null)
+	{
+		// Load common language files if they not loaded yet
+		// This needs to be here to correctly merge language arrays
+		if (!$this->common_language_files_loaded)
+		{
+			$this->load_common_language_files();
+		}
+
+		if (!is_array($component))
+		{
+			if (!is_null($extension_name))
+			{
+				$this->load_extension($extension_name, $component);
+			}
+			else
+			{
+				$this->load_core_file($component);
+			}
+		}
+		else
+		{
+			foreach ($component as $lang_file)
+			{
+				$this->add_lang($lang_file, $extension_name);
+			}
+		}
+	}
+
+	/**
+	 * Advanced language substitution
+	 *
+	 * Function to mimic sprintf() with the possibility of using phpBB's language system to substitute nullar/singular/plural forms.
+	 * Params are the language key and the parameters to be substituted.
+	 * This function/functionality is inspired by SHS` and Ashe.
+	 *
+	 * Example call: <samp>$user->lang('NUM_POSTS_IN_QUEUE', 1);</samp>
+	 *
+	 * If the first parameter is an array, the elements are used as keys and subkeys to get the language entry:
+	 * Example: <samp>$user->lang(array('datetime', 'AGO'), 1)</samp> uses $user->lang['datetime']['AGO'] as language entry.
+	 *
+	 * @return string	Return localized string or the language key if the translation is not available
+	 */
+	public function lang()
+	{
+		// Load common language files if they not loaded yet
+		if (!$this->common_language_files_loaded)
+		{
+			$this->load_common_language_files();
+		}
+
+		$args = func_get_args();
+		$key = $args[0];
+
+		if (is_array($key))
+		{
+			$lang = &$this->lang[array_shift($key)];
+
+			foreach ($key as $_key)
+			{
+				$lang = &$lang[$_key];
+			}
+		}
+		else
+		{
+			$lang = &$this->lang[$key];
+		}
+
+		// Return if language string does not exist
+		if (!isset($lang) || (!is_string($lang) && !is_array($lang)))
+		{
+			return $key;
+		}
+
+		// If the language entry is a string, we simply mimic sprintf() behaviour
+		if (is_string($lang))
+		{
+			if (sizeof($args) == 1)
+			{
+				return $lang;
+			}
+
+			// Replace key with language entry and simply pass along...
+			$args[0] = $lang;
+			return call_user_func_array('sprintf', $args);
+		}
+		else if (sizeof($lang) == 0)
+		{
+			// If the language entry is an empty array, we just return the language key
+			return $args[0];
+		}
+
+		// It is an array... now handle different nullar/singular/plural forms
+		$key_found = false;
+
+		// We now get the first number passed and will select the key based upon this number
+		for ($i = 1, $num_args = sizeof($args); $i < $num_args; $i++)
+		{
+			if (is_int($args[$i]) || is_float($args[$i]))
+			{
+				if ($args[$i] == 0 && isset($lang[0]))
+				{
+					// We allow each translation using plural forms to specify a version for the case of 0 things,
+					// so that "0 users" may be displayed as "No users".
+					$key_found = 0;
+					break;
+				}
+				else
+				{
+					$use_plural_form = $this->get_plural_form($args[$i]);
+					if (isset($lang[$use_plural_form]))
+					{
+						// The key we should use exists, so we use it.
+						$key_found = $use_plural_form;
+					}
+					else
+					{
+						// If the key we need to use does not exist, we fall back to the previous one.
+						$numbers = array_keys($lang);
+
+						foreach ($numbers as $num)
+						{
+							if ($num > $use_plural_form)
+							{
+								break;
+							}
+
+							$key_found = $num;
+						}
+					}
+					break;
+				}
+			}
+		}
+
+		// Ok, let's check if the key was found, else use the last entry (because it is mostly the plural form)
+		if ($key_found === false)
+		{
+			$numbers = array_keys($lang);
+			$key_found = end($numbers);
+		}
+
+		// Use the language string we determined and pass it to sprintf()
+		$args[0] = $lang[$key_found];
+		return call_user_func_array('sprintf', $args);
+	}
+
+	/**
+	 * Loads common language files
+	 */
+	protected function load_common_language_files()
+	{
+		if (!$this->common_language_files_loaded)
+		{
+			foreach ($this->common_language_files as $lang_file)
+			{
+				$this->load_core_file($lang_file);
+			}
+
+			$this->common_language_files_loaded = true;
+		}
+	}
+
+	/**
+	 * Determine which plural form we should use.
+	 *
+	 * For some languages this is not as simple as for English.
+	 *
+	 * @param int|float		$number		The number we want to get the plural case for. Float numbers are floored.
+	 * @param int|bool		$force_rule	False to use the plural rule of the language package
+	 *									or an integer to force a certain plural rule
+	 *
+	 * @return int	The plural-case we need to use for the number plural-rule combination
+	 *
+	 * @throws \phpbb\language\exception\invalid_plural_rule_exception	When $force_rule has an invalid value
+	 */
+	public function get_plural_form($number, $force_rule = false)
+	{
+		$number			= (int) $number;
+		$plural_rule	= ($force_rule !== false) ? $force_rule : ((isset($this->lang['PLURAL_RULE'])) ? $this->lang['PLURAL_RULE'] : 1);
+
+		if ($plural_rule > 15 || $plural_rule < 0)
+		{
+			throw new invalid_plural_rule_exception('INVALID_PLURAL_RULE', array(
+				'plural_rule' => $plural_rule,
+			));
+		}
+
+		/**
+		 * The following plural rules are based on a list published by the Mozilla Developer Network
+		 * https://developer.mozilla.org/en/Localization_and_Plurals
+		 */
+		switch ($plural_rule)
+		{
+			case 0:
+				/**
+				 * Families: Asian (Chinese, Japanese, Korean, Vietnamese), Persian, Turkic/Altaic (Turkish), Thai, Lao
+				 * 1 - everything: 0, 1, 2, ...
+				 */
+				return 1;
+
+			case 1:
+				/**
+				 * Families: Germanic (Danish, Dutch, English, Faroese, Frisian, German, Norwegian, Swedish), Finno-Ugric (Estonian, Finnish, Hungarian), Language isolate (Basque), Latin/Greek (Greek), Semitic (Hebrew), Romanic (Italian, Portuguese, Spanish, Catalan)
+				 * 1 - 1
+				 * 2 - everything else: 0, 2, 3, ...
+				 */
+				return ($number === 1) ? 1 : 2;
+
+			case 2:
+				/**
+				 * Families: Romanic (French, Brazilian Portuguese)
+				 * 1 - 0, 1
+				 * 2 - everything else: 2, 3, ...
+				 */
+				return (($number === 0) || ($number === 1)) ? 1 : 2;
+
+			case 3:
+				/**
+				 * Families: Baltic (Latvian)
+				 * 1 - 0
+				 * 2 - ends in 1, not 11: 1, 21, ... 101, 121, ...
+				 * 3 - everything else: 2, 3, ... 10, 11, 12, ... 20, 22, ...
+				 */
+				return ($number === 0) ? 1 : ((($number % 10 === 1) && ($number % 100 != 11)) ? 2 : 3);
+
+			case 4:
+				/**
+				 * Families: Celtic (Scottish Gaelic)
+				 * 1 - is 1 or 11: 1, 11
+				 * 2 - is 2 or 12: 2, 12
+				 * 3 - others between 3 and 19: 3, 4, ... 10, 13, ... 18, 19
+				 * 4 - everything else: 0, 20, 21, ...
+				 */
+				return ($number === 1 || $number === 11) ? 1 : (($number === 2 || $number === 12) ? 2 : (($number >= 3 && $number <= 19) ? 3 : 4));
+
+			case 5:
+				/**
+				 * Families: Romanic (Romanian)
+				 * 1 - 1
+				 * 2 - is 0 or ends in 01-19: 0, 2, 3, ... 19, 101, 102, ... 119, 201, ...
+				 * 3 - everything else: 20, 21, ...
+				 */
+				return ($number === 1) ? 1 : ((($number === 0) || (($number % 100 > 0) && ($number % 100 < 20))) ? 2 : 3);
+
+			case 6:
+				/**
+				 * Families: Baltic (Lithuanian)
+				 * 1 - ends in 1, not 11: 1, 21, 31, ... 101, 121, ...
+				 * 2 - ends in 0 or ends in 10-20: 0, 10, 11, 12, ... 19, 20, 30, 40, ...
+				 * 3 - everything else: 2, 3, ... 8, 9, 22, 23, ... 29, 32, 33, ...
+				 */
+				return (($number % 10 === 1) && ($number % 100 != 11)) ? 1 : ((($number % 10 < 2) || (($number % 100 >= 10) && ($number % 100 < 20))) ? 2 : 3);
+
+			case 7:
+				/**
+				 * Families: Slavic (Croatian, Serbian, Russian, Ukrainian)
+				 * 1 - ends in 1, not 11: 1, 21, 31, ... 101, 121, ...
+				 * 2 - ends in 2-4, not 12-14: 2, 3, 4, 22, 23, 24, 32, ...
+				 * 3 - everything else: 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 25, 26, ...
+				 */
+				return (($number % 10 === 1) && ($number % 100 != 11)) ? 1 : ((($number % 10 >= 2) && ($number % 10 <= 4) && (($number % 100 < 10) || ($number % 100 >= 20))) ? 2 : 3);
+
+			case 8:
+				/**
+				 * Families: Slavic (Slovak, Czech)
+				 * 1 - 1
+				 * 2 - 2, 3, 4
+				 * 3 - everything else: 0, 5, 6, 7, ...
+				 */
+				return ($number === 1) ? 1 : ((($number >= 2) && ($number <= 4)) ? 2 : 3);
+
+			case 9:
+				/**
+				 * Families: Slavic (Polish)
+				 * 1 - 1
+				 * 2 - ends in 2-4, not 12-14: 2, 3, 4, 22, 23, 24, 32, ... 104, 122, ...
+				 * 3 - everything else: 0, 5, 6, ... 11, 12, 13, 14, 15, ... 20, 21, 25, ...
+				 */
+				return ($number === 1) ? 1 : ((($number % 10 >= 2) && ($number % 10 <= 4) && (($number % 100 < 12) || ($number % 100 > 14))) ? 2 : 3);
+
+			case 10:
+				/**
+				 * Families: Slavic (Slovenian, Sorbian)
+				 * 1 - ends in 01: 1, 101, 201, ...
+				 * 2 - ends in 02: 2, 102, 202, ...
+				 * 3 - ends in 03-04: 3, 4, 103, 104, 203, 204, ...
+				 * 4 - everything else: 0, 5, 6, 7, 8, 9, 10, 11, ...
+				 */
+				return ($number % 100 === 1) ? 1 : (($number % 100 === 2) ? 2 : ((($number % 100 === 3) || ($number % 100 === 4)) ? 3 : 4));
+
+			case 11:
+				/**
+				 * Families: Celtic (Irish Gaeilge)
+				 * 1 - 1
+				 * 2 - 2
+				 * 3 - is 3-6: 3, 4, 5, 6
+				 * 4 - is 7-10: 7, 8, 9, 10
+				 * 5 - everything else: 0, 11, 12, ...
+				 */
+				return ($number === 1) ? 1 : (($number === 2) ? 2 : (($number >= 3 && $number <= 6) ? 3 : (($number >= 7 && $number <= 10) ? 4 : 5)));
+
+			case 12:
+				/**
+				 * Families: Semitic (Arabic)
+				 * 1 - 1
+				 * 2 - 2
+				 * 3 - ends in 03-10: 3, 4, ... 10, 103, 104, ... 110, 203, 204, ...
+				 * 4 - ends in 11-99: 11, ... 99, 111, 112, ...
+				 * 5 - everything else: 100, 101, 102, 200, 201, 202, ...
+				 * 6 - 0
+				 */
+				return ($number === 1) ? 1 : (($number === 2) ? 2 : ((($number % 100 >= 3) && ($number % 100 <= 10)) ? 3 : ((($number % 100 >= 11) && ($number % 100 <= 99)) ? 4 : (($number != 0) ? 5 : 6))));
+
+			case 13:
+				/**
+				 * Families: Semitic (Maltese)
+				 * 1 - 1
+				 * 2 - is 0 or ends in 01-10: 0, 2, 3, ... 9, 10, 101, 102, ...
+				 * 3 - ends in 11-19: 11, 12, ... 18, 19, 111, 112, ...
+				 * 4 - everything else: 20, 21, ...
+				 */
+				return ($number === 1) ? 1 : ((($number === 0) || (($number % 100 > 1) && ($number % 100 < 11))) ? 2 : ((($number % 100 > 10) && ($number % 100 < 20)) ? 3 : 4));
+
+			case 14:
+				/**
+				 * Families: Slavic (Macedonian)
+				 * 1 - ends in 1: 1, 11, 21, ...
+				 * 2 - ends in 2: 2, 12, 22, ...
+				 * 3 - everything else: 0, 3, 4, ... 10, 13, 14, ... 20, 23, ...
+				 */
+				return ($number % 10 === 1) ? 1 : (($number % 10 === 2) ? 2 : 3);
+
+			case 15:
+				/**
+				 * Families: Icelandic
+				 * 1 - ends in 1, not 11: 1, 21, 31, ... 101, 121, 131, ...
+				 * 2 - everything else: 0, 2, 3, ... 10, 11, 12, ... 20, 22, ...
+				 */
+				return (($number % 10 === 1) && ($number % 100 != 11)) ? 1 : 2;
+		}
+	}
+
+	/**
+	 * Returns language fallback data
+	 *
+	 * @return array
+	 */
+	protected function set_fallback_array()
+	{
+		$fallback_array = array();
+
+		if ($this->user_language !== false)
+		{
+			$fallback_array[] = $this->user_language;
+		}
+
+		if ($this->default_language !== false)
+		{
+			$fallback_array[] = $this->default_language;
+		}
+
+		$fallback_array[] = self::FALLBACK_LANGUAGE;
+
+		$this->language_fallback = $fallback_array;
+	}
+
+	/**
+	 * Load core language file
+	 *
+	 * @param string	$component	Name of the component to load
+	 */
+	protected function load_core_file($component)
+	{
+		// Check if the component is already loaded
+		if (isset($this->loaded_language_sets['core'][$component]))
+		{
+			return;
+		}
+
+		$this->loader->load($component, $this->language_fallback, $this->lang);
+		$this->loaded_language_sets['core'][$component] = true;
+	}
+
+	/**
+	 * Load extension language file
+	 *
+	 * @param string	$extension_name	Name of the extension to load language from
+	 * @param string	$component		Name of the component to load
+	 */
+	protected function load_extension($extension_name, $component)
+	{
+		// Check if the component is already loaded
+		if (isset($this->loaded_language_sets['ext'][$extension_name][$component]))
+		{
+			return;
+		}
+
+		$this->loader->load_extension($extension_name, $component, $this->language_fallback, $this->lang);
+		$this->loaded_language_sets['ext'][$extension_name][$component] = true;
+	}
+}
diff --git a/phpBB/phpbb/language/language_file_helper.php b/phpBB/phpbb/language/language_file_helper.php
new file mode 100644
index 0000000000..18d7b62e21
--- /dev/null
+++ b/phpBB/phpbb/language/language_file_helper.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\language;
+
+use Symfony\Component\Finder\Finder;
+
+/**
+ * Helper class for language file related functions
+ */
+class language_file_helper
+{
+	/**
+	 * @var string	Path to phpBB's root
+	 */
+	protected $phpbb_root_path;
+
+	/**
+	 * Constructor
+	 *
+	 * @param string	$phpbb_root_path	Path to phpBB's root
+	 */
+	public function __construct($phpbb_root_path)
+	{
+		$this->phpbb_root_path = $phpbb_root_path;
+	}
+
+	/**
+	 * Returns available languages
+	 *
+	 * @return array
+	 */
+	public function get_available_languages()
+	{
+		// Find available language packages
+		$finder = new Finder();
+		$finder->files()
+			->name('iso.txt')
+			->depth('== 1')
+			->in($this->phpbb_root_path . 'language');
+
+		$available_languages = array();
+		foreach ($finder as $file)
+		{
+			$path = $file->getRelativePath();
+			$info = explode("\n", $file->getContents());
+
+			$available_languages[] = array(
+				// Get the name of the directory containing iso.txt
+				'iso' => $path,
+
+				// Recover data from file
+				'name' => trim($info[0]),
+				'local_name' => trim($info[1]),
+				'author' => trim($info[2])
+			);
+		}
+
+		return $available_languages;
+	}
+}
diff --git a/phpBB/phpbb/language/language_file_loader.php b/phpBB/phpbb/language/language_file_loader.php
new file mode 100644
index 0000000000..510a29279a
--- /dev/null
+++ b/phpBB/phpbb/language/language_file_loader.php
@@ -0,0 +1,212 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\language;
+
+use \phpbb\language\exception\language_file_not_found;
+
+/**
+ * Language file loader
+ */
+class language_file_loader
+{
+	/**
+	 * @var string	Path to phpBB's root
+	 */
+	protected $phpbb_root_path;
+
+	/**
+	 * @var string	Extension of PHP files
+	 */
+	protected $php_ext;
+
+	/**
+	 * @var \phpbb\extension\manager	Extension manager
+	 */
+	protected $extension_manager;
+
+	/**
+	 * Constructor
+	 *
+	 * @param string	$phpbb_root_path	Path to phpBB's root
+	 * @param string	$php_ext			Extension of PHP files
+	 */
+	public function __construct($phpbb_root_path, $php_ext)
+	{
+		$this->phpbb_root_path	= $phpbb_root_path;
+		$this->php_ext			= $php_ext;
+
+		$this->extension_manager = null;
+	}
+
+	/**
+	 * Extension manager setter
+	 *
+	 * @param \phpbb\extension\manager	$extension_manager	Extension manager
+	 */
+	public function set_extension_manager(\phpbb\extension\manager $extension_manager)
+	{
+		$this->extension_manager = $extension_manager;
+	}
+
+	/**
+	 * Loads language array for the given component
+	 *
+	 * @param string		$component	Name of the language component
+	 * @param string|array	$locale		ISO code of the language to load, or array of ISO codes if you want to
+	 * 									specify additional language fallback steps
+	 * @param array			$lang		Array reference containing language strings
+	 */
+	public function load($component, $locale, &$lang)
+	{
+		$locale = (array) $locale;
+
+		// Determine path to language directory
+		$path = $this->phpbb_root_path . 'language/';
+
+		$this->load_file($path, $component, $locale, $lang);
+	}
+
+	/**
+	 * Loads language array for the given extension component
+	 *
+	 * @param string		$extension	Name of the extension
+	 * @param string		$component	Name of the language component
+	 * @param string|array	$locale		ISO code of the language to load, or array of ISO codes if you want to
+	 * 									specify additional language fallback steps
+	 * @param array			$lang		Array reference containing language strings
+	 */
+	public function load_extension($extension, $component, $locale, &$lang)
+	{
+		// Check if extension manager was loaded
+		if ($this->extension_manager === null)
+		{
+			// If not, let's return
+			return;
+		}
+
+		$locale = (array) $locale;
+
+		// Determine path to language directory
+		$path = $this->extension_manager->get_extension_path($extension, true) . 'language/';
+
+		$this->load_file($path, $component, $locale, $lang);
+	}
+
+	/**
+	 * Prepares language file loading
+	 *
+	 * @param string	$path		Path to search for file in
+	 * @param string	$component	Name of the language component
+	 * @param array		$locale		Array containing language fallback options
+	 * @param array		$lang		Array reference of language strings
+	 */
+	protected function load_file($path, $component, $locale, &$lang)
+	{
+		// This is BC stuff and not the best idea as it makes language fallback
+		// implementation quite hard like below.
+		if (strpos($this->phpbb_root_path . $component, $path) === 0)
+		{
+			// Filter out the path
+			$path_diff = str_replace($path, '', dirname($this->phpbb_root_path . $component));
+			$language_file = basename($component, '.' . $this->php_ext);
+			$component = '';
+
+			// This step is needed to resolve language/en/subdir style $component
+			// $path already points to the language base directory so we need to eliminate
+			// the first directory from the path (that should be the language directory)
+			$path_diff_parts = explode('/', $path_diff);
+
+			if (sizeof($path_diff_parts) > 1)
+			{
+				array_shift($path_diff_parts);
+				$component = implode('/', $path_diff_parts) . '/';
+			}
+
+			$component .= $language_file;
+		}
+
+		// Determine filename
+		$filename = $component . '.' . $this->php_ext;
+
+		// Determine path to file
+		$file_path = $this->get_language_file_path($path, $filename, $locale);
+
+		// Load language array
+		$this->load_language_file($file_path, $lang);
+	}
+
+	/**
+	 * This function implements language fallback logic
+	 *
+	 * @param string	$path		Path to language directory
+	 * @param string	$filename	Filename to load language strings from
+	 *
+	 * @return string	Relative path to language file
+	 *
+	 * @throws \phpbb\language\exception\language_file_not_exists	When the path to the file cannot be resolved
+	 */
+	protected function get_language_file_path($path, $filename, $locales)
+	{
+		// Language fallback logic
+		foreach ($locales as $locale)
+		{
+			$language_file_path = $path . $locale . '/' . $filename;
+
+			// If we are in install, try to use the updated version, when available
+			if (defined('IN_INSTALL'))
+			{
+				$install_language_path = str_replace('language/', 'install/update/new/language/', $language_file_path);
+				if (file_exists($install_language_path))
+				{
+					return $install_language_path;
+				}
+			}
+
+			if (file_exists($language_file_path))
+			{
+				return $language_file_path;
+			}
+		}
+
+		// The language file is not exist
+		throw new language_file_not_found('Language file ' . $language_file_path . ' couldn\'t be opened.');
+	}
+
+	/**
+	 * Loads language file
+	 *
+	 * @param string	$path	Path to language file to load
+	 * @param array		$lang	Reference of the array of language strings
+	 */
+	protected function load_language_file($path, &$lang)
+	{
+		// BC code for language files with help
+		$help = array();
+
+		// Do not suppress error if in DEBUG mode
+		if (defined('DEBUG'))
+		{
+			include $path;
+		}
+		else
+		{
+			@include $path;
+		}
+
+		if (!empty($help))
+		{
+			$lang['__help'] = array_merge($lang['__help'], $help);
+		}
+	}
+}
-- 
cgit v1.2.1


From 9f1f6f96ceaf0870dabd0cf68c40292682c04aa2 Mon Sep 17 00:00:00 2001
From: MateBartus <mate.bartus@gmail.com>
Date: Tue, 28 Apr 2015 22:52:43 +0200
Subject: [ticket/13762] Optional DI injectable default language module array

PHPBB3-13762
---
 phpBB/phpbb/language/language.php | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'phpBB/phpbb/language')

diff --git a/phpBB/phpbb/language/language.php b/phpBB/phpbb/language/language.php
index 9c9a3b8df1..3298908365 100644
--- a/phpBB/phpbb/language/language.php
+++ b/phpBB/phpbb/language/language.php
@@ -73,9 +73,10 @@ class language
 	/**
 	 * Constructor
 	 *
-	 * @param \phpbb\language\language_file_loader	$loader	Language file loader
+	 * @param \phpbb\language\language_file_loader	$loader			Language file loader
+	 * @param array|null							$common_modules	Array of common language modules to load (optional)
 	 */
-	public function __construct(language_file_loader $loader)
+	public function __construct(language_file_loader $loader, $common_modules = null)
 	{
 		$this->loader = $loader;
 
@@ -92,9 +93,17 @@ class language
 		);
 
 		// Common language files
-		$this->common_language_files = array(
-			'common',
-		);
+		if (is_array($common_modules))
+		{
+			$this->common_language_files = $common_modules;
+		}
+		else
+		{
+			$this->common_language_files = array(
+				'common',
+			);
+		}
+
 		$this->common_language_files_loaded = false;
 
 		$this->language_fallback = array(self::FALLBACK_LANGUAGE);
-- 
cgit v1.2.1


From 8ce0a64a16aa9d1b8edcef684c528cf44bc39cc6 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 17 May 2015 21:18:17 +0200
Subject: [ticket/13844] Remove hacky code for the help array

PHPBB3-13844
---
 phpBB/phpbb/language/language.php             |  7 +------
 phpBB/phpbb/language/language_file_loader.php | 12 +++---------
 2 files changed, 4 insertions(+), 15 deletions(-)

(limited to 'phpBB/phpbb/language')

diff --git a/phpBB/phpbb/language/language.php b/phpBB/phpbb/language/language.php
index 3298908365..b2b9f5ce12 100644
--- a/phpBB/phpbb/language/language.php
+++ b/phpBB/phpbb/language/language.php
@@ -83,10 +83,7 @@ class language
 		// Set up default information
 		$this->user_language		= false;
 		$this->default_language		= false;
-		$this->lang					= array(
-			// For BC with user::help array
-			'__help' => array(),
-		);
+		$this->lang					= array();
 		$this->loaded_language_sets	= array(
 			'core'	=> array(),
 			'ext'	=> array(),
@@ -155,8 +152,6 @@ class language
 	/**
 	 * Add Language Items
 	 *
-	 * Note: $use_help is assigned where needed (only use them to force inclusion).
-	 *
 	 * Examples:
 	 * <code>
 	 * $component = array('posting');
diff --git a/phpBB/phpbb/language/language_file_loader.php b/phpBB/phpbb/language/language_file_loader.php
index 510a29279a..9862cfc3aa 100644
--- a/phpBB/phpbb/language/language_file_loader.php
+++ b/phpBB/phpbb/language/language_file_loader.php
@@ -154,10 +154,12 @@ class language_file_loader
 	 *
 	 * @return string	Relative path to language file
 	 *
-	 * @throws \phpbb\language\exception\language_file_not_exists	When the path to the file cannot be resolved
+	 * @throws \phpbb\language\exception\language_file_not_found	When the path to the file cannot be resolved
 	 */
 	protected function get_language_file_path($path, $filename, $locales)
 	{
+		$language_file_path = $filename;
+
 		// Language fallback logic
 		foreach ($locales as $locale)
 		{
@@ -191,9 +193,6 @@ class language_file_loader
 	 */
 	protected function load_language_file($path, &$lang)
 	{
-		// BC code for language files with help
-		$help = array();
-
 		// Do not suppress error if in DEBUG mode
 		if (defined('DEBUG'))
 		{
@@ -203,10 +202,5 @@ class language_file_loader
 		{
 			@include $path;
 		}
-
-		if (!empty($help))
-		{
-			$lang['__help'] = array_merge($lang['__help'], $help);
-		}
 	}
 }
-- 
cgit v1.2.1


From 41efc55be99a3a56ed8e1af7ab1bcb0f9d9d88ea Mon Sep 17 00:00:00 2001
From: Tristan Darricau <tristan.darricau@sensiolabs.com>
Date: Sat, 30 May 2015 12:27:31 +0200
Subject: [ticket/13896] Fix coding style

PHPBB3-13896
---
 phpBB/phpbb/language/language_file_loader.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/language')

diff --git a/phpBB/phpbb/language/language_file_loader.php b/phpBB/phpbb/language/language_file_loader.php
index 9862cfc3aa..359202fd63 100644
--- a/phpBB/phpbb/language/language_file_loader.php
+++ b/phpBB/phpbb/language/language_file_loader.php
@@ -154,7 +154,7 @@ class language_file_loader
 	 *
 	 * @return string	Relative path to language file
 	 *
-	 * @throws \phpbb\language\exception\language_file_not_found	When the path to the file cannot be resolved
+	 * @throws language_file_not_found	When the path to the file cannot be resolved
 	 */
 	protected function get_language_file_path($path, $filename, $locales)
 	{
-- 
cgit v1.2.1


From 97d08d6f56cf448fd4def8a4d29c570da91faa89 Mon Sep 17 00:00:00 2001
From: Mate Bartus <mate.bartus@gmail.com>
Date: Wed, 22 Jul 2015 03:16:16 +0200
Subject: [ticket/13740] Allow language change in the installer

PHPBB3-13740
---
 phpBB/phpbb/language/language.php | 48 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 42 insertions(+), 6 deletions(-)

(limited to 'phpBB/phpbb/language')

diff --git a/phpBB/phpbb/language/language.php b/phpBB/phpbb/language/language.php
index b2b9f5ce12..44131e3da3 100644
--- a/phpBB/phpbb/language/language.php
+++ b/phpBB/phpbb/language/language.php
@@ -109,25 +109,27 @@ class language
 	/**
 	 * Function to set user's language to display.
 	 *
-	 * @param string	$user_lang_iso	ISO code of the User's language
+	 * @param string	$user_lang_iso		ISO code of the User's language
+	 * @param bool		$reload				Whether or not to reload language files
 	 */
-	public function set_user_language($user_lang_iso)
+	public function set_user_language($user_lang_iso, $reload = false)
 	{
 		$this->user_language = $user_lang_iso;
 
-		$this->set_fallback_array();
+		$this->set_fallback_array($reload);
 	}
 
 	/**
 	 * Function to set the board's default language to display.
 	 *
 	 * @param string	$default_lang_iso	ISO code of the board's default language
+	 * @param bool		$reload				Whether or not to reload language files
 	 */
-	public function set_default_language($default_lang_iso)
+	public function set_default_language($default_lang_iso, $reload = false)
 	{
 		$this->default_language = $default_lang_iso;
 
-		$this->set_fallback_array();
+		$this->set_fallback_array($reload);
 	}
 
 	/**
@@ -508,9 +510,11 @@ class language
 	/**
 	 * Returns language fallback data
 	 *
+	 * @param bool	$reload	Whether or not to reload language files
+	 *
 	 * @return array
 	 */
-	protected function set_fallback_array()
+	protected function set_fallback_array($reload = false)
 	{
 		$fallback_array = array();
 
@@ -527,6 +531,11 @@ class language
 		$fallback_array[] = self::FALLBACK_LANGUAGE;
 
 		$this->language_fallback = $fallback_array;
+
+		if ($reload)
+		{
+			$this->reload_language_files();
+		}
 	}
 
 	/**
@@ -563,4 +572,31 @@ class language
 		$this->loader->load_extension($extension_name, $component, $this->language_fallback, $this->lang);
 		$this->loaded_language_sets['ext'][$extension_name][$component] = true;
 	}
+
+	/**
+	 * Reload language files
+	 */
+	protected function reload_language_files()
+	{
+		$loaded_files = $this->loaded_language_sets;
+		$this->loaded_language_sets	= array(
+			'core'	=> array(),
+			'ext'	=> array(),
+		);
+
+		// Reload core files
+		foreach ($loaded_files['core'] as $component => $value)
+		{
+			$this->load_core_file($component);
+		}
+
+		// Reload extension files
+		foreach ($loaded_files['ext'] as $ext_name => $ext_info)
+		{
+			foreach ($ext_info as $ext_component => $value)
+			{
+				$this->load_extension($ext_name, $ext_component);
+			}
+		}
+	}
 }
-- 
cgit v1.2.1


From 2b30e632b6e266ef64d075ac0897972a8bb43bf1 Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Thu, 28 May 2015 15:45:47 +0200
Subject: [ticket/12143] Add is_set method to language service

We need that.

PHPBB3-12143
---
 phpBB/phpbb/language/language.php | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

(limited to 'phpBB/phpbb/language')

diff --git a/phpBB/phpbb/language/language.php b/phpBB/phpbb/language/language.php
index 44131e3da3..3ffb466c19 100644
--- a/phpBB/phpbb/language/language.php
+++ b/phpBB/phpbb/language/language.php
@@ -193,6 +193,36 @@ class language
 		}
 	}
 
+	/**
+	 * @param $key array|string		The language key we want to know more about. Can be string or array.
+	 *
+	 * @return bool		Returns whether the language key is set.
+	 */
+	public function is_set($key)
+	{
+		// Load common language files if they not loaded yet
+		if (!$this->common_language_files_loaded)
+		{
+			$this->load_common_language_files();
+		}
+
+		if (is_array($key))
+		{
+			$lang = &$this->lang[array_shift($key)];
+
+			foreach ($key as $_key)
+			{
+				$lang = &$lang[$_key];
+			}
+		}
+		else
+		{
+			$lang = &$this->lang[$key];
+		}
+
+		return isset($lang);
+	}
+
 	/**
 	 * Advanced language substitution
 	 *
-- 
cgit v1.2.1


From 8629eac3933a701d0e763b61bca80741bb5b8b82 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <tristan.darricau@sensiolabs.com>
Date: Sat, 12 Sep 2015 11:15:06 +0200
Subject: [ticket/14158] Add language::lang_array() to avoid using
 call_user_func_array

PHPBB3-14158
---
 phpBB/phpbb/language/language.php | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

(limited to 'phpBB/phpbb/language')

diff --git a/phpBB/phpbb/language/language.php b/phpBB/phpbb/language/language.php
index 3ffb466c19..cc89e172df 100644
--- a/phpBB/phpbb/language/language.php
+++ b/phpBB/phpbb/language/language.php
@@ -238,6 +238,22 @@ class language
 	 * @return string	Return localized string or the language key if the translation is not available
 	 */
 	public function lang()
+	{
+		$args = func_get_args();
+		$key = array_shift($args);
+
+		return $this->lang_array($key, $args);
+	}
+
+	/**
+	 * Act like lang() but takes a key and an array of parameters instead of using variadic
+	 *
+	 * @param string|array	$key	Language key
+	 * @param array			$args	Parameters
+	 *
+	 * @return array|string
+	 */
+	public function lang_array($key, $args = [])
 	{
 		// Load common language files if they not loaded yet
 		if (!$this->common_language_files_loaded)
@@ -245,9 +261,6 @@ class language
 			$this->load_common_language_files();
 		}
 
-		$args = func_get_args();
-		$key = $args[0];
-
 		if (is_array($key))
 		{
 			$lang = &$this->lang[array_shift($key)];
@@ -271,26 +284,25 @@ class language
 		// If the language entry is a string, we simply mimic sprintf() behaviour
 		if (is_string($lang))
 		{
-			if (sizeof($args) == 1)
+			if (count($args) === 0)
 			{
 				return $lang;
 			}
 
 			// Replace key with language entry and simply pass along...
-			$args[0] = $lang;
-			return call_user_func_array('sprintf', $args);
+			return vsprintf($lang, $args);
 		}
 		else if (sizeof($lang) == 0)
 		{
 			// If the language entry is an empty array, we just return the language key
-			return $args[0];
+			return $key;
 		}
 
 		// It is an array... now handle different nullar/singular/plural forms
 		$key_found = false;
 
 		// We now get the first number passed and will select the key based upon this number
-		for ($i = 1, $num_args = sizeof($args); $i < $num_args; $i++)
+		for ($i = 0, $num_args = sizeof($args); $i < $num_args; $i++)
 		{
 			if (is_int($args[$i]) || is_float($args[$i]))
 			{
@@ -337,8 +349,7 @@ class language
 		}
 
 		// Use the language string we determined and pass it to sprintf()
-		$args[0] = $lang[$key_found];
-		return call_user_func_array('sprintf', $args);
+		return vsprintf($lang[$key_found], $args);
 	}
 
 	/**
-- 
cgit v1.2.1


From 8aa8173ebfcd1f00d26f9a3dde5a7101579f2ed2 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <tristan.darricau@sensiolabs.com>
Date: Sat, 12 Sep 2015 15:14:42 +0200
Subject: [ticket/14158] Fix 5.3 compatibility

PHPBB3-14158
---
 phpBB/phpbb/language/language.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/language')

diff --git a/phpBB/phpbb/language/language.php b/phpBB/phpbb/language/language.php
index cc89e172df..47f055f56a 100644
--- a/phpBB/phpbb/language/language.php
+++ b/phpBB/phpbb/language/language.php
@@ -253,7 +253,7 @@ class language
 	 *
 	 * @return array|string
 	 */
-	public function lang_array($key, $args = [])
+	public function lang_array($key, $args = array())
 	{
 		// Load common language files if they not loaded yet
 		if (!$this->common_language_files_loaded)
-- 
cgit v1.2.1


From 3ac10ef5443a1bbc8aa2f13b7fb98f33ca2ff702 Mon Sep 17 00:00:00 2001
From: Mate Bartus <mate.bartus@gmail.com>
Date: Wed, 28 Oct 2015 14:14:49 +0100
Subject: [ticket/14044] Solve missing email template error

PHPBB3-14044
---
 phpBB/phpbb/language/language.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'phpBB/phpbb/language')

diff --git a/phpBB/phpbb/language/language.php b/phpBB/phpbb/language/language.php
index 47f055f56a..c4e48a4c0d 100644
--- a/phpBB/phpbb/language/language.php
+++ b/phpBB/phpbb/language/language.php
@@ -548,6 +548,16 @@ class language
 		}
 	}
 
+	/**
+	 * Returns the ISO code of the used language
+	 *
+	 * @return string	The ISO code of the currently used language
+	 */
+	public function get_used_language()
+	{
+		return $this->language_fallback[0];
+	}
+
 	/**
 	 * Returns language fallback data
 	 *
-- 
cgit v1.2.1


From 0990894cf87598f36bbc8c8bfbaa783267e17d51 Mon Sep 17 00:00:00 2001
From: Mate Bartus <mate.bartus@gmail.com>
Date: Fri, 30 Oct 2015 15:25:27 +0100
Subject: [ticket/14044] Patch language::set_fallback_array()

PHPBB3-14044
---
 phpBB/phpbb/language/language.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/phpbb/language')

diff --git a/phpBB/phpbb/language/language.php b/phpBB/phpbb/language/language.php
index c4e48a4c0d..382d4db89e 100644
--- a/phpBB/phpbb/language/language.php
+++ b/phpBB/phpbb/language/language.php
@@ -569,12 +569,12 @@ class language
 	{
 		$fallback_array = array();
 
-		if ($this->user_language !== false)
+		if ($this->user_language)
 		{
 			$fallback_array[] = $this->user_language;
 		}
 
-		if ($this->default_language !== false)
+		if ($this->default_language)
 		{
 			$fallback_array[] = $this->default_language;
 		}
-- 
cgit v1.2.1


From f5ca8c363bbd6776e9be8d2e05c3cf54685b0a59 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <tristan.darricau@sensiolabs.com>
Date: Tue, 26 Jan 2016 22:32:08 +0100
Subject: [ticket/14432] Adds a method to get raw language values

PHPBB3-14432
---
 phpBB/phpbb/language/language.php | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

(limited to 'phpBB/phpbb/language')

diff --git a/phpBB/phpbb/language/language.php b/phpBB/phpbb/language/language.php
index 382d4db89e..42429c2c07 100644
--- a/phpBB/phpbb/language/language.php
+++ b/phpBB/phpbb/language/language.php
@@ -246,14 +246,14 @@ class language
 	}
 
 	/**
-	 * Act like lang() but takes a key and an array of parameters instead of using variadic
+	 * Returns the raw value associated to a language key or the language key no translation is available.
+	 * No parameter substitution is performed, can be a string or an array.
 	 *
 	 * @param string|array	$key	Language key
-	 * @param array			$args	Parameters
 	 *
 	 * @return array|string
 	 */
-	public function lang_array($key, $args = array())
+	public function lang_raw($key)
 	{
 		// Load common language files if they not loaded yet
 		if (!$this->common_language_files_loaded)
@@ -281,6 +281,26 @@ class language
 			return $key;
 		}
 
+		return $lang;
+	}
+
+	/**
+	 * Act like lang() but takes a key and an array of parameters instead of using variadic
+	 *
+	 * @param string|array	$key	Language key
+	 * @param array			$args	Parameters
+	 *
+	 * @return string
+	 */
+	public function lang_array($key, $args = array())
+	{
+		$lang = $this->lang_raw($key);
+
+		if ($lang === $key)
+		{
+			return $key;
+		}
+
 		// If the language entry is a string, we simply mimic sprintf() behaviour
 		if (is_string($lang))
 		{
-- 
cgit v1.2.1


From 1a6850417439b3b05b5971a9c21ebcffe04967ef Mon Sep 17 00:00:00 2001
From: Paul Sohier <paul999@phpbb.com>
Date: Sat, 21 May 2016 19:50:12 +0200
Subject: [ticket/14645] Language pack not reconised when using a symlink

Symfony finder does not follow symlinks by default.
With this change it does, so a user is able to have the language pack outside
the phpBB directory, and linked with a symlink into phpBB/language/

PHPBB3-14645
---
 phpBB/phpbb/language/language_file_helper.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/phpbb/language')

diff --git a/phpBB/phpbb/language/language_file_helper.php b/phpBB/phpbb/language/language_file_helper.php
index 18d7b62e21..85de034fb8 100644
--- a/phpBB/phpbb/language/language_file_helper.php
+++ b/phpBB/phpbb/language/language_file_helper.php
@@ -47,6 +47,7 @@ class language_file_helper
 		$finder->files()
 			->name('iso.txt')
 			->depth('== 1')
+			->followLinks()
 			->in($this->phpbb_root_path . 'language');
 
 		$available_languages = array();
-- 
cgit v1.2.1