From fdae41d7188f28914e4e23dc4ad688583624aad8 Mon Sep 17 00:00:00 2001 From: wordish <42463480+wordish@users.noreply.github.com> Date: Wed, 20 Apr 2022 18:06:10 -0700 Subject: [PATCH 1/3] Use numbered arguments Using numbered arguments will allow translators to switch the arguments order to allow more correct translations. --- mail/achievement_given.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mail/achievement_given.php b/mail/achievement_given.php index cfbbad2..761fe37 100644 --- a/mail/achievement_given.php +++ b/mail/achievement_given.php @@ -18,5 +18,5 @@ if ($userBadge->isGivenBySystem()) { $body = t("Congratulations! You got the achievement %s from the website.", $userBadge->getBadge()->getName()); } else { - $body = t("Congratulations! You got the achievement %s from the user %s.", $userBadge->getBadge()->getName(), $userBadge->getAwardGrant()->getUser()->getUserName()); -} \ No newline at end of file + $body = t("Congratulations! You got the achievement %1$s from the user %s.", $userBadge->getBadge()->getName(), $userBadge->getAwardGrant()->getUser()->getUserName()); +} From 6bd0359562fc576585bbc47c91b190843c089f19 Mon Sep 17 00:00:00 2001 From: wordish <42463480+wordish@users.noreply.github.com> Date: Wed, 20 Apr 2022 18:10:05 -0700 Subject: [PATCH 2/3] Update achievement_given.php --- mail/achievement_given.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mail/achievement_given.php b/mail/achievement_given.php index 761fe37..26ae012 100644 --- a/mail/achievement_given.php +++ b/mail/achievement_given.php @@ -18,5 +18,5 @@ if ($userBadge->isGivenBySystem()) { $body = t("Congratulations! You got the achievement %s from the website.", $userBadge->getBadge()->getName()); } else { - $body = t("Congratulations! You got the achievement %1$s from the user %s.", $userBadge->getBadge()->getName(), $userBadge->getAwardGrant()->getUser()->getUserName()); + $body = t("Congratulations! You got the achievement %1$s from the user %2$s.", $userBadge->getBadge()->getName(), $userBadge->getAwardGrant()->getUser()->getUserName()); } From 1174b986818108a88800476e2d029dbd0fe1a414 Mon Sep 17 00:00:00 2001 From: wordish <42463480+wordish@users.noreply.github.com> Date: Wed, 20 Apr 2022 18:10:38 -0700 Subject: [PATCH 3/3] Update award_given.php --- mail/award_given.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mail/award_given.php b/mail/award_given.php index 47520ee..4816531 100644 --- a/mail/award_given.php +++ b/mail/award_given.php @@ -18,5 +18,5 @@ if ($userBadge->isGivenBySystem()) { $body = t("Congratulations! You awarded the award %s from the website.", $userBadge->getBadge()->getName()); } else { - $body = t("Congratulations! You awarded the award %s from the user %s.", $userBadge->getBadge()->getName(), $userBadge->getAwardGrant()->getUser()->getUserName()); -} \ No newline at end of file + $body = t("Congratulations! You awarded the award %1$s from the user %2$s.", $userBadge->getBadge()->getName(), $userBadge->getAwardGrant()->getUser()->getUserName()); +}