[MediaWiki-commits] [Gerrit] BsMailer: Fixed mail footer - change (mediawiki...BlueSpiceFoundation)
Robert Vogel has submitted this change and it was merged.
Change subject: BsMailer: Fixed mail footer
..
BsMailer: Fixed mail footer
* Mail footer message gets actually rendered now
* Updated qqq: There was a param (sitename) that can be used
* Used the site name param in de, de-formal and en
* P2: Removed Space, Removed {} in $sFooter var assignment
Change-Id: I159402b7df390cf3d7a6261df3355c1bdab03604
---
M i18n/core/de-formal.json
M i18n/core/de.json
M i18n/core/en.json
M i18n/core/qqq.json
M includes/Mailer.class.php
5 files changed, 13 insertions(+), 11 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
Tweichart: Checked; Looks good to me, but someone else must approve
Raimond Spekking: Looks good to me, but someone else must approve
diff --git a/i18n/core/de-formal.json b/i18n/core/de-formal.json
index 07df833..f685108 100644
--- a/i18n/core/de-formal.json
+++ b/i18n/core/de-formal.json
@@ -1,6 +1,6 @@
{
@metadata: [],
- bs-email-footer: Dies ist eine automatisch generierte E-Mail. Bitte
antworten Sie nicht auf diese E-Mail!,
+ bs-email-footer: Dies ist eine automatisch generierte E-Mail aus $1.
Bitte antworten Sie nicht auf diese E-Mail!,
bs-userpreferences-link-title: Zeigt Ihre persönlichen
Benutzereinstellungen an.,
bs-exception-view-admin-hint: Bitte kontaktieren Sie Ihren
Administrator.,
bs-imageofotheruser: Sie sind nicht berechtigt, ein Bild für einen
anderen Benutzer hochzuladen.
diff --git a/i18n/core/de.json b/i18n/core/de.json
index 6cea030..c33db88 100644
--- a/i18n/core/de.json
+++ b/i18n/core/de.json
@@ -27,7 +27,7 @@
bs-now: jetzt,
bs-email-greeting-receiver: {{GENDER:$1|Hallo Herr $2|Hallo Frau
$2|Hallo $2}},,
bs-email-greeting-no-receiver: Hallo,,
- bs-email-footer: Dies ist eine automatisch generierte E-Mail. Bitte
antworte nicht auf diese E-Mail!,
+ bs-email-footer: Dies ist eine automatisch generierte E-Mail aus $1.
Bitte antworte nicht auf diese E-Mail!,
bs-userpagesettings-legend: Benutzereinstellungen,
bs-userpreferences-link-text: Weitere Benutzereinstellungen,
bs-userpreferences-link-title: Zeigt deine persönlichen
Benutzereinstellungen an,
diff --git a/i18n/core/en.json b/i18n/core/en.json
index 8bd6e27..96eea79 100644
--- a/i18n/core/en.json
+++ b/i18n/core/en.json
@@ -27,7 +27,7 @@
bs-now: now,
bs-email-greeting-receiver: {{GENDER:$1|Hello Mr $2|Hello Mrs
$2|Hello $2}},,
bs-email-greeting-no-receiver: Hello,,
- bs-email-footer: This message was generated automatically. Please do
not reply to this email.,
+ bs-email-footer: This message was generated automatically by $1.
Please do not reply to this email.,
bs-userpagesettings-legend: User settings,
bs-userpreferences-link-text: More user settings,
bs-userpreferences-link-title: Display your personal user settings,
diff --git a/i18n/core/qqq.json b/i18n/core/qqq.json
index 3363582..20c3ec6 100644
--- a/i18n/core/qqq.json
+++ b/i18n/core/qqq.json
@@ -31,7 +31,7 @@
bs-now: Text shown for \now\ when indicating how long ago an event
was.\n{{Identical|Now}},
bs-email-greeting-receiver: Used in emails as first line in body to
greet the receiver.\n\nParameters:\n* $1 is the username of the receiver - use
for GENDER distinction \n*$2 is real name of the receiver, if the receiver has
not set a real name it is the username,
bs-email-greeting-no-receiver: Used in emails as first line in body
to greet the reveiver\n{{Identical|Hello}},
- bs-email-footer: Used in plain text mails as last line,
+ bs-email-footer: Used in mails as last line\n* $1 is the site name
($wgSitename),
bs-userpagesettings-legend: Label for section with links to special
user related settings,
bs-userpreferences-link-text: Label for link to user preferences on
user page,
bs-userpreferences-link-title: Title (shown as flyout) for link to
user preferences on user page,
diff --git a/includes/Mailer.class.php b/includes/Mailer.class.php
index 1c69e62..96bcfdd 100644
--- a/includes/Mailer.class.php
+++ b/includes/Mailer.class.php
@@ -118,10 +118,13 @@
);
}
- $sFooter = ( $this-bSendHTML ) ? br /br
/-br /br / : \n\n-\n\n;
- $sFooter .= wfMessage( 'bs-email-footer', $wgSitename
)-plain() . ( $this-bSendHTML )
- ? br /br /-
- : \n\n-;
+ //Note that this is system lang!
+ $sNL = $this-bSendHTML ? br / : \n;
+ $sFooter =
+ $sNL$sNL-$sNL$sNL
+ .wfMessage( 'bs-email-footer', $wgSitename )-text()
+
[MediaWiki-commits] [Gerrit] BsMailer: Fixed mail footer - change (mediawiki...BlueSpiceFoundation)
Pwirth has uploaded a new change for review.
https://gerrit.wikimedia.org/r/195561
Change subject: BsMailer: Fixed mail footer
..
BsMailer: Fixed mail footer
* Mail footer message gets actually rendered now
* Updated qqq: There was a param (sitename) that can be used
* Used the site name param in de, de-formal and en
Change-Id: I159402b7df390cf3d7a6261df3355c1bdab03604
---
M i18n/core/de-formal.json
M i18n/core/de.json
M i18n/core/en.json
M i18n/core/qqq.json
M includes/Mailer.class.php
5 files changed, 13 insertions(+), 11 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation
refs/changes/61/195561/1
diff --git a/i18n/core/de-formal.json b/i18n/core/de-formal.json
index 07df833..f685108 100644
--- a/i18n/core/de-formal.json
+++ b/i18n/core/de-formal.json
@@ -1,6 +1,6 @@
{
@metadata: [],
- bs-email-footer: Dies ist eine automatisch generierte E-Mail. Bitte
antworten Sie nicht auf diese E-Mail!,
+ bs-email-footer: Dies ist eine automatisch generierte E-Mail aus $1.
Bitte antworten Sie nicht auf diese E-Mail!,
bs-userpreferences-link-title: Zeigt Ihre persönlichen
Benutzereinstellungen an.,
bs-exception-view-admin-hint: Bitte kontaktieren Sie Ihren
Administrator.,
bs-imageofotheruser: Sie sind nicht berechtigt, ein Bild für einen
anderen Benutzer hochzuladen.
diff --git a/i18n/core/de.json b/i18n/core/de.json
index 6cea030..c33db88 100644
--- a/i18n/core/de.json
+++ b/i18n/core/de.json
@@ -27,7 +27,7 @@
bs-now: jetzt,
bs-email-greeting-receiver: {{GENDER:$1|Hallo Herr $2|Hallo Frau
$2|Hallo $2}},,
bs-email-greeting-no-receiver: Hallo,,
- bs-email-footer: Dies ist eine automatisch generierte E-Mail. Bitte
antworte nicht auf diese E-Mail!,
+ bs-email-footer: Dies ist eine automatisch generierte E-Mail aus $1.
Bitte antworte nicht auf diese E-Mail!,
bs-userpagesettings-legend: Benutzereinstellungen,
bs-userpreferences-link-text: Weitere Benutzereinstellungen,
bs-userpreferences-link-title: Zeigt deine persönlichen
Benutzereinstellungen an,
diff --git a/i18n/core/en.json b/i18n/core/en.json
index 8bd6e27..96eea79 100644
--- a/i18n/core/en.json
+++ b/i18n/core/en.json
@@ -27,7 +27,7 @@
bs-now: now,
bs-email-greeting-receiver: {{GENDER:$1|Hello Mr $2|Hello Mrs
$2|Hello $2}},,
bs-email-greeting-no-receiver: Hello,,
- bs-email-footer: This message was generated automatically. Please do
not reply to this email.,
+ bs-email-footer: This message was generated automatically by $1.
Please do not reply to this email.,
bs-userpagesettings-legend: User settings,
bs-userpreferences-link-text: More user settings,
bs-userpreferences-link-title: Display your personal user settings,
diff --git a/i18n/core/qqq.json b/i18n/core/qqq.json
index 3363582..20c3ec6 100644
--- a/i18n/core/qqq.json
+++ b/i18n/core/qqq.json
@@ -31,7 +31,7 @@
bs-now: Text shown for \now\ when indicating how long ago an event
was.\n{{Identical|Now}},
bs-email-greeting-receiver: Used in emails as first line in body to
greet the receiver.\n\nParameters:\n* $1 is the username of the receiver - use
for GENDER distinction \n*$2 is real name of the receiver, if the receiver has
not set a real name it is the username,
bs-email-greeting-no-receiver: Used in emails as first line in body
to greet the reveiver\n{{Identical|Hello}},
- bs-email-footer: Used in plain text mails as last line,
+ bs-email-footer: Used in mails as last line\n* $1 is the site name
($wgSitename),
bs-userpagesettings-legend: Label for section with links to special
user related settings,
bs-userpreferences-link-text: Label for link to user preferences on
user page,
bs-userpreferences-link-title: Title (shown as flyout) for link to
user preferences on user page,
diff --git a/includes/Mailer.class.php b/includes/Mailer.class.php
index 1c69e62..e66f1e7 100644
--- a/includes/Mailer.class.php
+++ b/includes/Mailer.class.php
@@ -118,10 +118,13 @@
);
}
- $sFooter = ( $this-bSendHTML ) ? br /br
/-br /br / : \n\n-\n\n;
- $sFooter .= wfMessage( 'bs-email-footer', $wgSitename
)-plain() . ( $this-bSendHTML )
- ? br /br /-
- : \n\n-;
+ //Note that this is system lang!
+ $sNL = $this-bSendHTML ? br / : \n;
+ $sFooter =
+ $sNL{$sNL}-$sNL{$sNL}
+ .wfMessage( 'bs-email-footer', $wgSitename )-text()
+ .$sNL{$sNL}-
+ ;
$sCombinedMsg = $sMsg.$sFooter;
@@ -139,9 +142,8 @@
