CoreLibs/development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add LOCALE config settings

Browse Source 
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
This commit is contained in:
Clemens Schwaighofer
2022-04-12 20:14:41 +09:00
parent 3f374a2cd7
commit d553c1364f
3 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
www/configs/config.host.php
View File

@@ -27,7 +27,9 @@ $__LOCAL_CONFIG = [
'db_host' => 'test', 'db_host' => 'test',
'location' => 'test', 'location' => 'test',
'debug_flag' => true, 'debug_flag' => true,
'site_lang' => 'en_utf8', 'site_lang' => 'en_US',
'site_encoding' => 'UTF-8',
'site_locale' => 'en_US.UTF-8',
'login_enabled' => true 'login_enabled' => true
]; ];
@@ -45,7 +47,10 @@ $SITE_CONFIG = [
// show DEBUG override // show DEBUG override
'debug_flag' => true, 'debug_flag' => true,
// site language // 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 // enable/disable login override
'login_enabled' => true 'login_enabled' => true
], ],

12
www/configs/config.master.php
View File

@@ -65,8 +65,10 @@ define('JS', 'javascript' . DIRECTORY_SEPARATOR);
define('TABLE_ARRAYS', 'table_arrays' . DIRECTORY_SEPARATOR); define('TABLE_ARRAYS', 'table_arrays' . DIRECTORY_SEPARATOR);
// smarty libs path // smarty libs path
define('SMARTY', 'Smarty' . DIRECTORY_SEPARATOR); define('SMARTY', 'Smarty' . DIRECTORY_SEPARATOR);
// po langs // po langs [DEPRECAED: use LOCALE]
define('LANG', 'lang' . DIRECTORY_SEPARATOR); define('LANG', 'lang' . DIRECTORY_SEPARATOR);
// po locale file
define('LOCALE', 'locale' . DIRECTORY_SEPARATOR);
// cache path // cache path
define('CACHE', 'cache' . DIRECTORY_SEPARATOR); define('CACHE', 'cache' . DIRECTORY_SEPARATOR);
// temp path // temp path
@@ -158,9 +160,11 @@ define('CACHE_ID', 'CACHE_' . BASE_NAME . '_' . SERVER_NAME_HASH);
define('COMPILE_ID', 'COMPILE_' . BASE_NAME . '_' . SERVER_NAME_HASH); define('COMPILE_ID', 'COMPILE_' . BASE_NAME . '_' . SERVER_NAME_HASH);
/************* LANGUAGE / ENCODING *******/ /************* LANGUAGE / ENCODING *******/
define('DEFAULT_LANG', 'en_utf8'); define('DEFAULT_LANG', 'en_US');
// default web page encoding setting // default web page encoding setting
define('DEFAULT_ENCODING', 'UTF-8'); define('DEFAULT_ENCODING', 'UTF-8');
// default lang + encoding
define('DEFAULT_LOCALE', 'en_US.UTF-8');
/************* LOGGING *******************/ /************* LOGGING *******************/
// below two can be defined here, but they should be // below two can be defined here, but they should be
@@ -258,7 +262,9 @@ $GLOBALS['DB_CONFIG'] = DB_CONFIG;
// debug settings, site lang, etc // debug settings, site lang, etc
define('TARGET', $SITE_CONFIG[HOST_NAME]['location'] ?? 'test'); define('TARGET', $SITE_CONFIG[HOST_NAME]['location'] ?? 'test');
define('DEBUG', $SITE_CONFIG[HOST_NAME]['debug_flag'] ?? false); 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('LOGIN_ENABLED', $SITE_CONFIG[HOST_NAME]['login_enabled'] ?? false);
define('AUTH', $SITE_CONFIG[HOST_NAME]['auth'] ?? false); define('AUTH', $SITE_CONFIG[HOST_NAME]['auth'] ?? false);
// paths // paths

5
www/configs/config.other.php
View File

@@ -21,7 +21,10 @@ $paths = [
]; ];
// find convert // find convert
foreach ($paths as $path) { 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 // image magick convert location
define('CONVERT', $path . DIRECTORY_SEPARATOR . 'convert'); define('CONVERT', $path . DIRECTORY_SEPARATOR . 'convert');
break; break;