Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-19 10:30:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add translation to required labels for install checks

Browse source 
- Remove unused checks loop in install_base template
This commit is contained in:
Hypolite Petovan 2020-12-19 22:47:07 -05:00
parent 65f74da45b
commit a991f3dfcf
5 changed files with 32 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/Module/Install.php
View file

@ -186,6 +186,10 @@ class Install extends BaseModule
$output .= Renderer::replaceMacros($tpl, [
'$title' => $install_title,
'$pass' => DI::l10n()->t('System check'),
'$required' => DI::l10n()->t('Required'),
'$requirement_not_satisfied' => DI::l10n()->t('Requirement not satisfied'),
'$optional_requirement_not_satisfied' => DI::l10n()->t('Optional requirement not satisfied'),
'$ok' => DI::l10n()->t('OK'),
'$checks' => self::$installer->getChecks(),
'$passed' => $status,
'$see_install' => DI::l10n()->t('Please see the file "doc/INSTALL.md".'),
@ -215,12 +219,12 @@ class Install extends BaseModule
DI::l10n()->t('Host name'),
$configCache->get('config', 'hostname'),
DI::l10n()->t('Overwrite this field in case the determinated hostname isn\'t right, otherweise leave it as is.'),
'required'],
DI::l10n()->t('Required')],
'$basepath' => ['system-basepath',
DI::l10n()->t("Base path to installation"),
$configCache->get('system', 'basepath'),
DI::l10n()->t("If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot."),
'required'],
DI::l10n()->t('Required')],
'$urlpath' => ['system-urlpath',
DI::l10n()->t('Sub path of the URL'),
$configCache->get('system', 'urlpath'),
@ -239,7 +243,9 @@ class Install extends BaseModule
'$info_01' => DI::l10n()->t('In order to install Friendica we need to know how to connect to your database.'),
'$info_02' => DI::l10n()->t('Please contact your hosting provider or site administrator if you have questions about these settings.'),
'$info_03' => DI::l10n()->t('The database you specify below should already exist. If it does not, please create it before continuing.'),
'checks' => self::$installer->getChecks(),
'$required' => DI::l10n()->t('Required'),
'$requirement_not_satisfied' => DI::l10n()->t('Requirement not satisfied'),
'$checks' => self::$installer->getChecks(),
'$hostname' => $configCache->get('config', 'hostname'),
'$ssl_policy' => $configCache->get('system', 'ssl_policy'),
'$basepath' => $configCache->get('system', 'basepath'),
@ -248,23 +254,23 @@ class Install extends BaseModule
DI::l10n()->t('Database Server Name'),
$configCache->get('database', 'hostname'),
'',
'required'],
DI::l10n()->t('Required')],
'$dbuser' => ['database-username',
DI::l10n()->t('Database Login Name'),
$configCache->get('database', 'username'),
'',
'required',
DI::l10n()->t('Required'),
'autofocus'],
'$dbpass' => ['database-password',
DI::l10n()->t('Database Login Password'),
$configCache->get('database', 'password'),
DI::l10n()->t("For security reasons the password must not be empty"),
'required'],
DI::l10n()->t('Required')],
'$dbdata' => ['database-database',
DI::l10n()->t('Database Name'),
$configCache->get('database', 'database'),
'',
'required'],
DI::l10n()->t('Required')],
'$lbl_10' => DI::l10n()->t('Please select a default timezone for your website'),
'$php_path' => $configCache->get('config', 'php_path'),
'$submit' => DI::l10n()->t('Submit')
@ -278,6 +284,7 @@ class Install extends BaseModule
$tpl = Renderer::getMarkupTemplate('install_settings.tpl');
$output .= Renderer::replaceMacros($tpl, [
'$title' => $install_title,
'$required' => DI::l10n()->t('Required'),
'$checks' => self::$installer->getChecks(),
'$pass' => DI::l10n()->t('Site settings'),
'$hostname' => $configCache->get('config', 'hostname'),
@ -292,7 +299,7 @@ class Install extends BaseModule
DI::l10n()->t('Site administrator email address'),
$configCache->get('config', 'admin_email'),
DI::l10n()->t('Your account email address must match this in order to use the web admin panel.'),
'required', 'autofocus', 'email'],
DI::l10n()->t('Required'), 'autofocus', 'email'],
'$timezone' => Temporal::getTimezoneField('system-default_timezone',
DI::l10n()->t('Please select a default timezone for your website'),
$configCache->get('system', 'default_timezone'),
@ -318,10 +325,12 @@ class Install extends BaseModule
$tpl = Renderer::getMarkupTemplate('install_finished.tpl');
$output .= Renderer::replaceMacros($tpl, [
'$title' => $install_title,
'$checks' => self::$installer->getChecks(),
'$pass' => DI::l10n()->t('Installation finished'),
'$text' => $db_return_text . self::whatNext(),
'$title' => $install_title,
'$required' => DI::l10n()->t('Required'),
'$requirement_not_satisfied' => DI::l10n()->t('Requirement not satisfied'),
'$checks' => self::$installer->getChecks(),
'$pass' => DI::l10n()->t('Installation finished'),
'$text' => $db_return_text . self::whatNext(),
]);
break;