From 48c29e9f97ec4cfe30360499ab61de3e92ac9c61 Mon Sep 17 00:00:00 2001
From: kohsuke <kohsuke@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Thu, 27 Dec 2007 06:45:05 +0000
Subject: [PATCH] - picking up stapler 1.54 for i18n support. - started
 internationalizing some files.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@6435 71c3de6d-444a-0410-be80-ed276b4c234a
---
 core/pom.xml                                              | 7 +------
 core/src/main/resources/hudson/model/Hudson/login.jelly   | 6 +++---
 .../resources/hudson/model/Hudson/login_ja.properties     | 3 +++
 .../GlobalMatrixAuthorizationStrategy/config.jelly        | 8 ++++----
 .../config_ja.properties                                  | 4 ++++
 .../security/GlobalMatrixAuthorizationStrategy/table.css  | 1 +
 core/src/main/resources/lib/layout/layout.jelly           | 6 +++---
 core/src/main/resources/lib/layout/layout_ja.properties   | 2 ++
 8 files changed, 21 insertions(+), 16 deletions(-)
 create mode 100644 core/src/main/resources/hudson/model/Hudson/login_ja.properties
 create mode 100644 core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_ja.properties
 create mode 100644 core/src/main/resources/lib/layout/layout_ja.properties

diff --git a/core/pom.xml b/core/pom.xml
index 511e3ab419..7d58ab557c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -273,7 +273,7 @@
     <dependency>
       <groupId>org.kohsuke.stapler</groupId>
       <artifactId>stapler</artifactId>
-      <version>1.53</version>
+      <version>1.54</version>
     </dependency>
     <dependency>
       <groupId>org.kohsuke</groupId>
@@ -461,11 +461,6 @@
       <artifactId>commons-collections</artifactId>
       <version>3.2</version>
     </dependency>
-    <dependency>
-      <groupId>org.jvnet.localizer</groupId>
-      <artifactId>localizer</artifactId>
-      <version>1.0</version>
-    </dependency>
     <dependency>
       <groupId>com.octo.captcha</groupId>
       <artifactId>jcaptcha-all</artifactId>
diff --git a/core/src/main/resources/hudson/model/Hudson/login.jelly b/core/src/main/resources/hudson/model/Hudson/login.jelly
index 3b4a6c917e..ee5abd961d 100644
--- a/core/src/main/resources/hudson/model/Hudson/login.jelly
+++ b/core/src/main/resources/hudson/model/Hudson/login.jelly
@@ -7,16 +7,16 @@
         <form action="${it.securityRealm.authenticationGatewayUrl}" method="post" style="text-size:smaller">
           <table>
             <tr>
-              <td>User:</td>
+              <td>${%User}:</td>
               <td><input type="text" name="j_username" id="j_username" /></td>
             </tr>
             <tr>
-              <td>Password:</td>
+              <td>${%Password}:</td>
               <td><input type="password" name="j_password" /></td>
             </tr>
           </table>
           <input type="hidden" name="from" value="${request.getParameter('from')}" />
-          <f:submit value="login" />
+          <f:submit value="${%login}" />
           <script>
             $('j_username').focus();
           </script>
diff --git a/core/src/main/resources/hudson/model/Hudson/login_ja.properties b/core/src/main/resources/hudson/model/Hudson/login_ja.properties
new file mode 100644
index 0000000000..97d1687db6
--- /dev/null
+++ b/core/src/main/resources/hudson/model/Hudson/login_ja.properties
@@ -0,0 +1,3 @@
+User=\u30e6\u30fc\u30b6\u30fc\u540d
+Password=\u30d1\u30b9\u30ef\u30fc\u30c9
+login=\u30ed\u30b0\u30a4\u30f3
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config.jelly b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config.jelly
index e06a0832a2..327eb28aad 100644
--- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config.jelly
+++ b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config.jelly
@@ -32,7 +32,7 @@
       <!-- The first row will show grouping -->
       <tr class="group-row">
         <td rowspan="2" class="pane-header blank">
