svn commit: r826622 - /incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala

[rh...@apache.org]

Author: rhirsch
Date: Mon Oct 19 09:49:55 2009
New Revision: 826622

URL: http://svn.apache.org/viewvc?rev=826622&view=rev
Log:
Removed S.? for some messages, because it doesn't work with setTextAndTags - no idea why - Texts with %s are in the resource bundle but exceptions are always thrown if used,

Modified:
    incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala

Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala?rev=826622&r1=826621&r2=826622&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala Mon Oct 19 09:49:55 2009
@@ -59,8 +59,8 @@
     Message.create.author(in.id).
     when(Helpers.timeNow.getTime).
     source("profile").
-    setTextAndTags(S.?("base_user_msg_change",in.nickname, in.wholeName, in.imageUrl), Nil, Empty).
-    foreach{ msg =>
+    setTextAndTags("User " + in.nickname + " changed profile. Name: " + in.wholeName + ", Image: " + in.imageUrl, Nil, Empty).
+     foreach{ msg =>
       if (msg.save) {
         Distributor ! Distributor.AddMessageToMailbox(in.id, msg, ProfileReason(in.id))
       }
@@ -198,7 +198,7 @@
         Message.create.author(who.id).
         when(Helpers.timeNow.getTime).
         source("followed").
-        setTextAndTags(S.?("base_user_msg_follow", this.nickname,who.nickname), Nil, Empty).
+        setTextAndTags("User " + this.nickname + " followed " + who.nickname + ".", Nil, Empty).
         foreach { msg =>
           if (msg.save) {
             Distributor ! Distributor.AddMessageToMailbox(who.id, msg, FollowedReason(this.id))
@@ -216,7 +216,7 @@
       if (r.delete_!) Message.create.author(who.id).
       when(Helpers.timeNow.getTime).
       source("unfollowed").
-      setTextAndTags(S.?("base_user_msg_unfollow", this.nickname,who.nickname), Nil, Empty).
+      setTextAndTags("User " + this.nickname + " unfollowed " + who.nickname + ".", Nil, Empty).
       foreach{ msg =>
         if (msg.save) {
           Distributor ! Distributor.AddMessageToMailbox(who.id, msg, UnfollowedReason(this.id))