From c004837ad9f5241e3f7b3b65f2eb0a39a299340d Mon Sep 17 00:00:00 2001 From: GraySmog <18949832421@163.com> Date: Sun, 3 Jun 2018 18:14:20 +0800 Subject: [PATCH 1/6] Add reference fallback language in options. --- .../com_languages/Field/FallbackField.php | 16 +++---- .../com_languages/View/Language/HtmlView.php | 5 +- .../com_languages/View/Languages/HtmlView.php | 5 +- .../components/com_languages/config.xml | 20 +++++++- .../com_languages/forms/language.xml | 48 +++++++++---------- .../com_languages/tmpl/language/edit.php | 39 ++++++++------- .../com_languages/tmpl/languages/default.php | 8 +++- .../language/en-GB/en-GB.com_languages.ini | 3 ++ 8 files changed, 90 insertions(+), 54 deletions(-) diff --git a/administrator/components/com_languages/Field/FallbackField.php b/administrator/components/com_languages/Field/FallbackField.php index 5658de825a..934d79a58c 100644 --- a/administrator/components/com_languages/Field/FallbackField.php +++ b/administrator/components/com_languages/Field/FallbackField.php @@ -13,7 +13,6 @@ use Joomla\CMS\Form\Field\ContentlanguageField; use Joomla\CMS\Component\ComponentHelper; -use Joomla\CMS\Application\ApplicationHelper; /** * Provides a list of fallback languages @@ -39,19 +38,18 @@ class FallbackField extends ContentlanguageField */ protected function getOptions() { - $options = parent::getOptions(); - $params = ComponentHelper::getParams('com_languages'); - $defaultLanguage = $params->get(ApplicationHelper::getClientInfo(0)->name, 'en-GB'); - $ignoredLanguage = $this->form->getData()->get('lang_code'); + $options = parent::getOptions(); + $params = ComponentHelper::getParams('com_languages'); + $reference = $params->get($this->fieldname); + $item_lang = $this->form->getData()->get('lang_code'); foreach ($options as $key => $option) { - if ($option->value === $defaultLanguage) + if ($option->value === $item_lang) { - $option->text = 'Reference [' . $option->text . ']'; + unset($options[$key]); } - - if ($option->value === $ignoredLanguage) + elseif ($item_lang === $reference && $option->value !== '') { unset($options[$key]); } diff --git a/administrator/components/com_languages/View/Language/HtmlView.php b/administrator/components/com_languages/View/Language/HtmlView.php index a749bc30a4..150a089f57 100644 --- a/administrator/components/com_languages/View/Language/HtmlView.php +++ b/administrator/components/com_languages/View/Language/HtmlView.php @@ -12,7 +12,7 @@ use Joomla\CMS\Helper\ContentHelper; use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; -use Joomla\Component\Languages\Administrator\Helper\LanguagesHelper; +use Joomla\CMS\Component\ComponentHelper; /** * HTML View class for the Languages component. @@ -64,6 +64,9 @@ public function display($tpl = null) $this->state = $this->get('State'); $this->canDo = ContentHelper::getActions('com_languages'); + // Get reference fallback language + $this->reference_lang = ComponentHelper::getParams('com_languages')->get('fallback_lang'); + // Check for errors. if (count($errors = $this->get('Errors'))) { diff --git a/administrator/components/com_languages/View/Languages/HtmlView.php b/administrator/components/com_languages/View/Languages/HtmlView.php index 80726754e9..05e8256010 100644 --- a/administrator/components/com_languages/View/Languages/HtmlView.php +++ b/administrator/components/com_languages/View/Languages/HtmlView.php @@ -13,7 +13,7 @@ use Joomla\CMS\Helper\ContentHelper; use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\Component\Languages\Administrator\Helper\LanguagesHelper; -use Joomla\Registry\Registry; +use Joomla\CMS\Component\ComponentHelper; /** * HTML Languages View class for the Languages component. @@ -83,6 +83,9 @@ public function display($tpl = null) $this->filterForm = $this->get('FilterForm'); $this->activeFilters = $this->get('ActiveFilters'); + // Get reference fallback language + $this->reference_lang = ComponentHelper::getParams('com_languages')->get('fallback_lang'); + LanguagesHelper::addSubmenu('languages'); // Check for errors. diff --git a/administrator/components/com_languages/config.xml b/administrator/components/com_languages/config.xml index 1662ae7c83..af070f4cd5 100644 --- a/administrator/components/com_languages/config.xml +++ b/administrator/components/com_languages/config.xml @@ -1,10 +1,26 @@ +
+ + + + +
+
+ >
- - - - - + > - - + > - -
- -
- - diff --git a/administrator/components/com_languages/tmpl/language/edit.php b/administrator/components/com_languages/tmpl/language/edit.php index f293c9958f..f46316af11 100644 --- a/administrator/components/com_languages/tmpl/language/edit.php +++ b/administrator/components/com_languages/tmpl/language/edit.php @@ -20,7 +20,7 @@ $assoc = JLanguageAssociations::isEnabled(); -$fallbacklang = $this->form->getValue('fallback_lang'); +$fallbacklang = $this->item->fallback_lang; ?> @@ -65,23 +65,30 @@ -
-
- form->getLabel('fallback_lang'); ?> + item->lang_code !== $this->reference_lang) : ?> +
+
+ form->getLabel('fallback_lang'); ?> +
+
+ form->getInput('fallback_lang'); ?> + + + + + + + +
-
- form->getInput('fallback_lang'); ?> - - - - - - - + + -
+ + form->renderFieldset('automatic_association'); ?> diff --git a/administrator/components/com_languages/tmpl/languages/default.php b/administrator/components/com_languages/tmpl/languages/default.php index b67b412288..3d9af71367 100644 --- a/administrator/components/com_languages/tmpl/languages/default.php +++ b/administrator/components/com_languages/tmpl/languages/default.php @@ -153,7 +153,13 @@ - escape($item->fallback_lang); ?> + lang_code === $this->reference_lang) : ?> + + fallback_lang)) : ?> + escape($this->reference_lang) . ')'; ?> + + escape($item->fallback_lang); ?> + diff --git a/administrator/language/en-GB/en-GB.com_languages.ini b/administrator/language/en-GB/en-GB.com_languages.ini index dbc10a9038..3ce29398a5 100644 --- a/administrator/language/en-GB/en-GB.com_languages.ini +++ b/administrator/language/en-GB/en-GB.com_languages.ini @@ -4,7 +4,9 @@ ; Note : All ini files need to be saved as UTF-8 COM_LANGUAGES="Languages" +COM_LANGUAGES_AUTOMATIC_ASSOCIATIONS="Automatic Associations" COM_LANGUAGES_CONFIGURATION="Languages: Options" +COM_LANGUAGES_CONFIG_AUTOMATIC_ASSOCIATIONS="These settings apply for Automatic Associations Options, unless they are changed for specific settings." COM_LANGUAGES_ERR_NO_LANGUAGE_SELECTED="No language selected." COM_LANGUAGES_ERROR_LANG_TAG="
The Language Tag should contain 2 or 3 lowercase letters corresponding to the ISO language, a dash and 2 uppercase letters corresponding to the ISO country code.
This should be the exact prefix used for the language installed or to be installed. Example: en-GB, srp-ME." COM_LANGUAGES_ERROR_LANGUAGE_METAFILE_MISSING="Could not load %s language meta XML file from %s." @@ -107,6 +109,7 @@ COM_LANGUAGES_N_ITEMS_TRASHED_1="%d Content Language trashed." COM_LANGUAGES_N_ITEMS_UNPUBLISHED="%d Content Languages unpublished.
Warning! When using the multilingual functionality (ie when the plugin System - Language Filter is enabled) the Site Default Language also has to be a published Content language." COM_LANGUAGES_N_ITEMS_UNPUBLISHED_1="%d Content Language unpublished.
Warning! When using the multilingual functionality (ie when the plugin System - Language Filter is enabled) the Site Default Language also has to be a published Content language." COM_LANGUAGES_NO_ITEM_SELECTED="No languages selected." +COM_LANGUAGES_REFERENCE_FALLBACK_LANG_LABEL="Reference Fallback Language" COM_LANGUAGES_SAVE_SUCCESS="Content Language saved." COM_LANGUAGES_SEARCH_IN_TITLE="Search in title." COM_LANGUAGES_SUBMENU_CONTENT="Content Languages" From 24e424688441bc628b8c69fa8c1db7b5525a2976 Mon Sep 17 00:00:00 2001 From: GraySmog <18949832421@163.com> Date: Fri, 8 Jun 2018 19:17:54 +0800 Subject: [PATCH 2/6] fix bugs of installation sql --- installation/sql/mysql/joomla.sql | 2 +- installation/sql/postgresql/joomla.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql index bbf6a44d5e..74c5fdf604 100644 --- a/installation/sql/mysql/joomla.sql +++ b/installation/sql/mysql/joomla.sql @@ -1330,7 +1330,7 @@ CREATE TABLE IF NOT EXISTS `#__languages` ( -- INSERT INTO `#__languages` (`lang_id`, `lang_code`, `title`, `title_native`, `sef`, `image`, `description`, `metakey`, `metadesc`, `sitename`, `published`, `access`, `ordering`, `fallback_lang`, `params`) VALUES -(1, 'en-GB', 'English (en-GB)', 'English (United Kingdom)', 'en', 'en_gb', '', '', '', '', 1, 1, 1, 'root', '{"fallback_lang":"","automatic_state":"1","change_state":"outdated","frontend_information":""}'); +(1, 'en-GB', 'English (en-GB)', 'English (United Kingdom)', 'en', 'en_gb', '', '', '', '', 1, 1, 1, '', '{"automatic_state":"1","change_state":"outdated","frontend_information":""}'); -- -------------------------------------------------------- diff --git a/installation/sql/postgresql/joomla.sql b/installation/sql/postgresql/joomla.sql index 5f09415354..1334b96217 100644 --- a/installation/sql/postgresql/joomla.sql +++ b/installation/sql/postgresql/joomla.sql @@ -1288,7 +1288,7 @@ CREATE INDEX "#__languages_idx_access" ON "#__languages" ("access"); -- INSERT INTO "#__languages" ("lang_id", "lang_code", "title", "title_native", "sef", "image", "description", "metakey", "metadesc", "sitename", "published", "access", "ordering", "fallback_lang", "params") VALUES -(1, 'en-GB', 'English (en-GB)', 'English (United Kingdom)', 'en', 'en_gb', '', '', '', '', 1, 1, 1, 'root', '{"fallback_lang":"","automatic_state":"1","change_state":"outdated","frontend_information":""}'); +(1, 'en-GB', 'English (en-GB)', 'English (United Kingdom)', 'en', 'en_gb', '', '', '', '', 1, 1, 1, '', '{"automatic_state":"1","change_state":"outdated","frontend_information":""}'); SELECT setval('#__languages_lang_id_seq', 2, false); From 6cd6c18c0688630646321c3190f36bd2c6671bce Mon Sep 17 00:00:00 2001 From: GraySmog <18949832421@163.com> Date: Fri, 8 Jun 2018 19:20:53 +0800 Subject: [PATCH 3/6] add default value of fallback_lang into installation sql --- installation/sql/mysql/joomla.sql | 2 +- installation/sql/postgresql/joomla.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql index 74c5fdf604..8aeee2a924 100644 --- a/installation/sql/mysql/joomla.sql +++ b/installation/sql/mysql/joomla.sql @@ -1316,7 +1316,7 @@ CREATE TABLE IF NOT EXISTS `#__languages` ( `published` int(11) NOT NULL DEFAULT 0, `access` int(10) unsigned NOT NULL DEFAULT 0, `ordering` int(11) NOT NULL DEFAULT 0, - `fallback_lang` char(7) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL, + `fallback_lang` char(7) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT '' NOT NULL, `params` text NOT NULL, PRIMARY KEY (`lang_id`), UNIQUE KEY `idx_sef` (`sef`), diff --git a/installation/sql/postgresql/joomla.sql b/installation/sql/postgresql/joomla.sql index 1334b96217..850a54ff25 100644 --- a/installation/sql/postgresql/joomla.sql +++ b/installation/sql/postgresql/joomla.sql @@ -1274,7 +1274,7 @@ CREATE TABLE IF NOT EXISTS "#__languages" ( "published" bigint DEFAULT 0 NOT NULL, "access" integer DEFAULT 0 NOT NULL, "ordering" bigint DEFAULT 0 NOT NULL, - "fallback_lang" varchar(7) NOT NULL, + "fallback_lang" varchar(7) DEFAULT '' NOT NULL, "params" text NOT NULL, PRIMARY KEY ("lang_id"), CONSTRAINT "#__languages_idx_sef" UNIQUE ("sef"), From 57c3f03cd035593409a1867653d1b394cc461964 Mon Sep 17 00:00:00 2001 From: GraySmog <18949832421@163.com> Date: Wed, 18 Jul 2018 17:40:25 +0800 Subject: [PATCH 4/6] Revert "Add reference fallback language in options." This reverts commit c004837ad9f5241e3f7b3b65f2eb0a39a299340d. --- .../com_languages/Field/FallbackField.php | 16 ++++--- .../com_languages/View/Language/HtmlView.php | 5 +- .../com_languages/View/Languages/HtmlView.php | 5 +- .../components/com_languages/config.xml | 20 +------- .../com_languages/forms/language.xml | 48 +++++++++---------- .../com_languages/tmpl/language/edit.php | 39 +++++++-------- .../com_languages/tmpl/languages/default.php | 8 +--- .../language/en-GB/en-GB.com_languages.ini | 3 -- 8 files changed, 54 insertions(+), 90 deletions(-) diff --git a/administrator/components/com_languages/Field/FallbackField.php b/administrator/components/com_languages/Field/FallbackField.php index 934d79a58c..5658de825a 100644 --- a/administrator/components/com_languages/Field/FallbackField.php +++ b/administrator/components/com_languages/Field/FallbackField.php @@ -13,6 +13,7 @@ use Joomla\CMS\Form\Field\ContentlanguageField; use Joomla\CMS\Component\ComponentHelper; +use Joomla\CMS\Application\ApplicationHelper; /** * Provides a list of fallback languages @@ -38,18 +39,19 @@ class FallbackField extends ContentlanguageField */ protected function getOptions() { - $options = parent::getOptions(); - $params = ComponentHelper::getParams('com_languages'); - $reference = $params->get($this->fieldname); - $item_lang = $this->form->getData()->get('lang_code'); + $options = parent::getOptions(); + $params = ComponentHelper::getParams('com_languages'); + $defaultLanguage = $params->get(ApplicationHelper::getClientInfo(0)->name, 'en-GB'); + $ignoredLanguage = $this->form->getData()->get('lang_code'); foreach ($options as $key => $option) { - if ($option->value === $item_lang) + if ($option->value === $defaultLanguage) { - unset($options[$key]); + $option->text = 'Reference [' . $option->text . ']'; } - elseif ($item_lang === $reference && $option->value !== '') + + if ($option->value === $ignoredLanguage) { unset($options[$key]); } diff --git a/administrator/components/com_languages/View/Language/HtmlView.php b/administrator/components/com_languages/View/Language/HtmlView.php index 150a089f57..a749bc30a4 100644 --- a/administrator/components/com_languages/View/Language/HtmlView.php +++ b/administrator/components/com_languages/View/Language/HtmlView.php @@ -12,7 +12,7 @@ use Joomla\CMS\Helper\ContentHelper; use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; -use Joomla\CMS\Component\ComponentHelper; +use Joomla\Component\Languages\Administrator\Helper\LanguagesHelper; /** * HTML View class for the Languages component. @@ -64,9 +64,6 @@ public function display($tpl = null) $this->state = $this->get('State'); $this->canDo = ContentHelper::getActions('com_languages'); - // Get reference fallback language - $this->reference_lang = ComponentHelper::getParams('com_languages')->get('fallback_lang'); - // Check for errors. if (count($errors = $this->get('Errors'))) { diff --git a/administrator/components/com_languages/View/Languages/HtmlView.php b/administrator/components/com_languages/View/Languages/HtmlView.php index 05e8256010..80726754e9 100644 --- a/administrator/components/com_languages/View/Languages/HtmlView.php +++ b/administrator/components/com_languages/View/Languages/HtmlView.php @@ -13,7 +13,7 @@ use Joomla\CMS\Helper\ContentHelper; use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\Component\Languages\Administrator\Helper\LanguagesHelper; -use Joomla\CMS\Component\ComponentHelper; +use Joomla\Registry\Registry; /** * HTML Languages View class for the Languages component. @@ -83,9 +83,6 @@ public function display($tpl = null) $this->filterForm = $this->get('FilterForm'); $this->activeFilters = $this->get('ActiveFilters'); - // Get reference fallback language - $this->reference_lang = ComponentHelper::getParams('com_languages')->get('fallback_lang'); - LanguagesHelper::addSubmenu('languages'); // Check for errors. diff --git a/administrator/components/com_languages/config.xml b/administrator/components/com_languages/config.xml index af070f4cd5..1662ae7c83 100644 --- a/administrator/components/com_languages/config.xml +++ b/administrator/components/com_languages/config.xml @@ -1,26 +1,10 @@ -
- - - - -
-
+ >
- - - - - + > - - + > - -
- -
- + diff --git a/administrator/components/com_languages/tmpl/language/edit.php b/administrator/components/com_languages/tmpl/language/edit.php index f46316af11..f293c9958f 100644 --- a/administrator/components/com_languages/tmpl/language/edit.php +++ b/administrator/components/com_languages/tmpl/language/edit.php @@ -20,7 +20,7 @@ $assoc = JLanguageAssociations::isEnabled(); -$fallbacklang = $this->item->fallback_lang; +$fallbacklang = $this->form->getValue('fallback_lang'); ?> @@ -65,30 +65,23 @@ - item->lang_code !== $this->reference_lang) : ?> -
-
- form->getLabel('fallback_lang'); ?> -
-
- form->getInput('fallback_lang'); ?> - - - - - - - -
+
+
+ form->getLabel('fallback_lang'); ?>
- - form->renderFieldset('automatic_association'); ?> diff --git a/administrator/components/com_languages/tmpl/languages/default.php b/administrator/components/com_languages/tmpl/languages/default.php index 3d9af71367..b67b412288 100644 --- a/administrator/components/com_languages/tmpl/languages/default.php +++ b/administrator/components/com_languages/tmpl/languages/default.php @@ -153,13 +153,7 @@ - lang_code === $this->reference_lang) : ?> - - fallback_lang)) : ?> - escape($this->reference_lang) . ')'; ?> - - escape($item->fallback_lang); ?> - + escape($item->fallback_lang); ?> diff --git a/administrator/language/en-GB/en-GB.com_languages.ini b/administrator/language/en-GB/en-GB.com_languages.ini index 3ce29398a5..dbc10a9038 100644 --- a/administrator/language/en-GB/en-GB.com_languages.ini +++ b/administrator/language/en-GB/en-GB.com_languages.ini @@ -4,9 +4,7 @@ ; Note : All ini files need to be saved as UTF-8 COM_LANGUAGES="Languages" -COM_LANGUAGES_AUTOMATIC_ASSOCIATIONS="Automatic Associations" COM_LANGUAGES_CONFIGURATION="Languages: Options" -COM_LANGUAGES_CONFIG_AUTOMATIC_ASSOCIATIONS="These settings apply for Automatic Associations Options, unless they are changed for specific settings." COM_LANGUAGES_ERR_NO_LANGUAGE_SELECTED="No language selected." COM_LANGUAGES_ERROR_LANG_TAG="
The Language Tag should contain 2 or 3 lowercase letters corresponding to the ISO language, a dash and 2 uppercase letters corresponding to the ISO country code.
This should be the exact prefix used for the language installed or to be installed. Example: en-GB, srp-ME." COM_LANGUAGES_ERROR_LANGUAGE_METAFILE_MISSING="Could not load %s language meta XML file from %s." @@ -109,7 +107,6 @@ COM_LANGUAGES_N_ITEMS_TRASHED_1="%d Content Language trashed." COM_LANGUAGES_N_ITEMS_UNPUBLISHED="%d Content Languages unpublished.
Warning! When using the multilingual functionality (ie when the plugin System - Language Filter is enabled) the Site Default Language also has to be a published Content language." COM_LANGUAGES_N_ITEMS_UNPUBLISHED_1="%d Content Language unpublished.
Warning! When using the multilingual functionality (ie when the plugin System - Language Filter is enabled) the Site Default Language also has to be a published Content language." COM_LANGUAGES_NO_ITEM_SELECTED="No languages selected." -COM_LANGUAGES_REFERENCE_FALLBACK_LANG_LABEL="Reference Fallback Language" COM_LANGUAGES_SAVE_SUCCESS="Content Language saved." COM_LANGUAGES_SEARCH_IN_TITLE="Search in title." COM_LANGUAGES_SUBMENU_CONTENT="Content Languages" From 5e41c3db0b01283eb7752e6a6c8219553c0a5524 Mon Sep 17 00:00:00 2001 From: GraySmog <18949832421@163.com> Date: Wed, 18 Jul 2018 17:40:46 +0800 Subject: [PATCH 5/6] Revert "fix bugs of installation sql" This reverts commit 24e424688441bc628b8c69fa8c1db7b5525a2976. --- installation/sql/mysql/joomla.sql | 2 +- installation/sql/postgresql/joomla.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql index 8aeee2a924..d11f354ef9 100644 --- a/installation/sql/mysql/joomla.sql +++ b/installation/sql/mysql/joomla.sql @@ -1330,7 +1330,7 @@ CREATE TABLE IF NOT EXISTS `#__languages` ( -- INSERT INTO `#__languages` (`lang_id`, `lang_code`, `title`, `title_native`, `sef`, `image`, `description`, `metakey`, `metadesc`, `sitename`, `published`, `access`, `ordering`, `fallback_lang`, `params`) VALUES -(1, 'en-GB', 'English (en-GB)', 'English (United Kingdom)', 'en', 'en_gb', '', '', '', '', 1, 1, 1, '', '{"automatic_state":"1","change_state":"outdated","frontend_information":""}'); +(1, 'en-GB', 'English (en-GB)', 'English (United Kingdom)', 'en', 'en_gb', '', '', '', '', 1, 1, 1, 'root', '{"fallback_lang":"","automatic_state":"1","change_state":"outdated","frontend_information":""}'); -- -------------------------------------------------------- diff --git a/installation/sql/postgresql/joomla.sql b/installation/sql/postgresql/joomla.sql index 850a54ff25..9be8cefa4a 100644 --- a/installation/sql/postgresql/joomla.sql +++ b/installation/sql/postgresql/joomla.sql @@ -1288,7 +1288,7 @@ CREATE INDEX "#__languages_idx_access" ON "#__languages" ("access"); -- INSERT INTO "#__languages" ("lang_id", "lang_code", "title", "title_native", "sef", "image", "description", "metakey", "metadesc", "sitename", "published", "access", "ordering", "fallback_lang", "params") VALUES -(1, 'en-GB', 'English (en-GB)', 'English (United Kingdom)', 'en', 'en_gb', '', '', '', '', 1, 1, 1, '', '{"automatic_state":"1","change_state":"outdated","frontend_information":""}'); +(1, 'en-GB', 'English (en-GB)', 'English (United Kingdom)', 'en', 'en_gb', '', '', '', '', 1, 1, 1, 'root', '{"fallback_lang":"","automatic_state":"1","change_state":"outdated","frontend_information":""}'); SELECT setval('#__languages_lang_id_seq', 2, false); From 8b39049aa3b12a54d923f72281f75c142cb26762 Mon Sep 17 00:00:00 2001 From: GraySmog <18949832421@163.com> Date: Wed, 18 Jul 2018 17:40:59 +0800 Subject: [PATCH 6/6] Revert "add default value of fallback_lang into installation sql" This reverts commit 6cd6c18c0688630646321c3190f36bd2c6671bce. --- installation/sql/mysql/joomla.sql | 2 +- installation/sql/postgresql/joomla.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql index d11f354ef9..bbf6a44d5e 100644 --- a/installation/sql/mysql/joomla.sql +++ b/installation/sql/mysql/joomla.sql @@ -1316,7 +1316,7 @@ CREATE TABLE IF NOT EXISTS `#__languages` ( `published` int(11) NOT NULL DEFAULT 0, `access` int(10) unsigned NOT NULL DEFAULT 0, `ordering` int(11) NOT NULL DEFAULT 0, - `fallback_lang` char(7) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT '' NOT NULL, + `fallback_lang` char(7) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL, `params` text NOT NULL, PRIMARY KEY (`lang_id`), UNIQUE KEY `idx_sef` (`sef`), diff --git a/installation/sql/postgresql/joomla.sql b/installation/sql/postgresql/joomla.sql index 9be8cefa4a..5f09415354 100644 --- a/installation/sql/postgresql/joomla.sql +++ b/installation/sql/postgresql/joomla.sql @@ -1274,7 +1274,7 @@ CREATE TABLE IF NOT EXISTS "#__languages" ( "published" bigint DEFAULT 0 NOT NULL, "access" integer DEFAULT 0 NOT NULL, "ordering" bigint DEFAULT 0 NOT NULL, - "fallback_lang" varchar(7) DEFAULT '' NOT NULL, + "fallback_lang" varchar(7) NOT NULL, "params" text NOT NULL, PRIMARY KEY ("lang_id"), CONSTRAINT "#__languages_idx_sef" UNIQUE ("sef"),