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 c2ec897e13686afd42881a73ed844b9937f5179d (commit)
from d683415babad77e4d33cb9a6961ee1aacb7dc34e (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=c2ec897e13686afd42881a73ed844b9937f5179d
commit c2ec897e13686afd42881a73ed844b9937f5179d
Author: Marc-Etienne Vargenau <[email protected]>
Date: Tue Jul 5 17:34:43 2016 +0200
Shorter strings for easier translation
diff --git a/src/common/mail/MailingList.class.php
b/src/common/mail/MailingList.class.php
index 8b5fb96..3cda451 100644
--- a/src/common/mail/MailingList.class.php
+++ b/src/common/mail/MailingList.class.php
@@ -191,24 +191,24 @@ class MailingList extends FFError {
db_rollback();
return false;
} else {
- $mailBody = sprintf(_('A mailing list will be created
on %1$s in one hour
-and you are the list administrator.
+ $mailBody = sprintf(_('A mailing list will be created
on %s in one hour and you are the list administrator.'), forge_get_config
('forge_name'))
-This list is: %3$s@%2$s .
+ . sprintf(_('This list is: %1$s@%2$s'),
$realListName, forge_get_config('lists_host')) . "\n\n"
-Your mailing list info is at:
-%4$s .
+ . _('Your mailing list info is at:') .
"\n"
+ . $this->getExternalInfoUrl() . "\n\n"
-List administration can be found at:
-%5$s .
+ . _('List administration can be found
at:') . "\n"
+ . $this->getExternalAdminUrl() . "\n\n"
-Your list password is: %6$s .
-You are encouraged to change this password as soon as possible.
+ . _('Your list password is: ') .
$listPassword . "\n"
+ . _('You are encouraged to change this
password as soon as possible.') . "\n\n"
-Thank you for registering your project with %1$s.'), forge_get_config
('forge_name'), forge_get_config('lists_host'), $realListName,
$this->getExternalInfoUrl(), $this->getExternalAdminUrl(), $listPassword);
- $mailBody .= "\n\n";
- $mailBody .= sprintf(_('-- the %s staff'),
forge_get_config ('forge_name'));
- $mailBody .= "\n";
+ . sprintf(_('Thank you for registering
your project with %s.'), forge_get_config ('forge_name'))
+ . "\n\n"
+
+ . sprintf(_('-- the %s staff'),
forge_get_config ('forge_name'))
+ . "\n";
$mailSubject = sprintf(_('%s New Mailing List'),
forge_get_config ('forge_name'));
-----------------------------------------------------------------------
Summary of changes:
src/common/mail/MailingList.class.php | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
