diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-05-15 13:36:06 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-05-15 13:36:06 +0200 |
| commit | f2500da8ec2c649ee59afd47fe99321e92a249e7 (patch) | |
| tree | 795e3e70dba8257b6915a470af8b58fedf1ef8e6 | |
| parent | cc0446dc17aeb3639b374a6688e32fca271e0694 (diff) | |
| parent | dceea23b1f861d848419b7a3fa284dcc65749abb (diff) | |
| download | forums-f2500da8ec2c649ee59afd47fe99321e92a249e7.tar forums-f2500da8ec2c649ee59afd47fe99321e92a249e7.tar.gz forums-f2500da8ec2c649ee59afd47fe99321e92a249e7.tar.bz2 forums-f2500da8ec2c649ee59afd47fe99321e92a249e7.tar.xz forums-f2500da8ec2c649ee59afd47fe99321e92a249e7.zip | |
Merge pull request #2454 from nickvergessen/ticket/12540
[ticket/12540] Fix broken placeholders in language files
* nickvergessen/ticket/12540:
[ticket/12540] Fix broken placeholders in language files
| -rw-r--r-- | phpBB/language/en/common.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/posting.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/ucp.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 0bf48eb841..cc38804fe2 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -90,7 +90,7 @@ $lang = array_merge($lang, array( 'AVATAR_PHP_SIZE_OVERRUN' => 'The avatar’s filesize is too large. The maximum allowed upload size is %1$d %2$s.<br />Please note this is set in php.ini and cannot be overridden.', 'AVATAR_URL_INVALID' => 'The URL you specified is invalid.', 'AVATAR_URL_NOT_FOUND' => 'The file specified could not be found.', - 'AVATAR_WRONG_FILESIZE' => 'The avatar’s filesize must be between 0 and %1d %2s.', + 'AVATAR_WRONG_FILESIZE' => 'The avatar’s filesize must be between 0 and %1$d %2$s.', 'AVATAR_WRONG_SIZE' => 'The submitted avatar is %5$d pixels wide and %6$d pixels high. Avatars must be at least %1$d pixels wide and %2$d pixels high, but no larger than %3$d pixels wide and %4$d pixels high.', 'BACK_TO_TOP' => 'Top', diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php index dfc5065a05..df411c3228 100644 --- a/phpBB/language/en/posting.php +++ b/phpBB/language/en/posting.php @@ -219,7 +219,7 @@ $lang = array_merge($lang, array( 'VIEW_MESSAGE' => '%sView your submitted message%s', 'VIEW_PRIVATE_MESSAGE' => '%sView your submitted private message%s', - 'WRONG_FILESIZE' => 'The file is too big, maximum allowed size is %1d %2s.', + 'WRONG_FILESIZE' => 'The file is too big, maximum allowed size is %1$d %2$s.', 'WRONG_SIZE' => 'The image must be at least %1$d pixels wide, %2$d pixels high and at most %3$d pixels wide and %4$d pixels high. The submitted image is %5$d pixels wide and %6$d pixels high.', )); diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index ad11213052..641cf6a70a 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -266,7 +266,7 @@ $lang = array_merge($lang, array( 'MOVE_DELETED_MESSAGES_TO' => 'Move messages from removed folder to', 'MOVE_DOWN' => 'Move down', 'MOVE_MARKED_TO_FOLDER' => 'Move marked to %s', - 'MOVE_PM_ERROR' => 'An error occurred while moving the messages to the new folder, only %1d from %2d messages were moved.', + 'MOVE_PM_ERROR' => 'An error occurred while moving the messages to the new folder, only %1$d from %2$d messages were moved.', 'MOVE_TO_FOLDER' => 'Move to folder', 'MOVE_UP' => 'Move up', |