Skip to content

armgit / Vvveb

Public Imported from GitHub
0

Powerful and easy to use cms to build websites, blogs or ecommerce stores.

Language rtl support

givanz57089caba84f
diff --git a/admin/controller/base.php b/admin/controller/base.php
index f2261be..b447820 100755
--- a/admin/controller/base.php
+++ b/admin/controller/base.php
@@ -57,8 +57,8 @@ class Base {
if ($site_id) {
$site = Sites::getSiteById($site_id);
}
-
- if (!$site_id || !$site) {
+
+ if (! $site_id || ! $site) {
$site = Sites::getDefault();
}
@@ -99,7 +99,7 @@ class Base {
];
$custom_posts_types = \Vvveb\getSetting('post', 'types', []);
- $custom_posts_types += $default_custom_posts;
+ $custom_posts_types += $default_custom_posts;
list($custom_posts_types) = Event::trigger(__CLASS__, __FUNCTION__, $custom_posts_types);
$custom_post_menu = \Vvveb\config('custom-post-menu', []);
@@ -166,7 +166,7 @@ class Base {
];
$custom_products_types = \Vvveb\getSetting('product', 'types', []);
- $custom_products_types += $default_custom_products;
+ $custom_products_types += $default_custom_products;
list($custom_products_types) = Event::trigger(__CLASS__, __FUNCTION__, $custom_products_types);
$custom_product_menu = \Vvveb\config('custom-product-menu', []);
@@ -224,7 +224,7 @@ class Base {
protected function permissions() {
$module = strtolower(FrontController::getModuleName());
$action = strtolower(FrontController::getActionName());
- $action = $action ? '/' . $action : '';
+ $action = ($action && $action != 'index') ? '/' . $action : '';
$permission = $module . $action;
//if current module/action does not have permission then show permission denied page
@@ -238,7 +238,7 @@ class Base {
//get current controller methods to check for permission
$methods = get_class_methods($this);
//$methods = array_map(fn ($value) => "$module/$value", $methods);
- $methods = array_map(function ($value) use ($module) {return "$module/$value"; }, $methods);
+ $methods = array_map(function ($value) use ($module) {return ($value == 'index') ? $module : "$module/$value"; }, $methods);
//check if controller requires additional permission check
if (isset($this->additionalPermissionCheck)) {
@@ -262,7 +262,7 @@ class Base {
if (is_array($v)) {
if (isset($v['url'])) {
if (isset($v['module'])) {
- $permissions[$v['url']] = ($v['module'] ?? '') . (isset($v['action']) ? '/' . $v['action'] : '');
+ $permissions[$v['url']] = ($v['module'] ?? '') . ((isset($v['action']) && $v['action'] != 'index') ? '/' . $v['action'] : '');
} else {
$permissions[$v['url']] = \Vvveb\pregMatch('/module=([^&$]+)/', $v['url'], 1);
}
@@ -287,21 +287,25 @@ class Base {
}
}
- protected function language($defaultLanguage = false, $defaultLanguageId = false) {
+ protected function language($defaultLanguage = false, $defaultLanguageId = false, $defaultLocale = false) {
$languages = availableLanguages();
$default_language = $this->session->get('default_language');
$default_language_id = $this->session->get('default_language_id');
- $language = $this->session->get('language');
- $language_id = $this->session->get('language_id');
+ $default_locale = $this->session->get('default_locale');
$site_language = false;
if (($lang = ($this->request->post['language'] ?? false)) && ! is_array($lang)) {
- $language = filter('/[A-Za-z_-]+/', $lang, 50);
- $this->session->set('language', $language);
- $this->session->set('language_id', $languages[$language]['language_id']);
- $default_language = false; //recheck default language
- clearLanguageCache($language);
+ $language = filter('/[A-Za-z_-]+/', $lang, 10);
+
+ if (isset($languages[$language])) {
+ $this->session->set('language', $language);
+ $this->session->set('language_id', $languages[$language]['language_id']);
+ $this->session->set('locale', $languages[$language]['locale']);
+ $this->session->set('rtl', $languages[$language]['rtl'] ?? false);
+ $default_language = false; //recheck default language
+ clearLanguageCache($language);
+ }
}
if (! $default_language) {
@@ -310,11 +314,14 @@ class Base {
if ($defaultLanguageId && ($defaultLanguageId == $lang['language_id'])) {
$site_language = $code;
$site_language_id = $lang['language_id'];
+ $site_locale = $lang['locale'];
}
+
//set global default language
if ($lang['default']) {
$default_language = $code;
$default_language_id = $lang['language_id'];
+ $default_locale = $lang['locale'];
break;
}
@@ -323,39 +330,53 @@ class Base {
if ($site_language) {
$default_language = $site_language;
$default_language_id = $site_language_id;
+ $default_locale = $site_locale;
}
//no valid default site or global language? set english as default
if (! $default_language) {
$default_language = 'en_US';
$default_language_id = 1;
+ $default_locale = 'en-us';
}
$this->session->set('default_language', $default_language);
$this->session->set('default_language_id', $default_language_id);
+ $this->session->set('default_locale', $default_locale);
+ }
+
+ $language = $this->session->get('language') ?? $default_language;
+ $language_id = $this->session->get('language_id') ?? $default_language_id;
+ $locale = $this->session->get('locale') ?? $default_locale;
+ $rtl = $this->session->get('rtl') ?? false;
+
+ //if no default language configured then set first language as current language
+ if (! isset($languages[$language])) {
+ $default_language = key($languages);
+ $lang = $languages[$default_language];
+ $default_language_id = $lang['language_id'] ?? $defaultLanguageId;
+ $default_locale = $lang['locale'] ?? $defaultLocale;
+ $default_rtl = $lang['rtl'] ?? false;
}
//if no language configured then set default language as current language
if (! $language) {
$language = $default_language;
$language_id = $default_language_id;
+ $locale = $default_locale;
+ $rtl = $default_rtl;
$this->session->set('language', $language);
$this->session->set('language_id', $language_id);
+ $this->session->set('locale', $locale);
+ $this->session->set('rtl', $rtl);
}
- //if no default language configured then set first language as current language
- if (! isset($languages[$language])) {
- $language = key($languages);
- $this->session->set('language', $language);
- $this->session->set('language_id', $languages[$language]['language_id'] ?? $defaultLanguageId);
- }
-
- $language = $request->request['language'] ?? $this->session->get('language') ?? 'en_US';
- $language_id = $request->request['language_id'] ?? $this->session->get('language_id') ?? $defaultLanguageId;
-
$this->global['language'] = $language;
+ $this->global['locale'] = $locale;
$this->global['language_id'] = $language_id;
+ $this->global['rtl'] = $rtl;
$this->global['default_language'] = $default_language;
+ $this->global['default_locale'] = $default_locale;
$this->global['default_language_id'] = $default_language_id;
setLanguage($language);
@@ -516,6 +537,8 @@ class Base {
return;
}
+ $this->view->global = $this->global;
+
//send to view for button visibillity check
$this->view->actionPermissions = $this->actionPermissions ?? [];
$this->view->modulePermissions = $this->modulePermissions ?? [];
diff --git a/admin/controller/localization/language.php b/admin/controller/localization/language.php
index 7561498..c9b2229 100755
--- a/admin/controller/localization/language.php
+++ b/admin/controller/localization/language.php
@@ -36,7 +36,7 @@ class Language extends Crud {
protected $installUrl = 'https://raw.githubusercontent.com/Vvveb/{code}/master/LC_MESSAGES/';
- protected $files = ['vvveb.po', 'landing-theme.po'];
+ protected $files = ['vvveb.po'];
protected $listUrl = 'https://www.vvveb.com/page/contribute#language';
@@ -99,7 +99,7 @@ class Language extends Crud {
$this->view->language_list = $languageList;
- $this->view->status = [1 => 'Active', 0 => 'Inactive'];
- $this->view->default = [0 => 'No', 1 => 'Yes'];
+ $this->view->status = [1 => __('Active'), 0 => __('Inactive')];
+ $this->view->default = $this->view->rtl = [0 => __('No'), 1 => __('Yes')];
}
}
diff --git a/app/controller/base.php b/app/controller/base.php
index 2fdcf1f..ca659fc 100755
--- a/app/controller/base.php
+++ b/app/controller/base.php
@@ -41,20 +41,22 @@ use Vvveb\System\User\User;
class Base {
protected $global;
- protected function language($defaultLanguage = false, $defaultLanguageId = false) {
+ protected function language($defaultLanguage = false, $defaultLanguageId = false, $defaultLocale = false) {
$languages = availableLanguages();
$default_language = $this->session->get('default_language');
$default_language_id = $this->session->get('default_language_id');
- $language = $this->session->get('language');
- $language_id = $this->session->get('language_id');
+ $default_locale = $this->session->get('default_locale');
$site_language = false;
if (($lang = ($this->request->post['language'] ?? $this->request->get['language'] ?? false)) && ! is_array($lang)) {
$language = filter('/[A-Za-z_-]+/', $lang, 10);
+
if (isset($languages[$language])) {
$this->session->set('language', $language);
$this->session->set('language_id', $languages[$language]['language_id']);
+ $this->session->set('locale', $languages[$language]['locale']);
+ $this->session->set('rtl', $languages[$language]['rtl'] ?? false);
$default_language = false; //recheck default language
clearLanguageCache($language);
}
@@ -66,52 +68,69 @@ class Base {
if ($defaultLanguageId && ($defaultLanguageId == $lang['language_id'])) {
$site_language = $code;
$site_language_id = $lang['language_id'];
+ $site_locale = $lang['locale'];
}
+
//set global default language
if ($lang['default']) {
$default_language = $code;
$default_language_id = $lang['language_id'];
+ $default_locale = $lang['locale'];
break;
}
}
-
+
if ($site_language) {
$default_language = $site_language;
$default_language_id = $site_language_id;
+ $default_locale = $site_locale;
}
-
+
//no valid default site or global language? set english as default
if (! $default_language) {
$default_language = 'en_US';
$default_language_id = 1;
+ $default_locale = 'en-us';
}
$this->session->set('default_language', $default_language);
$this->session->set('default_language_id', $default_language_id);
+ $this->session->set('default_locale', $default_locale);
+ }
+
+ $language = $this->session->get('language') ?? $default_language;
+ $language_id = $this->session->get('language_id') ?? $default_language_id;
+ $locale = $this->session->get('locale') ?? $default_locale;
+ $rtl = $this->session->get('rtl') ?? false;
+
+ //if no default language configured then set first language as current language
+ if (! isset($languages[$language])) {
+ $default_language = key($languages);
+ $lang = $languages[$default_language];
+ $default_language_id = $lang['language_id'] ?? $defaultLanguageId;
+ $default_locale = $lang['locale'] ?? $defaultLocale;
+ $default_rtl = $lang['rtl'] ?? false;
}
//if no language configured then set default language as current language
if (! $language) {
$language = $default_language;
$language_id = $default_language_id;
+ $locale = $default_locale;
+ $rtl = $default_rtl;
$this->session->set('language', $language);
$this->session->set('language_id', $language_id);
+ $this->session->set('locale', $locale);
+ $this->session->set('rtl', $rtl);
}
- //if no default language configured then set first language as current language
- if (! isset($languages[$language])) {
- $language = key($languages);
- $this->session->set('language', $language);
- $this->session->set('language_id', $languages[$language]['language_id'] ?? $defaultLanguageId);
- }
-
- $language = $this->session->get('language') ?? 'en_US';
- $language_id = $this->session->get('language_id') ?? $defaultLanguageId;
-
$this->global['language'] = $language;
+ $this->global['locale'] = $locale;
$this->global['language_id'] = $language_id;
+ $this->global['rtl'] = $rtl;
$this->global['default_language'] = $default_language;
+ $this->global['default_locale'] = $default_locale;
$this->global['default_language_id'] = $default_language_id;
setLanguage($language);
@@ -204,7 +223,13 @@ class Base {
list($site) = Event::trigger(__CLASS__, __FUNCTION__, $site);
$user = User::current();
- $site['url'] = '//' . ($_SERVER['HTTP_HOST'] ?? '');
+ /*
+ $site['url'] = \Vvveb\url('index/index',[
+ 'host' => $_SERVER['HTTP_HOST'] ?? false,
+ 'scheme' => $_SERVER['REQUEST_SCHEME'] ?? 'http',
+ ]);
+ */
+ $site['url'] = $siteData['host'] ?? ('//' . ($_SERVER['HTTP_HOST'] ?? ''));
$this->global['site_id'] = SITE_ID ?? 1;
$this->global['user_id'] = $user['user_id'] ?? false;
@@ -221,13 +246,12 @@ class Base {
$site['description'] = $site['description'][$language_id];
}
- $this->view->global = $this->global;
-
if (isset($site['country_id'])) {
$this->initEcommerce($site['country_id'], $site['region_id']);
}
- $view = View :: getInstance();
+ $view = $this->view;
+ $view->global = $this->global;
if ($errors = $this->session->get('errors')) {
if (is_array($errors)) {
diff --git a/install/sql/mysqli/schema/localisation/language.sql b/install/sql/mysqli/schema/localisation/language.sql
index c9e6a4f..88087e5 100755
--- a/install/sql/mysqli/schema/localisation/language.sql
+++ b/install/sql/mysqli/schema/localisation/language.sql
@@ -5,6 +5,7 @@ CREATE TABLE `language` (
`name` varchar(64) NOT NULL,
`code` varchar(12) NOT NULL,
`locale` varchar(20) NOT NULL,
+ `rtl` tinyint NOT NULL DEFAULT 0,
`sort_order` int(3) NOT NULL DEFAULT 0,
`status` tinyint NOT NULL DEFAULT 0,
`default` tinyint NOT NULL DEFAULT 0,
diff --git a/install/sql/pgsql/schema/localisation/language.sql b/install/sql/pgsql/schema/localisation/language.sql
index ddcf02c..870d213 100755
--- a/install/sql/pgsql/schema/localisation/language.sql
+++ b/install/sql/pgsql/schema/localisation/language.sql
@@ -10,6 +10,7 @@ CREATE TABLE language (
"name" varchar(64) NOT NULL,
"code" varchar(12) NOT NULL,
"locale" varchar(20) NOT NULL,
+ "rtl" smallint NOT NULL DEFAULT 0,
"sort_order" int NOT NULL DEFAULT 0,
"status" smallint NOT NULL,
"default" smallint NOT NULL DEFAULT 0,
diff --git a/install/sql/sqlite/schema/localisation/language.sql b/install/sql/sqlite/schema/localisation/language.sql
index 6135896..02e020a 100755
--- a/install/sql/sqlite/schema/localisation/language.sql
+++ b/install/sql/sqlite/schema/localisation/language.sql
@@ -5,6 +5,7 @@ CREATE TABLE `language` (
`name` TEXT NOT NULL,
`code` TEXT NOT NULL,
`locale` TEXT NOT NULL,
+`rtl` TINYINT NOT NULL DEFAULT 0,
`sort_order` INTEGER NOT NULL DEFAULT 0,
`status` TINYINT NOT NULL,
`default` TINYINT NOT NULL DEFAULT 0
@@ -12,4 +13,4 @@ CREATE TABLE `language` (
);
-CREATE INDEX `language_name` ON `language` (`name`);
\ No newline at end of file
+CREATE INDEX `language_name` ON `language` (`name`);
diff --git a/public/admin/default b/public/admin/default
index 789a982..246d05b 160000
--- a/public/admin/default
+++ b/public/admin/default
@@ -1 +1 @@
-Subproject commit 789a9822d32c4de2bf7deb26231a4cd43b4c1ee4
+Subproject commit 246d05b3770f99d4084e9b4ab765b99cbe30d2ca
diff --git a/system/data/languages-list.php b/system/data/languages-list.php
index 397a02a..f3ebd6d 100755
--- a/system/data/languages-list.php
+++ b/system/data/languages-list.php
@@ -76,108 +76,126 @@ return
'name' => 'Arabic (Algeria)',
'charset' => 'UTF-8',
'code' => 'ar-dz',
+ 'rtl' => true,
'emoji' => 'πŸ‡¦πŸ‡·',
],
'ar_BH' => [
'name' => 'Arabic (Bahrain)',
'charset' => 'ISO-8859-6',
'code' => 'ar-bh',
+ 'rtl' => true,
'emoji' => 'πŸ‡¦πŸ‡·',
],
'ar_EG' => [
'name' => 'Arabic (Egypt)',
'charset' => 'ISO-8859-6',
'code' => 'ar-eg',
+ 'rtl' => true,
'emoji' => 'πŸ‡¦πŸ‡·',
],
'ar_IQ' => [
'name' => 'Arabic (Iraq)',
'charset' => 'ISO-8859-6',
'code' => 'ar-iq',
+ 'rtl' => true,
'emoji' => 'πŸ‡¦πŸ‡·',
],
'ar_JO' => [
'name' => 'Arabic (Jordan)',
'charset' => 'ISO-8859-6',
'code' => 'ar-jo',
+ 'rtl' => true,
'emoji' => 'πŸ‡¦πŸ‡·',
],
'ar_KW' => [
'name' => 'Arabic (Kuwait)',
'charset' => 'ISO-8859-6',
'code' => 'ar-kw',
+ 'rtl' => true,
'emoji' => 'πŸ‡¦πŸ‡·',
],
'ar_LB' => [
'name' => 'Arabic (Lebanon)',
'charset' => 'ISO-8859-6',
'code' => 'ar-lb',
+ 'rtl' => true,
'emoji' => 'πŸ‡¦πŸ‡·',
],
'ar_LY' => [
'name' => 'Arabic (Libya)',
'charset' => 'ISO-8859-6',
'code' => 'ar-ly',
+ 'rtl' => true,
'emoji' => 'πŸ‡¦πŸ‡·',
],
'ar_MA' => [
'name' => 'Arabic (Morocco)',
'charset' => 'ISO-8859-6',
'code' => 'ar-ma',
+ 'rtl' => true,
'emoji' => 'πŸ‡¦πŸ‡·',
],
'ar_OM' => [
'name' => 'Arabic (Oman)',
'charset' => 'ISO-8859-6',
'code' => 'ar-om',
+ 'rtl' => true,
'emoji' => 'πŸ‡¦πŸ‡·',
],
'ar_QA' => [
'name' => 'Arabic (Qatar)',
'charset' => 'ISO-8859-6',
'code' => 'ar-qa',
+ 'rtl' => true,
'emoji' => 'πŸ‡¦πŸ‡·',
],
'ar_SA' => [
'name' => 'Arabic (Saudi Arabia)',
'charset' => 'ISO-8859-6',
'code' => 'ar-sa',
+ 'rtl' => true,
'emoji' => 'πŸ‡¦πŸ‡·',
],
'ar_SD' => [
'name' => 'Arabic (Sudan)',
'charset' => 'ISO-8859-6',
'code' => 'ar-sd',
+ 'rtl' => true,
'emoji' => 'πŸ‡¦πŸ‡·',
],
'ar_SY' => [
'name' => 'Arabic (Syria)',
'charset' => 'ISO-8859-6',
'code' => 'ar-sy',
+ 'rtl' => true,
'emoji' => 'πŸ‡¦πŸ‡·',
],
'ar_TN' => [
'name' => 'Arabic (Tunisia)',
'charset' => 'ISO-8859-6',
'code' => 'ar-tn',
+ 'rtl' => true,
'emoji' => 'πŸ‡¦πŸ‡·',
],
'ar_AE' => [
'name' => 'Arabic (United Arab Emirates)',
'charset' => 'ISO-8859-6',
'code' => 'ar-ae',
+ 'rtl' => true,
'emoji' => 'πŸ‡¦πŸ‡·',
],
'ar_YE' => [
'name' => 'Arabic (Yemen)',
'charset' => 'ISO-8859-6',
'code' => 'ar-ye',
+ 'rtl' => true,
'emoji' => 'πŸ‡¦πŸ‡·',
],
'ar' => [
'name' => 'Arabic',
'charset' => 'ISO-8859-6',
'code' => 'ar',
+ 'rtl' => true,
'emoji' => 'πŸ‡¦πŸ‡·',
],
'hy_AM' => [
@@ -1138,11 +1156,13 @@ return
'name' => 'Hebrew (Israel)',
'charset' => 'ISO-8859-8',
'code' => 'he-il',
+ 'rtl' => true,
],
'he' => [
'name' => 'Hebrew',
'charset' => 'ISO-8859-8',
'code' => 'he',
+ 'rtl' => true,
],
'hi_IN' => [
'name' => 'Hindi (India)',
@@ -1707,11 +1727,13 @@ return
'name' => 'Persian (Iran)',
'charset' => 'UTF-8',
'code' => 'fa-ir',
+ 'rtl' => true,
],
'fa' => [
'name' => 'Persian',
'charset' => 'UTF-8',
'code' => 'fa',
+ 'rtl' => true,
],
'pl_PL' => [
'name' => 'Polish (Poland)',
@@ -2380,21 +2402,25 @@ return
'name' => 'Urdu (India)',
'charset' => 'UTF-8',
'code' => 'ur-in',
+ 'rtl' => true,
],
'ur_PK' => [
'name' => 'Urdu (Pakistan)',
'charset' => 'UTF-8',
'code' => 'ur-pk',
+ 'rtl' => true,
],
'ur' => [
'name' => 'Urdu',
'charset' => 'UTF-8',
'code' => 'ur',
+ 'rtl' => true,
],
'uz_Arab' => [
'name' => 'Uzbek (Arabic)',
'charset' => 'UTF-8',
'code' => 'uz-arab',
+ 'rtl' => true,
'emoji' => 'πŸ‡ΊπŸ‡Ώ',
],
'uz_Arab_AF' => [