[JENKINS-33755] Better support for l10n

jenkinsci · Mar 31, 2016 · bfd6adc · bfd6adc
1 parent fb3c060
commit bfd6adc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/core/src/main/resources/hudson/model/View/newJob.jelly b/core/src/main/resources/hudson/model/View/newJob.jelly
@@ -36,8 +36,8 @@ THE SOFTWARE.
         <form method="post" action="createItem" name="createItem" id="createItem">
           <div class="header">
             <div class="add-item-name">
-              <label for="name">Enter an item name</label>
-              <input name="name" id="name" placeholder="New item name..." type="text" />
+              <label for="name">${%ItemName.label}</label>
+              <input name="name" id="name" type="text" />
               <div class="input-help">&#187; ${%ItemName.help}</div>
               <div id="itemname-required" class="input-validation-message input-message-disabled">&#187; ${%ItemName.validation.required}</div>
               <div id="itemname-invalid" class="input-validation-message input-message-disabled"></div>
@@ -55,9 +55,9 @@ THE SOFTWARE.
                 <div class="icon">
                   <img src="${resURL}/images/48x48/copy.png" />
                 </div>
-                <label>${%Copy from}</label>
+                <label>${%CopyOption.label}</label>
                 <j:set var="descriptor" value="${it.descriptor}" />
-                <s:textbox id="from" name="from" field="copyNewItemFrom"/>
+                <s:textbox id="from" name="from" placeholder="${%CopyOption.placeholder}" field="copyNewItemFrom"/>
               </div>
             </div>
           </j:if>

diff --git a/core/src/main/resources/hudson/model/View/newJob.properties b/core/src/main/resources/hudson/model/View/newJob.properties
@@ -1,8 +1,11 @@
 NewJob=New {0}
 JobName={0} name
 ItemName.help=Required field
+ItemName.label=Enter an item name
 ItemName.validation.required=This field cannot be empty. Please enter a valid name and press OK button.
 ItemType.validation.required=Please select an item type
+CopyOption.placeholder=Type to autocomplete
 CopyOption.description=if you want to create a new item from other existing, you can use this option
+CopyOption.label=Copy from
 CopyExisting=Copy existing {0}
 
diff --git a/war/src/main/js/widgets/add/addform.less b/war/src/main/js/widgets/add/addform.less
@@ -75,6 +75,9 @@
       position: relative;
       padding-left: 58px;
 
+      /* This is needed because <s:textbox /> included YUI styles and we need to override this one */
+      font-family: Helvetica, Arial, sans-serif !important;
+
       input[type=radio] {
         display: none;
       }
@@ -129,7 +132,6 @@
     img {
       position: relative;
     }
-
   }
 
   .icon:before {
@@ -219,7 +221,7 @@
     font-size: 1.5em;
     background-color: #fff;
     padding: 5px 10px;
-    border: 1px solid #ccc;
+    border: 1px solid #999;
     width: 50%;
     min-width: 300px;
   }
@@ -267,7 +269,6 @@
     .category:last-child {
       padding-top: 0;
     }
-
   }
 
 }