From d553c1364f989c1a0df2419bdd3cdc2d926ed306 Mon Sep 17 00:00:00 2001
From: Clemens Schwaighofer <clemens.schwaighofer@egplusww.com>
Date: Tue, 12 Apr 2022 20:14:41 +0900
Subject: [PATCH] Add LOCALE config settings

next to the current lang/encoding add locale that is a combination of
both.
Also add a locale folder constant

the default LANG variables (DEFAULT_LANG, SITE_LANG) change from en_utf8
to en_US
new DEFAULT_LOCALE with en_US.UTF-8
---
 www/configs/config.host.php   |  9 +++++++--
 www/configs/config.master.php | 12 +++++++++---
 www/configs/config.other.php  |  5 ++++-
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/www/configs/config.host.php b/www/configs/config.host.php
index e5d491d2..b6d00a2c 100644
--- a/www/configs/config.host.php
+++ b/www/configs/config.host.php
@@ -27,7 +27,9 @@ $__LOCAL_CONFIG = [
 	'db_host' => 'test',
 	'location' => 'test',
 	'debug_flag' => true,
-	'site_lang' => 'en_utf8',
+	'site_lang' => 'en_US',
+	'site_encoding' => 'UTF-8',
+	'site_locale' => 'en_US.UTF-8',
 	'login_enabled' => true
 ];
 
@@ -45,7 +47,10 @@ $SITE_CONFIG = [
 		// show DEBUG override
 		'debug_flag' => true,
 		// site language
-		'site_lang' => 'en_utf8',
+		'site_lang' => 'en_US',
+		'site_encoding' => 'UTF-8',
+		// lang + encoding
+		'site_locale' => 'en_US.UTF-8',
 		// enable/disable login override
 		'login_enabled' => true
 	],
diff --git a/www/configs/config.master.php b/www/configs/config.master.php
index d91e0470..1f526456 100644
--- a/www/configs/config.master.php
+++ b/www/configs/config.master.php
@@ -65,8 +65,10 @@ define('JS', 'javascript' . DIRECTORY_SEPARATOR);
 define('TABLE_ARRAYS', 'table_arrays' . DIRECTORY_SEPARATOR);
 // smarty libs path
 define('SMARTY', 'Smarty' . DIRECTORY_SEPARATOR);
-// po langs
+// po langs [DEPRECAED: use LOCALE]
 define('LANG', 'lang' . DIRECTORY_SEPARATOR);
+// po locale file
+define('LOCALE', 'locale' . DIRECTORY_SEPARATOR);
 // cache path
 define('CACHE', 'cache' . DIRECTORY_SEPARATOR);
 // temp path
@@ -158,9 +160,11 @@ define('CACHE_ID', 'CACHE_' . BASE_NAME . '_' . SERVER_NAME_HASH);
 define('COMPILE_ID', 'COMPILE_' . BASE_NAME . '_' . SERVER_NAME_HASH);
 
 /************* LANGUAGE / ENCODING *******/
-define('DEFAULT_LANG', 'en_utf8');
+define('DEFAULT_LANG', 'en_US');
 // default web page encoding setting
 define('DEFAULT_ENCODING', 'UTF-8');
+// default lang + encoding
+define('DEFAULT_LOCALE', 'en_US.UTF-8');
 
 /************* LOGGING *******************/
 // below two can be defined here, but they should be
@@ -258,7 +262,9 @@ $GLOBALS['DB_CONFIG'] = DB_CONFIG;
 // debug settings, site lang, etc
 define('TARGET', $SITE_CONFIG[HOST_NAME]['location'] ?? 'test');
 define('DEBUG', $SITE_CONFIG[HOST_NAME]['debug_flag'] ?? false);
-define('SITE_LANG', $SITE_CONFIG[HOST_NAME]['site_lang'] ?? 'en_utf8');
+define('SITE_LANG', $SITE_CONFIG[HOST_NAME]['site_lang'] ?? DEFAULT_LANG);
+define('SITE_ENCODING', $SITE_CONFIG[HOST_NAME]['site_encoding'] ?? DEFAULT_ENCODING);
+define('SITE_LOCALE', $SITE_CONFIG[HOST_NAME]['site_locale'] ?? DEFAULT_LOCALE);
 define('LOGIN_ENABLED', $SITE_CONFIG[HOST_NAME]['login_enabled'] ?? false);
 define('AUTH', $SITE_CONFIG[HOST_NAME]['auth'] ?? false);
 // paths
diff --git a/www/configs/config.other.php b/www/configs/config.other.php
index 4930b398..38656357 100644
--- a/www/configs/config.other.php
+++ b/www/configs/config.other.php
@@ -21,7 +21,10 @@ $paths = [
 ];
 // find convert
 foreach ($paths as $path) {
-	if (file_exists($path . DIRECTORY_SEPARATOR . 'convert') && is_file($path . DIRECTORY_SEPARATOR . 'convert')) {
+	if (
+		file_exists($path . DIRECTORY_SEPARATOR . 'convert') &&
+		is_file($path . DIRECTORY_SEPARATOR . 'convert')
+	) {
 		// image magick convert location
 		define('CONVERT', $path . DIRECTORY_SEPARATOR . 'convert');
 		break;