Skip to content

Commit

Permalink
SAK-28021 Rwiki send email notifications with empty subject in none e…
Browse files Browse the repository at this point in the history
…nglish locales

git-svn-id: https://source.sakaiproject.org/svn/rwiki/trunk@315023 66ffb92e-73f9-0310-93c1-f5514f145a0a
  • Loading branch information
juanjmerono committed Oct 30, 2014
1 parent b4524f7 commit 55d682b
Show file tree
Hide file tree
Showing 7 changed files with 3 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ SiteEmailNotificationRWiki.30=This automatic notification message was sent by
SiteEmailNotificationRWiki.3=) from the
SiteEmailNotificationRWiki.35=\ site.\n
SiteEmailNotificationRWiki.36=You can modify how you receive notifications at My Workspace > Preferences.
SiteEmailNotificationRWiki.37=Subject:
XLSTChangesHandler.19=Change History for
XLSTChangesHandler.21=Recent Changes in
XLSTChangesHandler.23=Recent Changes in
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ SiteEmailNotificationRWiki.30=Aquesta notificaci\u00f3 l'ha enviat
SiteEmailNotificationRWiki.3=) des de
SiteEmailNotificationRWiki.35=\ espai.\n
SiteEmailNotificationRWiki.36=Podeu modificar com rebre aquestes notificacions a\: El meu espai de treball >Prefer\u00e8ncies
SiteEmailNotificationRWiki.37=Assumpte\:
XLSTChangesHandler.19=Canvia l'hist\u00f2ric per
XLSTChangesHandler.21=Canvis recents a
XLSTChangesHandler.23=Canvis recents a
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ SiteEmailNotificationRWiki.30=Diese automatische Benachrichtigung wurde gesendet
SiteEmailNotificationRWiki.3=) von der
SiteEmailNotificationRWiki.35=\ Site.\n
SiteEmailNotificationRWiki.36=Sie k\u00f6nnen die Art, in der Sie Benachrichtigungen erhalten, in Arbeitsplatz > Einstellungen \u00e4ndern.
SiteEmailNotificationRWiki.37=Betreff:
XLSTChangesHandler.19=\u00c4nderungsverlauf f\u00fcr
XLSTChangesHandler.21=Letzte \u00c4nderungen in
XLSTChangesHandler.23=Letzte \u00c4nderungen in
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,13 +121,12 @@ SiteEmailNotificationRWiki.16=\ Modificado el\:
SiteEmailNotificationRWiki.18=\ Modificado por el usuario\:
SiteEmailNotificationRWiki.19=\ P\u00e1gina\:
SiteEmailNotificationRWiki.4=\ Contenido\: \n
SiteEmailNotificationRWiki.27=Subject\: La p\u00e1gina wiki
SiteEmailNotificationRWiki.27=La p\u00e1gina wiki
SiteEmailNotificationRWiki.28=\ ha sido modificada
SiteEmailNotificationRWiki.30=Este mensaje autom\u00e1tico fue enviado por
SiteEmailNotificationRWiki.3=) desde el sitio
SiteEmailNotificationRWiki.35=\ .\n
SiteEmailNotificationRWiki.36=Puedes modificar c\u00f3mo recibir notificaciones en MiAulario > Preferencias
SiteEmailNotificationRWiki.37=Asunto\:
XLSTChangesHandler.19=Cambiar el Historial por
XLSTChangesHandler.21=Cambios recientes en
XLSTChangesHandler.23=Cambios recientes en
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ SiteEmailNotificationRWiki.30=\u0926\u094d\u0935\u093e\u0930\u093e \u092d\u0947\
SiteEmailNotificationRWiki.3=) \u0938\u0947
SiteEmailNotificationRWiki.35=\ \u0938\u093e\u0907\u091f\u0964
SiteEmailNotificationRWiki.36=\u0915\u093e\u0930\u094d\u092f\u0915\u094d\u0937\u0947\u0924\u094d\u0930 >\u092a\u094d\u0930\u093e\u0925\u092e\u093f\u0915\u0924\u093e \u092a\u0930 \u0906\u092a \u0938\u0902\u0936\u094b\u0927\u093f\u0924 \u0915\u0930 \u0938\u0915\u0924\u0947 \u0939\u0948 \u0915\u093f \u0906\u092a \u0938\u0942\u091a\u0928\u093e\u090f\u0902 \u0915\u0948\u0938\u0947 \u092a\u094d\u0930\u093e\u092a\u094d\u0924 \u0915\u0930\u0947
SiteEmailNotificationRWiki.37=\u0935\u093f\u0937\u092f
XLSTChangesHandler.19=\u0915\u0947 \u0932\u093f\u090f \u0907\u0924\u093f\u0939\u093e\u0938 \u092a\u0930\u093f\u0935\u0930\u094d\u0924\u093f\u0924 \u0915\u0930\u0947\u0902
XLSTChangesHandler.21=\ \u092e\u0947\u0902 \u0939\u093e\u0932 \u0939\u0940 \u0915\u0947 \u092a\u0930\u093f\u0935\u0930\u094d\u0924\u0928
XLSTChangesHandler.23=\ \u092e\u0947\u0902 \u0939\u093e\u0932 \u0939\u0940 \u0915\u0947 \u092a\u0930\u093f\u0935\u0930\u094d\u0924\u0928
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ SiteEmailNotificationRWiki.30=\u6B64\u81EA\u52A8\u901A\u77E5\u90AE\u4EF6\u7531
SiteEmailNotificationRWiki.3=)\u53D1\u9001\uFF0C
SiteEmailNotificationRWiki.35=\ \u7AD9\u70B9\u3002\n
SiteEmailNotificationRWiki.36=\u60A8\u53EF\u4EE5\u901A\u8FC7 \u6211\u7684\u5DE5\u4F5C\u7A7A\u95F4 > \u7528\u6237\u504F\u597D \u4E2D\u4FEE\u6539\u63A5\u6536\u901A\u77E5\u90AE\u4EF6\u7684\u9009\u9879\u3002
SiteEmailNotificationRWiki.37=\u4E3B\u9898\uFF1A
XLSTChangesHandler.19=\u4FEE\u6539\u5386\u53F2\uFF1A
XLSTChangesHandler.21=\u6700\u8FD1\u4FEE\u6539\uFF1A
XLSTChangesHandler.23=\u6700\u8FD1\u4FEE\u6539\uFF1A
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,8 @@ protected List<String> getHeaders(Event e) {
String localName = NameHelper.localizeName(pageName, realm);

StringBuilder subjectHeader = new StringBuilder();
subjectHeader.append(rl.getString("SiteEmailNotificationRWiki.37", "Subject: "))
// This string "Subject: " should not be translated is processed by smtp
subjectHeader.append("Subject: ")
.append(rl.getString("SiteEmailNotificationRWiki.27"))
.append(localName)
.append(rl.getString("SiteEmailNotificationRWiki.28"));
Expand Down

0 comments on commit 55d682b

Please sign in to comment.