Merge pull request #9684 from MrPetovan/bug/9678-required-translation
Add translation to untranslated strings in templates
This commit is contained in:
Michael Vogel
GitHub
commit
4ee029c9c7
27 changed files with 200 additions and 552 deletions
|
|
@ -76,8 +76,8 @@ class Server extends BaseAdmin
|
|||
if (is_array($blocklist)) {
|
||||
foreach ($blocklist as $id => $b) {
|
||||
$blocklistform[] = [
|
||||
'domain' => ["domain[$id]", DI::l10n()->t('Blocked server domain pattern'), $b['domain'], '', 'required', '', ''],
|
||||
'reason' => ["reason[$id]", DI::l10n()->t("Reason for the block"), $b['reason'], '', 'required', '', ''],
|
||||
'domain' => ["domain[$id]", DI::l10n()->t('Blocked server domain pattern'), $b['domain'], '', DI::l10n()->t('Required'), '', ''],
|
||||
'reason' => ["reason[$id]", DI::l10n()->t("Reason for the block"), $b['reason'], '', DI::l10n()->t('Required'), '', ''],
|
||||
'delete' => ["delete[$id]", DI::l10n()->t("Delete server domain pattern") . ' (' . $b['domain'] . ')', false, DI::l10n()->t("Check to delete this entry from the blocklist")]
|
||||
];
|
||||
}
|
||||
|
|
@ -96,8 +96,8 @@ class Server extends BaseAdmin
|
|||
<li><code>[<char1><char2>...]</code>: char1 or char2</li>
|
||||
</ul>'),
|
||||
'$addtitle' => DI::l10n()->t('Add new entry to block list'),
|
||||
'$newdomain' => ['newentry_domain', DI::l10n()->t('Server Domain Pattern'), '', DI::l10n()->t('The domain pattern of the new server to add to the block list. Do not include the protocol.'), 'required', '', ''],
|
||||
'$newreason' => ['newentry_reason', DI::l10n()->t('Block reason'), '', DI::l10n()->t('The reason why you blocked this server domain pattern.'), 'required', '', ''],
|
||||
'$newdomain' => ['newentry_domain', DI::l10n()->t('Server Domain Pattern'), '', DI::l10n()->t('The domain pattern of the new server to add to the block list. Do not include the protocol.'), DI::l10n()->t('Required'), '', ''],
|
||||
'$newreason' => ['newentry_reason', DI::l10n()->t('Block reason'), '', DI::l10n()->t('The reason why you blocked this server domain pattern.'), DI::l10n()->t('Required'), '', ''],
|
||||
'$submit' => DI::l10n()->t('Add Entry'),
|
||||
'$savechanges' => DI::l10n()->t('Save changes to the blocklist'),
|
||||
'$currenttitle' => DI::l10n()->t('Current Entries in the Blocklist'),
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ class Delete extends BaseAdmin
|
|||
'$submit' => DI::l10n()->t('Delete this Item'),
|
||||
'$intro1' => DI::l10n()->t('On this page you can delete an item from your node. If the item is a top level posting, the entire thread will be deleted.'),
|
||||
'$intro2' => DI::l10n()->t('You need to know the GUID of the item. You can find it e.g. by looking at the display URL. The last part of http://example.com/display/123456 is the GUID, here 123456.'),
|
||||
'$deleteitemguid' => ['deleteitemguid', DI::l10n()->t("GUID"), '', DI::l10n()->t("The GUID of the item you want to delete."), 'required', 'autofocus'],
|
||||
'$deleteitemguid' => ['deleteitemguid', DI::l10n()->t("GUID"), '', DI::l10n()->t("The GUID of the item you want to delete."), DI::l10n()->t('Required'), 'autofocus'],
|
||||
'$form_security_token' => self::getFormSecurityToken("admin_deleteitem")
|
||||
]);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ class Probe extends BaseModule
|
|||
DI::l10n()->t('Lookup address'),
|
||||
$addr,
|
||||
'',
|
||||
'required'
|
||||
DI::l10n()->t('Required')
|
||||
],
|
||||
'$res' => $res,
|
||||
]);
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -231,9 +231,10 @@ class Profile extends BaseProfile
|
|||
);
|
||||
}
|
||||
|
||||
$tpl = Renderer::getMarkupTemplate('profile/index.tpl');
|
||||
$tpl = Renderer::getMarkupTemplate('profile/profile.tpl');
|
||||
$o .= Renderer::replaceMacros($tpl, [
|
||||
'$title' => DI::l10n()->t('Profile'),
|
||||
'$yourself' => DI::l10n()->t('Yourself'),
|
||||
'$view_as_contacts' => $view_as_contacts,
|
||||
'$view_as_contact_id' => $view_as_contact_id,
|
||||
'$view_as_contact_alert' => $view_as_contact_alert,
|
||||
|
|
|
|||
|
|
@ -132,7 +132,7 @@ class Register extends BaseModule
|
|||
$o = Renderer::replaceMacros($tpl, [
|
||||
'$invitations' => DI::config()->get('system', 'invitation_only'),
|
||||
'$permonly' => intval(DI::config()->get('config', 'register_policy')) === self::APPROVE,
|
||||
'$permonlybox' => ['permonlybox', DI::l10n()->t('Note for the admin'), '', DI::l10n()->t('Leave a message for the admin, why you want to join this node'), 'required'],
|
||||
'$permonlybox' => ['permonlybox', DI::l10n()->t('Note for the admin'), '', DI::l10n()->t('Leave a message for the admin, why you want to join this node'), DI::l10n()->t('Required')],
|
||||
'$invite_desc' => DI::l10n()->t('Membership on this site is by invitation only.'),
|
||||
'$invite_label' => DI::l10n()->t('Your invitation code: '),
|
||||
'$invite_id' => $invite_id,
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ class Verify extends BaseModule
|
|||
'$errors_label' => DI::l10n()->tt('Error', 'Errors', count(self::$errors)),
|
||||
'$errors' => self::$errors,
|
||||
'$recovery_message' => DI::l10n()->t('Don’t have your phone? <a href="%s">Enter a two-factor recovery code</a>', '2fa/recovery'),
|
||||
'$verify_code' => ['verify_code', DI::l10n()->t('Please enter a code from your authentication app'), '', '', 'required', 'autofocus placeholder="000000"', 'tel'],
|
||||
'$verify_code' => ['verify_code', DI::l10n()->t('Please enter a code from your authentication app'), '', '', DI::l10n()->t('Required'), 'autofocus placeholder="000000"', 'tel'],
|
||||
'$verify_label' => DI::l10n()->t('Verify code and complete login'),
|
||||
]);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@ class Index extends BaseSettings
|
|||
'$app_specific_passwords_message' => DI::l10n()->t('<p>These randomly generated passwords allow you to authenticate on apps not supporting two-factor authentication.</p>'),
|
||||
|
||||
'$action_title' => DI::l10n()->t('Actions'),
|
||||
'$password' => ['password', DI::l10n()->t('Current password:'), '', DI::l10n()->t('You need to provide your current password to change two-factor authentication settings.'), 'required', 'autofocus'],
|
||||
'$password' => ['password', DI::l10n()->t('Current password:'), '', DI::l10n()->t('You need to provide your current password to change two-factor authentication settings.'), DI::l10n()->t('Required'), 'autofocus'],
|
||||
'$enable_label' => DI::l10n()->t('Enable two-factor authentication'),
|
||||
'$disable_label' => DI::l10n()->t('Disable two-factor authentication'),
|
||||
'$recovery_codes_label' => DI::l10n()->t('Show recovery codes'),
|
||||
|
|
|
|||
|
|
@ -138,7 +138,7 @@ class Verify extends BaseSettings
|
|||
'$holder' => $holder,
|
||||
'$secret' => $secret,
|
||||
|
||||
'$verify_code' => ['verify_code', DI::l10n()->t('Please enter a code from your authentication app'), '', '', 'required', 'autofocus placeholder="000000"'],
|
||||
'$verify_code' => ['verify_code', DI::l10n()->t('Please enter a code from your authentication app'), '', '', DI::l10n()->t('Required'), 'autofocus placeholder="000000"'],
|
||||
'$verify_label' => DI::l10n()->t('Verify code and enable two-factor authentication'),
|
||||
]);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue