This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via 20edd3a1aacc8c7dbdda8fbe59234c34bdf89145 (commit)
from 895de0ee41d77d6e6a22a8317e364691f59ee3bf (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=20edd3a1aacc8c7dbdda8fbe59234c34bdf89145
commit 20edd3a1aacc8c7dbdda8fbe59234c34bdf89145
Author: Aaron Nottbeck <[email protected]>
Date: Wed Apr 14 10:22:12 2021 +0200
[#937] Internationalization for tracker emails
diff --git a/src/common/tracker/Artifact.class.php
b/src/common/tracker/Artifact.class.php
index 1b0b12c..522d045 100644
--- a/src/common/tracker/Artifact.class.php
+++ b/src/common/tracker/Artifact.class.php
@@ -1894,40 +1894,40 @@ class Artifact extends FFObject {
$body = $this->ArtifactType->Group->getUnixName() . '-' . $name
.' '. $this->getStringID();
if ($type == 1) {
- $body .= ' was opened at '.date('Y-m-d H:i',
$this->getOpenDate());
+ $body .= sprintf(_(" was opened at %s"), date('Y-m-d
H:i', $this->getOpenDate()));
} elseif ($type == 3) {
- $body .= ' was deleted at '.date('Y-m-d H:i', time());
+ $body .= sprintf(_(" was deleted at %s"), date('Y-m-d
H:i', time()));
} else {
- $body .= ' was changed at '.date('Y-m-d H:i', $tm);
+ $body .= sprintf(_(" was changed at %s"), date('Y-m-d
H:i', $tm));
}
if ($sess) {
- $body .= ' by ' . $sess->getRealName();
+ $body .= _(' by ') . $sess->getRealName();
}
if ($type == 1 || $type == 2) {
- $body .= "\nYou can respond by visiting: ".
+ $body .= "\n"._("You can respond by visiting: ").
"\n".util_make_url($this->getPermalink());
if (false) { // currently not working
$body .=
- "\nOr by replying to this e-mail entering your
response between the following markers: ".
- "\n".ARTIFACT_MAIL_MARKER.
+ sprintf(_("\nOr by replying to this e-mail
entering your response between the following markers: ".
+ "\n%1$s".
"\n(enter your response here, only in plain
text format)".
- "\n".ARTIFACT_MAIL_MARKER;
+ "\n%1$s"), ARTIFACT_MAIL_MARKER,
ARTIFACT_MAIL_MARKER);
}
$body .= "\n";
}
$body .= "\n".$this->marker('status',$changes).
- "Status: ". $this->getStatusName() ."\n".
+ _("Status: "). $this->getStatusName() ."\n".
$this->marker('priority',$changes).
- "Priority: ". $this->getPriority() ."\n".
- "Submitted By: ". $this->getSubmittedRealName() .
+ _("Priority: "). $this->getPriority() ."\n".
+ _("Submitted By: "). $this->getSubmittedRealName() .
" (". $this->getSubmittedUnixName(). ")"."\n".
$this->marker('assigned_to',$changes).
- "Assigned to: ". $this->getAssignedRealName() .
+ _("Assigned to: "). $this->getAssignedRealName() .
" (". $this->getAssignedUnixName(). ")"."\n".
$this->marker('summary',$changes).
- "Summary: ".
util_unconvert_htmlspecialchars($this->getSummary())." \n";
+ _("Summary: ").
util_unconvert_htmlspecialchars($this->getSummary())." \n";
// Now display the extra fields
$efd = $this->getExtraFieldDataText();
@@ -1971,7 +1971,7 @@ class Artifact extends FFObject {
}
}
- $body .= "\n\nInitial Comment:".
+ $body .= "\n\n"._("Initial Comment:").
"\n".util_unconvert_htmlspecialchars($this->getDetails()) .
"\n\n----------------------------------------------------------------------";
@@ -2001,9 +2001,9 @@ class Artifact extends FFObject {
if ($i == 0) {
$body .=
$this->marker('details',$changes);
}
- $body .= "Comment By: ".
db_result($result2,$i,'realname') . " (".db_result($result2,$i,'user_name').")".
- "\nDate: ". date(_('Y-m-d
H:i'),db_result($result2,$i,'adddate')).
- "\n\nMessage:".
+ $body .= _("Comment By: ").
db_result($result2,$i,'realname') . " (".db_result($result2,$i,'user_name').")".
+ "\n"._("Date: "). date(_('Y-m-d
H:i'),db_result($result2,$i,'adddate')).
+ "\n\n"._("Message:").
"\n".util_unconvert_htmlspecialchars(db_result($result2,$i,'body')).
"\n\n----------------------------------------------------------------------";
}
@@ -2011,7 +2011,7 @@ class Artifact extends FFObject {
}
- $body .= "\n\nYou can respond by visiting: ".
+ $body .= "\n\n"._("You can respond by visiting: ").
"\n".util_make_url($this->getPermalink());
//only send if some recipients were found
-----------------------------------------------------------------------
Summary of changes:
src/common/tracker/Artifact.class.php | 36 +++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
