Mibew/mibew
1
0
Fork 0
mirror of https://github.com/Mibew/mibew.git synced 2025-11-04 04:15:19 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not rely on database state during installation

Browse Source
This commit is contained in:
Dmitriy Simushev 2014-07-08 12:43:53 +00:00
parent edef518da3
commit 037b823db9
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/mibew/libs/common/locale.php
View File

@ -66,9 +66,9 @@ function locale_pattern_check($locale)
function get_available_locales() function get_available_locales()
{ {
if (!Database::isInitialized()) { if (installation_in_progress()) {
// We cannot use database by some reasons, thus we only can use // We cannot rely on the database during installation, thus we only can
// discovered locales as available locales. // use discovered locales as available locales.
return discover_locales(); return discover_locales();
} }
@ -682,9 +682,9 @@ function load_messages($locale)
if (!isset($messages[$locale])) { if (!isset($messages[$locale])) {
$messages[$locale] = array(); $messages[$locale] = array();
if (!Database::isInitialized()) { if (installation_in_progress()) {
// Load localized strings from files because we cannot use database // Load localized strings from files because we cannot rely on the
// by some reasons. // database during installation.
$locale_file = MIBEW_FS_ROOT . "/locales/{$locale}/translation.po"; $locale_file = MIBEW_FS_ROOT . "/locales/{$locale}/translation.po";
$locale_data = read_locale_file($locale_file); $locale_data = read_locale_file($locale_file);
@ -813,9 +813,10 @@ function get_localized_string($string, $locale)
*/ */
function save_message($locale, $key, $value) function save_message($locale, $key, $value)
{ {
if (!Database::isInitialized()) { if (installation_in_progress()) {
// We cannot save a message if the database was not initialized // We cannot save a message if the installation is in progres because
// correctly by some reasons. Just do nothing in that case. // there are no guarantees that database is initialized and has all
// necessary tables. Just do nothing in that case.
return; return;
} }