-          User/group
+          ${%User/group}
         </td>
         <j:forEach var="g" items="${groups}">
           <td class="pane-header" colspan="${g.size()}">
@@ -58,7 +58,7 @@
         </tr>
       </j:forEach>
       <tr name="anonymous">
-        <local:row sid="anonymous" title="Anonymous" />
+        <local:row sid="anonymous" title="${%Anonymous}" />
       </tr>
 
 
@@ -69,9 +69,9 @@
       </tr>
     </table>
     <div style="margin-top:0.5em; margin-left: 2em;">
-      User/group to add:
+      ${%User/group to add}:
       <input type="text" id="${id}text" />
-      <input type="button" value="Add" id="${id}button"/>
+      <input type="button" value="${%Add}" id="${id}button"/>
     </div>
     <script>
       (function() {
diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_ja.properties b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_ja.properties
new file mode 100644
index 0000000000..0bc033fd73
--- /dev/null
+++ b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_ja.properties
@@ -0,0 +1,4 @@
+Add=\u8ffd\u52a0
+Anonymous=\u533f\u540d\u30e6\u30fc\u30b6\u30fc
+User/group=\u30e6\u30fc\u30b6\u30fc/\u30b0\u30eb\u30fc\u30d7
+User/group\ to\ add=\u8ffd\u52a0\u3059\u308b\u30e6\u30fc\u30b6\u30fc/\u30b0\u30eb\u30fc\u30d7
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/table.css b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/table.css
index 927eff1b4d..a96a554ac7 100644
--- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/table.css
+++ b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/table.css
@@ -10,6 +10,7 @@
 
 #global-matrix-authorization-strategy-table TD.blank {
   vertical-align: middle;
+  padding: 0.2em;
 }
 
 #global-matrix-authorization-strategy-table .caption-row TH {
diff --git a/core/src/main/resources/lib/layout/layout.jelly b/core/src/main/resources/lib/layout/layout.jelly
index c295bbebc8..c4dd811719 100644
--- a/core/src/main/resources/lib/layout/layout.jelly
+++ b/core/src/main/resources/lib/layout/layout.jelly
@@ -95,7 +95,7 @@
                   <script>createSearchBox("${searchURL}");</script>
                 </div>
               </form>
-            </td><td style="vertical-align: middle; padding-right: 1em; width:1px; whtiespace:nowrap;">
+            </td><td style="vertical-align: middle; padding-right: 1em; width:1px; white-space:nowrap;">
               <!-- login field -->
               <j:if test="${app.useSecurity}">
                 <st:nbsp/>
@@ -104,11 +104,11 @@
                     <span style="color:white; white-space:nowrap">
                       <a style="color:white" href="${rootURL}/user/${app.authentication.name}"><b>${app.authentication.name}</b></a>
                       |
-                      <a style="color:white" href="${rootURL}/logout"><b>logout</b></a>
+                      <a style="color:white" href="${rootURL}/logout"><b>${%logout}</b></a>
                     </span>
                   </j:when>
                   <j:otherwise>
-                    <a style="color:white" href="${rootURL}/${app.securityRealm.loginUrl}?from=${request.requestURI}"><b>login</b></a>
+                    <a style="color:white" href="${rootURL}/${app.securityRealm.loginUrl}?from=${request.requestURI}"><b>${%login}</b></a>
                   </j:otherwise>
                 </j:choose>
               </j:if>
diff --git a/core/src/main/resources/lib/layout/layout_ja.properties b/core/src/main/resources/lib/layout/layout_ja.properties
new file mode 100644
index 0000000000..64990ac308
--- /dev/null
+++ b/core/src/main/resources/lib/layout/layout_ja.properties
@@ -0,0 +1,2 @@
+login=\u30ed\u30b0\u30a4\u30f3
+logout=\u30ed\u30b0\u30a2\u30a6\u30c8
-- 
GitLab