Fix phpBB 4 language system

Author: iMattPro

includes/class_qi.php

@@ -280,19 +280,45 @@ public static function get_lang_select($lang_path, $config_var, $get_var = '')
 				continue;
 			}
 
-			$file = "$lang_path/$lang/iso.txt";
+			$lang_iso = $lang_path . $lang . DIRECTORY_SEPARATOR . 'iso.txt'; // for phpBB 3.x languages
+			$lang_composer = $lang_path . $lang . DIRECTORY_SEPARATOR . 'composer.json'; // for phpBB 4.0 languages
 
-			if (file_exists($file))
+			if (file_exists($lang_iso))
 			{
-				$rows = file($file, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
-
-				// Always show the English language name, except for the "active" language.
-				$lang_options[] = [
-					'name' => ($lang === $user_lang) ? $rows[1] : $rows[0],
-					'value' => $lang,
-					'selected' => $lang === $user_lang,
-				];
+				$rows = file($lang_iso, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+
+				$english_name = $rows[0];
+				$local_name = $rows[1];
+			}
+			else if (file_exists($lang_composer))
+			{
+				global $phpbb_root_path;
+				$language_helper = new \phpbb\language\language_file_helper($phpbb_root_path);
+
+				try
+				{
+					$lang_pack = $language_helper->get_language_data_from_composer_file($lang_composer);
+				}
+				catch (\DomainException $e)
+				{
+					trigger_error('LANGUAGE_PACK_MISSING', E_USER_WARNING);
+				}
+
+				$english_name = $lang_pack['name'];
+				$local_name = $lang_pack['local_name'];
 			}
+			else
+			{
+				// worst case just use the iso name if nothing above worked
+				$local_name = $english_name = $lang;
+			}
+
+			// Always show the English language name, except for the "active" language.
+			$lang_options[] = [
+				'name' => ($lang === $user_lang) ? $local_name : $english_name,
+				'value' => $lang,
+				'selected' => $lang === $user_lang,
+			];
 		}
 
 		return $lang_options;

language/en/qi.php

@@ -175,6 +175,7 @@
 
 	'JAVASCRIPT_DISABLED_ALERT'	=> '<strong>Javascript is disabled!</strong> Please enable Javascript for full functionality.',
 
+	'LANGUAGE_PACK_MISSING'	=> 'The source phpBB board does not have a valid language pack. Please download a fresh copy of phpBB and try again.',
 	'LOAD'					=> 'Load',
 	'LOG_INSTALL_INSTALLED_QI'	=> '<strong>Installed by phpBB QuickInstall version %s</strong>',
 	'LOREM_IPSUM'			=> 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.',

modules/qi_settings.php

@@ -19,7 +19,7 @@ class qi_settings
 {
 	public function __construct()
 	{
-		global $settings, $template, $user, $quickinstall_path, $mode, $alt_env, $alt_env_missing;
+		global $settings, $template, $user, $quickinstall_path, $phpbb_root_path, $mode, $alt_env, $alt_env_missing;
 
 		$saved = false;
 		$config_text = '';
@@ -83,7 +83,7 @@ public function __construct()
 			'ALT_ENV'		=> !empty($alt_env) ? $alt_env : false,
 			'PROFILES'		=> $settings->get_profiles(),
 			'QI_LANG'		=> qi::get_lang_select("{$quickinstall_path}language/", 'qi_lang', 'lang'),
-			'PHPBB_LANG'	=> qi::get_lang_select("{$quickinstall_path}sources/phpBB3/language/", 'default_lang'),
+			'PHPBB_LANG'	=> qi::get_lang_select("{$phpbb_root_path}/language/", 'default_lang'),
 
 			'CONFIG_TEXT'   => htmlspecialchars($config_text),