esme-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhir...@apache.org
Subject svn commit: r916604 - in /incubator/esme/trunk/server/src/main: resources/ESMEBase.properties scala/org/apache/esme/lib/ActionMgr.scala
Date Fri, 26 Feb 2010 07:54:46 GMT
Author: rhirsch
Date: Fri Feb 26 07:54:46 2010
New Revision: 916604

URL: http://svn.apache.org/viewvc?rev=916604&view=rev
Log:
[ESME-119] Messages for Action Page

Modified:
    incubator/esme/trunk/server/src/main/resources/ESMEBase.properties
    incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/ActionMgr.scala

Modified: incubator/esme/trunk/server/src/main/resources/ESMEBase.properties
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/resources/ESMEBase.properties?rev=916604&r1=916603&r2=916604&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/resources/ESMEBase.properties (original)
+++ incubator/esme/trunk/server/src/main/resources/ESMEBase.properties Fri Feb 26 07:54:46
2010
@@ -69,22 +69,29 @@
 base_user_err_login=Unable to log you in: %s
 base_user_err_no_auth=Failed to authenticate
 base_user_err_duplicate_nickname=The username '%s' is taken, please choose another
+base_user_edit_openid_save=The OpenID ID was saved
+base_user_edit_openid_duplicate=This OpenID URL is registered with another user
 
 base_token_menu=Tokens
 base_token_error_name_short=Token description too short!
-base_token_msg_new_token=A new token has been created. 
+base_token_msg_new_token=A new token '%s' has been created. 
+base_token_msg_removed=Action '%s' removed
 
 base_track_menu=Tracks
 base_track_error_name_short=Track is too short!
-base_track_msg_success=Now tracking %s
+base_track_msg_success=Now tracking '%s'
+base_track_msg_removed=Track removed
+base_track_msg_active=Active state of the track changed
 
 base_streams_menu=Streams
 base_streams_resend_any=--any--
 base_streams_pool_default=--default--
 
 base_actions_menu=Actions
-base_action_msg_new_action=A new action has been created.
+base_action_msg_new_action=A new action '%s' has been created.
 base_action_error_min_len=The name must be at least 2 characters long!
+base_action_msg_removed=Action '%s' removed
+base_action_msg_active=Active state of the action changed
 
 base_twitter_api_err_user_not_found=User was not found
 base_twitter_api_err_user_not_included=Message was not included

Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/ActionMgr.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/ActionMgr.scala?rev=916604&r1=916603&r2=916604&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/ActionMgr.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/ActionMgr.scala Fri Feb
26 07:54:46 2010
@@ -81,13 +81,13 @@
                       (lst => xs.flatMap(i => bind("item", lst,
                                                    "name" -> i.name.is,
                                                    "enabled" -> ajaxCheckbox(!i.disabled,
-                                                                             e => {i.disabled(!e).save;
Noop} ),
+                                                                             e => {i.disabled(!e).save;
S.notice(S.?("base_action_msg_active")); Noop} ),
                                                    "test" -> i.testText,
                                                    "action" -> i.actionText,
                                                    "createdDate" -> getDateHtml(i.createdDate),
                                                    "remove" -> 
                                                    ((bt: NodeSeq) => 
-                  ajaxButton(bt, () => {i.removed(true).save ; updateSpan()}))
+                  ajaxButton(bt, () => {i.removed(true).save ; S.notice(S.?("base_action_msg_removed",
i.name.is)); updateSpan()}))
               ))))
     }
 
@@ -118,7 +118,7 @@
         act match {
           case Full(Nil) =>
             toSave.save 
-            S.notice(S.?("base_action_msg_new_action"))
+            S.notice(S.?("base_action_msg_new_action", name))
             redisplay() &
             SetValById(mainName, "") &
             SetValById(mainAction, "") &



Mime
View raw message