[pal-cvs 2422] [154] put translation messages

svnno****@sourc***** svnno****@sourc*****
2007年 5月 22日 (火) 15:45:42 JST


Revision: 154
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=154
Author:   shinsuke
Date:     2007-05-22 15:45:41 +0900 (Tue, 22 May 2007)

Log Message:
-----------
put translation messages

Modified Paths:
--------------
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/UserRegistrationService.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/ForgottenPasswordPage.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/ResetPasswordPage.java
    pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/UserRegistrationPage.java
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/label.properties
    pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/label_ja.properties
    pal-admin/trunk/src/main/webapp/view/registration/resetPassword.html


-------------- next part --------------
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/UserRegistrationService.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/UserRegistrationService.java	2007-05-21 09:15:33 UTC (rev 153)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/UserRegistrationService.java	2007-05-22 06:45:41 UTC (rev 154)
@@ -289,7 +289,11 @@
     {
         Map map = PortalComponentUtil.getPortalAdministration()
                 .getNewLoginInfo(page.getGuid());
-
+        if (map == null)
+        {
+            throw new CommonException("forgotten.unable_to_update_pw",
+                    "The login info is null. ");
+        }
         String userName = (String) map.get("user.name");
         String newPassword = (String) map.get("password");
 

Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/ForgottenPasswordPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/ForgottenPasswordPage.java	2007-05-21 09:15:33 UTC (rev 153)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/ForgottenPasswordPage.java	2007-05-22 06:45:41 UTC (rev 154)
@@ -149,4 +149,8 @@
         return null;
     }
 
+    public String getDoFinishValue()
+    {
+        return getLabelHelper().getLabelValue("RequestNewPassword");
+    }
 }

Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/ResetPasswordPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/ResetPasswordPage.java	2007-05-21 09:15:33 UTC (rev 153)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/ResetPasswordPage.java	2007-05-22 06:45:41 UTC (rev 154)
@@ -1,5 +1,10 @@
 package jp.sf.pal.admin.web.registration;
 
+import java.io.IOException;
+import java.io.Serializable;
+
+import javax.faces.context.ExternalContext;
+import javax.faces.context.FacesContext;
 import javax.faces.internal.FacesMessageUtil;
 
 import jp.sf.pal.admin.service.UserRegistrationService;
@@ -8,9 +13,14 @@
 import org.seasar.framework.log.Logger;
 import org.seasar.teeda.extension.util.LabelHelper;
 
-public class ResetPasswordPage
+public class ResetPasswordPage implements Serializable
 {
     /**
+     * 
+     */
+    private static final long serialVersionUID = -8378731734943234757L;
+
+    /**
      * Logger for this class
      */
     private static final Logger logger = Logger
@@ -65,6 +75,23 @@
         this.userRegistrationService = userRegistrationService;
     }
 
+    public Class doLogin()
+    {
+        ExternalContext externalContext = FacesContext.getCurrentInstance()
+                .getExternalContext();
+        try
+        {
+            externalContext
+                    .redirect(externalContext.getRequestContextPath()
+                            + "/login/proxy?org.apache.jetspeed.login.username=&org.apache.jetspeed.login.password=");
+        }
+        catch (IOException e)
+        {
+            return ForgottenPasswordPage.class;
+        }
+        return null;
+    }
+
     public String initialize()
     {
         return null;
@@ -89,4 +116,13 @@
         return null;
     }
 
+    public String getDoLoginValue()
+    {
+        return getLabelHelper().getLabelValue("login");
+    }
+
+    public String getGoForgottenPasswordValue()
+    {
+        return getLabelHelper().getLabelValue("sendNewPassword");
+    }
 }

Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/UserRegistrationPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/UserRegistrationPage.java	2007-05-21 09:15:33 UTC (rev 153)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/UserRegistrationPage.java	2007-05-22 06:45:41 UTC (rev 154)
@@ -1105,4 +1105,8 @@
         }
         return null;
     }
+    
+    public String getDoFinishValue(){
+        return getLabelHelper().getLabelValue("SignUp");
+    }
 }

Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/label.properties
===================================================================
--- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/label.properties	2007-05-21 09:15:33 UTC (rev 153)
+++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/label.properties	2007-05-22 06:45:41 UTC (rev 154)
@@ -76,3 +76,9 @@
 
 email.subject.registration=Registration Confirmation For Portal Account
 email.subject.forgotten.password=Password Notification For Portal Account
+
+login=Login
+sendNewPassword=Send New Password
+RequestNewPassword=Request New Password
+SignUp=Sign Up
+

Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/label_ja.properties
===================================================================
--- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/label_ja.properties	2007-05-21 09:15:33 UTC (rev 153)
+++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/label_ja.properties	2007-05-22 06:45:41 UTC (rev 154)
@@ -75,4 +75,9 @@
 pageMessage=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u304a\u5fd8\u308c\u306e\u65b9\u306f\u3001\u6307\u5b9a\u3055\u308c\u305f\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3078\u65b0\u898f\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u9001\u4fe1\u3057\u307e\u3059\u3002\u767b\u9332\u3057\u305f\u6b63\u78ba\u306a\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
 email.subject.registration=\u30dd\u30fc\u30bf\u30eb\u30a2\u30ab\u30a6\u30f3\u30c8\u767b\u9332\u306e\u78ba\u8a8d
-email.subject.forgotten.password=\u30dd\u30fc\u30bf\u30eb\u30a2\u30ab\u30a6\u30f3\u30c8\u306e\u65b0\u898f\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u901a\u77e5
\ No newline at end of file
+email.subject.forgotten.password=\u30dd\u30fc\u30bf\u30eb\u30a2\u30ab\u30a6\u30f3\u30c8\u306e\u65b0\u898f\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u901a\u77e5
+
+login=\u30ed\u30b0\u30a4\u30f3
+sendNewPassword=\u65b0\u898f\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u9001\u4fe1
+RequestNewPassword=\u65b0\u898f\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u7533\u8acb
+SignUp=\u30b5\u30a4\u30f3\u30a2\u30c3\u30d7

Modified: pal-admin/trunk/src/main/webapp/view/registration/resetPassword.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/registration/resetPassword.html	2007-05-21 09:15:33 UTC (rev 153)
+++ pal-admin/trunk/src/main/webapp/view/registration/resetPassword.html	2007-05-22 06:45:41 UTC (rev 154)
@@ -13,7 +13,7 @@
 <!-- content: BEGIN -->
       <input id="guid" type="hidden"/>
       <div>
-        <a id="goForgottenPassword" href="forgottenPassword.html"><span id="goToForgottenPasswordLabel">Back</span></a>
+        <input id="goForgottenPassword" type="button" value="Send New Password"  class="portlet-form-button"/>
       </div>
 <!-- content: END -->
     </form>


pal-cvs メーリングリストの案内