Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #9952 from tobiasd/20210223-INSTALLtxt

Browse source 
Issue 9064: referring INSTALL.txt now points to doc/INSTALL.md
This commit is contained in:
Hypolite Petovan 2021-02-23 08:49:07 -05:00 committed by GitHub
parent baaf34f02b 61ff7fc532
commit 2daa783f15
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 1155 additions and 1079 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Core/Installer.php
View file

@ -505,7 +505,7 @@ class Installer
$help = DI::l10n()->t('The web installer needs to be able to create a file called "local.config.php" in the "config" folder of your web server and it is unable to do so.') . EOL; $help = DI::l10n()->t('The web installer needs to be able to create a file called "local.config.php" in the "config" folder of your web server and it is unable to do so.') . EOL;
$help .= DI::l10n()->t('This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can.') . EOL; $help .= DI::l10n()->t('This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can.') . EOL;
$help .= DI::l10n()->t('At the end of this procedure, we will give you a text to save in a file named local.config.php in your Friendica "config" folder.') . EOL; $help .= DI::l10n()->t('At the end of this procedure, we will give you a text to save in a file named local.config.php in your Friendica "config" folder.') . EOL;
$help .= DI::l10n()->t('You can alternatively skip this procedure and perform a manual installation. Please see the file "INSTALL.txt" for instructions.') . EOL; $help .= DI::l10n()->t('You can alternatively skip this procedure and perform a manual installation. Please see the file "doc/INSTALL.md" for instructions.') . EOL;
} }
$this->addCheck(DI::l10n()->t('config/local.config.php is writable'), $status, false, $help); $this->addCheck(DI::l10n()->t('config/local.config.php is writable'), $status, false, $help);

2
src/Module/Install.php
View file

@ -351,7 +351,7 @@ class Install extends BaseModule
return return
DI::l10n()->t('<h1>What next</h1>') DI::l10n()->t('<h1>What next</h1>')
. "<p>" . DI::l10n()->t('IMPORTANT: You will need to [manually] setup a scheduled task for the worker.') . "<p>" . DI::l10n()->t('IMPORTANT: You will need to [manually] setup a scheduled task for the worker.')
. DI::l10n()->t('Please see the file "INSTALL.txt".') . DI::l10n()->t('Please see the file "doc/INSTALL.md".')
. "</p><p>" . "</p><p>"
. DI::l10n()->t('Go to your new Friendica node <a href="%s/register">registration page</a> and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel.', $baseurl) . DI::l10n()->t('Go to your new Friendica node <a href="%s/register">registration page</a> and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel.', $baseurl)
. "</p>"; . "</p>";

2230
view/lang/C/messages.po
View file

File diff suppressed because it is too large Load diff