diff options
| author | Joas Schilling <coding@schilljs.com> | 2018-10-09 14:32:14 +0200 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2018-10-09 14:32:14 +0200 |
| commit | ea21aa3f7a12c5d1bd80eea329de3eb695fde4e5 (patch) | |
| tree | 7ff489b7990d01a699dbdf43d1b5ab0bc27b4916 /settings | |
| parent | ea411ccec4095e155755b4edf76fd1490e509e5d (diff) | |
| download | nextcloud-server-ea21aa3f7a12c5d1bd80eea329de3eb695fde4e5.tar.gz nextcloud-server-ea21aa3f7a12c5d1bd80eea329de3eb695fde4e5.zip | |
Use numeric placeholders if there are multiple, so that RTL languages can operate better
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/Controller/CheckSetupController.php | 4 | ||||
| -rw-r--r-- | settings/templates/settings/admin/overview.php | 2 | ||||
| -rw-r--r-- | settings/templates/settings/personal/personal.info.php | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php index 851644a27d9..42bb4739870 100644 --- a/settings/Controller/CheckSetupController.php +++ b/settings/Controller/CheckSetupController.php @@ -235,7 +235,7 @@ class CheckSetupController extends Controller { if(($majorVersion === '1.0.1' && ord($patchRelease) < ord('d')) || ($majorVersion === '1.0.2' && ord($patchRelease) < ord('b'))) { - return (string) $this->l10n->t('cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably.', ['OpenSSL', $versionString, $features]); + return $this->l10n->t('cURL is using an outdated %1$s version (%2$s). Please update your operating system or features such as %3$s will not work reliably.', ['OpenSSL', $versionString, $features]); } } @@ -249,7 +249,7 @@ class CheckSetupController extends Controller { $secondClient->get('https://nextcloud.com/'); } catch (ClientException $e) { if($e->getResponse()->getStatusCode() === 400) { - return (string) $this->l10n->t('cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably.', ['NSS', $versionString, $features]); + return $this->l10n->t('cURL is using an outdated %1$s version (%2$s). Please update your operating system or features such as %3$s will not work reliably.', ['NSS', $versionString, $features]); } } } diff --git a/settings/templates/settings/admin/overview.php b/settings/templates/settings/admin/overview.php index aad6ae80a7d..cbb7e136da0 100644 --- a/settings/templates/settings/admin/overview.php +++ b/settings/templates/settings/admin/overview.php @@ -50,7 +50,7 @@ <ul class="info hidden"></ul> </div> <p id="postsetupchecks-hint" class="hidden"> - <?php print_unescaped($l->t('Please double check the <a target="_blank" rel="noreferrer noopener" href="%s">installation guides ↗</a>, and check for any errors or warnings in the <a href="%s">log</a>.', [link_to_docs('admin-install'), \OC::$server->getURLGenerator()->linkToRoute('settings.AdminSettings.index', ['section' => 'logging'])] )); ?> + <?php print_unescaped($l->t('Please double check the <a target="_blank" rel="noreferrer noopener" href="%1$s">installation guides ↗</a>, and check for any errors or warnings in the <a href="%2$s">log</a>.', [link_to_docs('admin-install'), \OC::$server->getURLGenerator()->linkToRoute('settings.AdminSettings.index', ['section' => 'logging'])] )); ?> </p> <p class="extra-top-margin"> diff --git a/settings/templates/settings/personal/personal.info.php b/settings/templates/settings/personal/personal.info.php index 9919df521f6..6fc85253499 100644 --- a/settings/templates/settings/personal/personal.info.php +++ b/settings/templates/settings/personal/personal.info.php @@ -89,7 +89,7 @@ vendor_style('jcrop/css/jquery.Jcrop'); <?php print_unescaped($l->t('You are using <strong>%s</strong>', [$_['usage']]));?> <?php else: ?> - <?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)', + <?php print_unescaped($l->t('You are using <strong>%1$s</strong> of <strong>%2$s</strong> (<strong>%3$s %%</strong>)', [$_['usage'], $_['total_space'], $_['usage_relative']]));?> <?php endif ?> </p> |