From ea21aa3f7a12c5d1bd80eea329de3eb695fde4e5 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Tue, 9 Oct 2018 14:32:14 +0200
Subject: Use numeric placeholders if there are multiple, so that RTL languages
 can operate better

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 core/ajax/update.php                    | 2 +-
 core/templates/loginflow/authpicker.php | 2 +-
 core/templates/loginflow/grant.php      | 2 +-
 core/templates/untrustedDomain.php      | 2 +-
 core/templates/update.admin.php         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'core')

diff --git a/core/ajax/update.php b/core/ajax/update.php
index 377da746100..6def2c6797b 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -187,7 +187,7 @@ if (\OCP\Util::needUpgrade()) {
 		$eventSource->send('success', (string)$l->t('Checked database schema update for apps'));
 	});
 	$updater->listen('\OC\Updater', 'appUpgrade', function ($app, $version) use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Updated "%s" to %s', array($app, $version)));
+		$eventSource->send('success', (string)$l->t('Updated "%1$s" to %2$s', array($app, $version)));
 	});
 	$updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use (&$incompatibleApps) {
 		$incompatibleApps[]= $app;
diff --git a/core/templates/loginflow/authpicker.php b/core/templates/loginflow/authpicker.php
index 4e2282a1807..7c7eabd308c 100644
--- a/core/templates/loginflow/authpicker.php
+++ b/core/templates/loginflow/authpicker.php
@@ -30,7 +30,7 @@ $urlGenerator = $_['urlGenerator'];
 <div class="picker-window">
 	<h2><?php p($l->t('Connect to your account')) ?></h2>
 	<p class="info">
-		<?php print_unescaped($l->t('Please log in before granting %s access to your %s account.', [
+		<?php print_unescaped($l->t('Please log in before granting %1$s access to your %2$s account.', [
 								'<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
 								\OCP\Util::sanitizeHTML($_['instanceName'])
 							])) ?>
diff --git a/core/templates/loginflow/grant.php b/core/templates/loginflow/grant.php
index 6278e910bdb..a03b31f762c 100644
--- a/core/templates/loginflow/grant.php
+++ b/core/templates/loginflow/grant.php
@@ -30,7 +30,7 @@ $urlGenerator = $_['urlGenerator'];
 <div class="picker-window">
 	<h2><?php p($l->t('Account access')) ?></h2>
 	<p class="info">
-		<?php print_unescaped($l->t('You are about to grant %s access to your %s account.', [
+		<?php print_unescaped($l->t('You are about to grant %1$s access to your %2$s account.', [
 								'<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
 								\OCP\Util::sanitizeHTML($_['instanceName'])
 							])) ?>
diff --git a/core/templates/untrustedDomain.php b/core/templates/untrustedDomain.php
index 1443c412821..7de4ff78f30 100644
--- a/core/templates/untrustedDomain.php
+++ b/core/templates/untrustedDomain.php
@@ -8,6 +8,6 @@
 	</p>
 	<br />
 	<p>
-		<?php print_unescaped($l->t('Further information how to configure this can be found in the %sdocumentation%s.', ['<a href="' . $_['docUrl'] . '" target="blank">', '</a>'])); ?>
+		<?php print_unescaped($l->t('Further information how to configure this can be found in the %1$sdocumentation%2$s.', ['<a href="' . $_['docUrl'] . '" target="blank">', '</a>'])); ?>
 	</p>
 </div>
diff --git a/core/templates/update.admin.php b/core/templates/update.admin.php
index e8087b297e9..f4a1c72ae8d 100644
--- a/core/templates/update.admin.php
+++ b/core/templates/update.admin.php
@@ -3,7 +3,7 @@
 		<?php if ($_['isAppsOnlyUpgrade']) { ?>
 		<h2 class="title"><?php p($l->t('App update required')); ?></h2>
 		<?php } else { ?>
-		<h2 class="title"><?php p($l->t('%s will be updated to version %s',
+		<h2 class="title"><?php p($l->t('%1$s will be updated to version %2$s',
 			array($_['productName'], $_['version']))); ?></h2>
 		<?php } ?>
 		<?php if (!empty($_['appsToUpgrade'])) { ?>
-- 
cgit v1.2.3