From a87f19d35eea536ff732cca55d1dd01ae7cd3d19 Mon Sep 17 00:00:00 2001
From: JediKev <kevin@enhancesoft.com>
Date: Tue, 3 Jul 2018 13:31:30 -0500
Subject: [PATCH] issue: Language Pack Locale Mismatch
This addresses issue 4325 where the Language Pack Locales are mismatched.
The Locale for the first language is displayed on the second language,
etc. This updates the `$manifest` variable to be set before we display
data so the correct `MANIFEST` file is included and all language data is
displayed correctly.
---
include/staff/system.inc.php | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/include/staff/system.inc.php b/include/staff/system.inc.php
index a1341fd01..ecbbe9aa7 100644
--- a/include/staff/system.inc.php
+++ b/include/staff/system.inc.php
@@ -183,16 +183,18 @@ if (!$lv) { ?>
$p = $info['path'];
if ($info['phar'])
$p = 'phar://' . $p;
+ $manifest = (file_exists($p . '/MANIFEST.php')) ? (include $p . '/MANIFEST.php') : null;
?>
<h3><strong><?php echo Internationalization::getLanguageDescription($info['code']); ?></strong>
- — <?php echo $manifest['Language']; ?>
+ <?php if ($manifest) { ?>
+ — <?php echo $manifest['Language']; ?>
+ <?php } ?>
<?php if ($info['phar'])
Plugin::showVerificationBadge($info['path']); ?>
</h3>
<div><?php echo sprintf('<code>%s</code> — %s', $info['code'],
str_replace(ROOT_DIR, '', $info['path'])); ?>
-<?php if (file_exists($p . '/MANIFEST.php')) {
- $manifest = (include $p . '/MANIFEST.php'); ?>
+<?php if ($manifest) { ?>
<br/> <?php echo __('Version'); ?>: <?php echo $manifest['Version'];
?>, <?php echo sprintf(__('for version %s'),
'v'.($manifest['Phrases-Version'] ?: '1.9')); ?>
--
GitLab