You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@esme.apache.org by vd...@apache.org on 2010/02/07 22:27:03 UTC
svn commit: r907498 - in /incubator/esme/trunk/server/src/main:
resources/ESMEBase.properties scala/org/apache/esme/model/User.scala
Author: vdichev
Date: Sun Feb 7 21:27:03 2010
New Revision: 907498
URL: http://svn.apache.org/viewvc?rev=907498&view=rev
Log:
ESME-132 Localize duplicate nickname message
Modified:
incubator/esme/trunk/server/src/main/resources/ESMEBase.properties
incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.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=907498&r1=907497&r2=907498&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/resources/ESMEBase.properties (original)
+++ incubator/esme/trunk/server/src/main/resources/ESMEBase.properties Sun Feb 7 21:27:03 2010
@@ -68,7 +68,7 @@
base_user_err_openid_not_reg=Your OpenID '%s' is not registered
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_token_menu=Tokens
base_token_error_name_short=Token description too short!
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=907498&r1=907497&r2=907498&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 Sun Feb 7 21:27:03 2010
@@ -347,7 +347,7 @@
// getSingleton.findAll(By(getSingleton.nickname, str)).
filter(_.id.is != fieldOwner.id.is)
others.map{u =>
- val msg = "Duplicate nickname: " + str
+ val msg = S.?("base_user_err_duplicate_nickname", str)
S.error(msg)
FieldError(this, Text(msg))
}