miklo
/
friendica
sforkowany z mirror/friendica
1
0
Forkuj 0
Kod Zgłoszenia Oczekujące zmiany Packages Projekty Wydania Wiki Aktywność

Merge pull request #9841 from MrPetovan/bug/fatal-errors 

Fix wrong uses of DI::l10n() in Core\Update
2022.09-rc
Tobias Diekershoff 2021-01-21 17:06:26 +01:00 zatwierdzone przez GitHub
rodzic 0668b2dfd5 57d2ffde30
commit 81f53ff5ab
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 524 dodań i 520 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
src/Core/Update.php
Wyświetl plik

@ -63,7 +63,7 @@ class Update
// We don't support upgrading from very old versions anymore // We don't support upgrading from very old versions anymore
if ($build < NEW_TABLE_STRUCTURE_VERSION) { if ($build < NEW_TABLE_STRUCTURE_VERSION) {
$error = DI::l10n('Updates from version %s are not supported. Please update at least to version 2021,01 and wait until the postupdate finished version 1383.', $build); $error = DI::l10n()->t('Updates from version %s are not supported. Please update at least to version 2021.01 and wait until the postupdate finished version 1383.', $build);
if (DI::mode()->getExecutor() == Mode::INDEX) { if (DI::mode()->getExecutor() == Mode::INDEX) {
die($error); die($error);
} else { } else {
@ -74,7 +74,7 @@ class Update
// The postupdate has to completed version 1281 for the new post views to take over // The postupdate has to completed version 1281 for the new post views to take over
$postupdate = DI::config()->get("system", "post_update_version"); $postupdate = DI::config()->get("system", "post_update_version");
if ($postupdate < NEW_TABLE_STRUCTURE_VERSION) { if ($postupdate < NEW_TABLE_STRUCTURE_VERSION) {
$error = DI::l10n('Updates from postupdate version %s are not supported. Please update at least to version 2021,01 and wait until the postupdate finished version 1383.', $postupdate); $error = DI::l10n()->t('Updates from postupdate version %s are not supported. Please update at least to version 2021.01 and wait until the postupdate finished version 1383.', $postupdate);
if (DI::mode()->getExecutor() == Mode::INDEX) { if (DI::mode()->getExecutor() == Mode::INDEX) {
die($error); die($error);
} else { } else {

1040
view/lang/C/messages.po
Wyświetl plik

Plik diff jest za duży Load Diff