From ea92afafc5da3e146a64de263ab09b3e161ef58e Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 25 Aug 2023 15:09:13 +0200
Subject: [PATCH] system: move development languages to development flag
 instead

This avoids carrying a diff between master and respective stable.
---
 src/etc/inc/config.inc |  4 ++++
 src/etc/inc/system.inc | 11 ++++++++---
 src/www/guiconfig.inc  |  1 +
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/etc/inc/config.inc b/src/etc/inc/config.inc
index 0e01d6d8c..be2ac7d8b 100644
--- a/src/etc/inc/config.inc
+++ b/src/etc/inc/config.inc
@@ -59,6 +59,10 @@ final class product
         } else {
             self::$data['product_booting'] = false;
         }
+
+        /* development flag */
+        $develflag = '/var/run/development';
+        self::$data['product_development'] = file_exists($develflag);
     }
 
     private function __clone()
diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc
index 3f432371b..e15909312 100644
--- a/src/etc/inc/system.inc
+++ b/src/etc/inc/system.inc
@@ -242,7 +242,7 @@ function system_resolvconf_generate($verbose = false)
 
 function get_locale_list()
 {
-    $locales = array();
+    $locales = [];
 
     /* first one is the default */
     $locales['en_US'] = gettext('English');
@@ -254,13 +254,18 @@ function get_locale_list()
     $locales['ja_JP'] = gettext('Japanese');
     $locales['ko_KR'] = gettext('Korean');
     $locales['no_NO'] = gettext('Norwegian');
-    $locales['pl_PL'] = gettext('Polish'); /* development only */
+    $locales['pl_PL'] = gettext('Polish');
     $locales['pt_BR'] = gettext('Portuguese (Brazil)');
     $locales['pt_PT'] = gettext('Portuguese (Portugal)');
     $locales['ru_RU'] = gettext('Russian');
     $locales['es_ES'] = gettext('Spanish');
     $locales['tr_TR'] = gettext('Turkish');
-    $locales['vi_VN'] = gettext('Vietnamese'); /* development only */
+    $locales['vi_VN'] = gettext('Vietnamese');
+
+    if (!product::getInstance()->development()) {
+        unset($locales['pl_PL']);
+        unset($locales['vi_VN']);
+    }
 
     return $locales;
 }
diff --git a/src/www/guiconfig.inc b/src/www/guiconfig.inc
index 2609a9aae..7911fa1ab 100644
--- a/src/www/guiconfig.inc
+++ b/src/www/guiconfig.inc
@@ -31,6 +31,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+/* check before 'product' class is known to catch all errors */
 if (file_exists('/var/run/development')) {
     ini_set('display_errors', 0);
 }