Attachment 311481 Details for Bug 454312 – This is a patch fixes the problem and enable l10n-ed lables.

[patch] This is a patch fixes the problem and enable l10n-ed lables.

an-experimental-patch-for-bz454312.patch (text/plain), 6.97 KB, created by Satoru SATOH on 2008-07-10 13:25:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Satoru SATOH

Created: 2008-07-10 13:25:55 UTC

Size: 6.97 KB

patch

obsolete

> .../frontend/action/errata/CreateSetupAction.java  |    3 ++
> .../rhn/frontend/action/errata/EditAction.java     |    4 ++
> .../redhat/rhn/manager/errata/ErrataManager.java   |   30 ++++++++++++++-----
> java/code/webapp/WEB-INF/pages/errata/create.jsp   |    2 +-
> java/code/webapp/WEB-INF/pages/errata/edit.jsp     |    2 +-
> java/code/webapp/WEB-INF/struts-config.xml         |    2 +
> 6 files changed, 33 insertions(+), 10 deletions(-)
>
>diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/CreateSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/CreateSetupAction.java
>index 2cb9d5c..4d9a8fa 100644
>--- a/java/code/src/com/redhat/rhn/frontend/action/errata/CreateSetupAction.java
>+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/CreateSetupAction.java
>@@ -50,6 +50,9 @@ public class CreateSetupAction extends RhnAction {
>         
>         //set advisoryTypes list for select drop down
>         request.setAttribute("advisoryTypes", ErrataManager.advisoryTypes());
>+
>+        //set l10n-ed advisoryTypeLabels list for select drop down
>+        form.set("advisoryTypeLabels", ErrataManager.advisoryTypeLabels());
>         
>         return mapping.findForward("default");
>     }
>diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/EditAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/EditAction.java
>index c00c1e6..3186fa5 100644
>--- a/java/code/src/com/redhat/rhn/frontend/action/errata/EditAction.java
>+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/EditAction.java
>@@ -89,6 +89,7 @@ public class EditAction extends LookupDispatchAction {
>         form.set("advisoryName", errata.getAdvisoryName());
>         form.set("advisoryRelease", errata.getAdvisoryRel().toString());
>         form.set("advisoryType", errata.getAdvisoryType());
>+        form.set("advisoryTypeLabels", ErrataManager.advisoryTypeLabels());
>         form.set("product", errata.getProduct());
>         form.set("topic", errata.getTopic());
>         form.set("description", errata.getDescription());
>@@ -189,6 +190,9 @@ public class EditAction extends LookupDispatchAction {
>             return setupPage(request, mapping, e);
>         }
> 
>+        //set l10n-ed advisoryTypeLabels list for select drop down
>+        form.set("advisoryTypeLabels", ErrataManager.advisoryTypeLabels());
>+
>         //Fill out errata
>         e.setSynopsis(form.getString("synopsis"));
>         e.setAdvisoryName(form.getString("advisoryName"));
>diff --git a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java
>index 92ca958..2ae14e3 100644
>--- a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java
>+++ b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java
>@@ -706,18 +706,32 @@ public class ErrataManager extends BaseManager {
>      * Returns a list of advisory types available for an errata
>      * @return advisory types
>      */
>-    public static List advisoryTypes() {
>-        List advTypes = new ArrayList();
>-        advTypes.add(LocalizationService.getInstance()
>-                         .getMessage("errata.create.bugfixadvisory"));
>-        advTypes.add(LocalizationService.getInstance()
>-                         .getMessage("errata.create.productenhancementadvisory"));
>-        advTypes.add(LocalizationService.getInstance()
>-                         .getMessage("errata.create.securityadvisory"));
>+    public static List<String> advisoryTypes() {
>+        List<String> advTypes = new ArrayList<String>();
>+        LocalizationService ls = LocalizationService.getInstance();
>+        advTypes.add(ls.getMessage("errata.create.bugfixadvisory",
>+                     LocalizationService.DEFAULT_LOCALE));
>+        advTypes.add(ls.getMessage("errata.create.productenhancementadvisory",
>+                     LocalizationService.DEFAULT_LOCALE));
>+        advTypes.add(ls.getMessage("errata.create.securityadvisory",
>+                     LocalizationService.DEFAULT_LOCALE));
>         return advTypes;
>     }
>     
>     /**
>+     * Returns a list of l10n-ed advisory types available for an errata
>+     * @return l10n-ed advisory type labels
>+     */
>+    public static List<String> advisoryTypeLabels() {
>+        List<String> advTypeLabels = new ArrayList<String>();
>+        LocalizationService ls = LocalizationService.getInstance();
>+        advTypeLabels.add(ls.getMessage("errata.create.bugfixadvisory"));
>+        advTypeLabels.add(ls.getMessage("errata.create.productenhancementadvisory"));
>+        advTypeLabels.add(ls.getMessage("errata.create.securityadvisory"));
>+        return advTypeLabels;
>+    }
>+
>+    /**
>      * Stores an errata to the db
>      * @param errataIn The errata to store.
>      */
>diff --git a/java/code/webapp/WEB-INF/pages/errata/create.jsp b/java/code/webapp/WEB-INF/pages/errata/create.jsp
>index 3c2fcc0..d4f044a 100644
>--- a/java/code/webapp/WEB-INF/pages/errata/create.jsp
>+++ b/java/code/webapp/WEB-INF/pages/errata/create.jsp
>@@ -63,7 +63,7 @@
>       </th>
>       <td class="small-form">
>         <html:select property="advisoryType">
>-          <html:options name="advisoryTypes"/>
>+          <html:options name="advisoryTypes" labelProperty="advisoryTypeLabels"/>
>         </html:select>
>       </td>
>     </tr>
>diff --git a/java/code/webapp/WEB-INF/pages/errata/edit.jsp b/java/code/webapp/WEB-INF/pages/errata/edit.jsp
>index c50eb80..ddbd3a6 100644
>--- a/java/code/webapp/WEB-INF/pages/errata/edit.jsp
>+++ b/java/code/webapp/WEB-INF/pages/errata/edit.jsp
>@@ -98,7 +98,7 @@
>       </th>
>       <td class="small-form">
>         <html:select property="advisoryType">
>-          <html:options name="advisoryTypes"/>
>+          <html:options name="advisoryTypes" labelProperty="advisoryTypeLabels"/>
>         </html:select>
>       </td>
>     </tr>
>diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
>index 7e3a714..85d90a8 100644
>--- a/java/code/webapp/WEB-INF/struts-config.xml
>+++ b/java/code/webapp/WEB-INF/struts-config.xml
>@@ -194,6 +194,7 @@
>             <form-property name="advisoryName" type="java.lang.String"/>
>             <form-property name="advisoryRelease" type="java.lang.String"/>
>             <form-property name="advisoryType" type="java.lang.String"/>
>+            <form-property name="advisoryTypeLabels" type="java.util.List"/>
>             <form-property name="product" type="java.lang.String"/>
>             <form-property name="buglistId" type="java.lang.String"/>
>             <form-property name="buglistSummary" type="java.lang.String"/>
>@@ -210,6 +211,7 @@
>             <form-property name="advisoryName" type="java.lang.String"/>
>             <form-property name="advisoryRelease" type="java.lang.String"/>
>             <form-property name="advisoryType" type="java.lang.String"/>
>+            <form-property name="advisoryTypeLabels" type="java.util.List"/>
>             <form-property name="product" type="java.lang.String"/>
>             <form-property name="topic" type="java.lang.String"/>
>             <form-property name="description" type="java.lang.String"/>

Actions: View | Diff

Attachments on bug 454312: 311233 | 311481