[elvystrac] r1954 - * update labels - add translations for file types
- From: elvys@xxxxxxxxxxxxxxxxxxxxxx
- To: elvystrac@xxxxxxxxxxxxx
- Date: Sun, 28 Feb 2010 22:56:59 +0100
Author: JirkaM
Date: 2010-02-28 22:56:58 +0100 (Sun, 28 Feb 2010)
New Revision: 1954
Modified:
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/companyrel/CompanyPermittedTypesBean.java
trunk/server/webServer2/JavaSource/cz/elvys/webServer/messages/labels_cs.properties
trunk/server/webServer2/WebContent/secured/companyrel/selectPermittedTypeForm.xhtml
Log:
* update labels - add translations for file types
modified
JavaSource/cz/elvys/webServer/beans/companyrel/CompanyPermittedTypesBean.java
modified JavaSource/cz/elvys/webServer/messages/labels_cs.properties
modified WebContent/secured/companyrel/selectPermittedTypeForm.xhtml
Modified:
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/companyrel/CompanyPermittedTypesBean.java
===================================================================
---
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/companyrel/CompanyPermittedTypesBean.java
2010-02-28 21:47:03 UTC (rev 1953)
+++
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/companyrel/CompanyPermittedTypesBean.java
2010-02-28 21:56:58 UTC (rev 1954)
@@ -9,6 +9,7 @@
import org.apache.log4j.Logger;
import org.hibernate.Hibernate;
+import org.hibernate.pretty.MessageHelper;
import cz.elvys.commons.utils.CommonUtils;
import cz.elvys.webServer.HIBgen.Category;
@@ -21,6 +22,7 @@
import cz.elvys.webServer.beans.user.UserLoginBean;
import cz.elvys.webServer.toSpring.exception.ExecuteException;
import cz.elvys.webServer.utils.faces.BeanManager;
+import cz.elvys.webServer.utils.faces.MessageUtils;
import elvys.server.bl.Fact;
import elvys.server.bl.Factory;
import elvys.server.bl.permTypesRel.PermittedSchedulingBL;
@@ -219,8 +221,9 @@
record.setPositionCount(0);
}
- record.setType(ct);
+
record.setName(MessageUtils.getLabel(MessageUtils.getElvysPlanningTypeLabelPrefix()+ct.getType()));
+ record.setType(ct);
cprl.add(record);
}
@@ -238,6 +241,7 @@
private ContentType type;
private Integer positionCount;
private Integer planningCount;
+ private String name;
public ContentType getType() {
return type;
}
@@ -256,6 +260,12 @@
public void setPlanningCount(Integer planningCount) {
this.planningCount = planningCount;
}
+ public String getName() {
+ return name;
+ }
+ public void setName(String name) {
+ this.name = name;
+ }
}
Modified:
trunk/server/webServer2/JavaSource/cz/elvys/webServer/messages/labels_cs.properties
===================================================================
---
trunk/server/webServer2/JavaSource/cz/elvys/webServer/messages/labels_cs.properties
2010-02-28 21:47:03 UTC (rev 1953)
+++
trunk/server/webServer2/JavaSource/cz/elvys/webServer/messages/labels_cs.properties
2010-02-28 21:56:58 UTC (rev 1954)
@@ -122,6 +122,7 @@
company.permtypes.form.name=N\u00E1zev
company.permtypes.form.positions=# pozic
company.permtypes.form.planning=\# pl\u00E1nov\u00E1n\u00ED
+company.permtypes.form.action=Akce
user.list.title=Seznam u\u017Eivatel\u016F
user.list.body.title=Seznam u\u017Eivatel\u016F
Modified:
trunk/server/webServer2/WebContent/secured/companyrel/selectPermittedTypeForm.xhtml
===================================================================
---
trunk/server/webServer2/WebContent/secured/companyrel/selectPermittedTypeForm.xhtml
2010-02-28 21:47:03 UTC (rev 1953)
+++
trunk/server/webServer2/WebContent/secured/companyrel/selectPermittedTypeForm.xhtml
2010-02-28 21:56:58 UTC (rev 1954)
@@ -40,7 +40,7 @@
<rich:column>
<f:facet
name="header">#{lbl['company.permtypes.form.name']}</f:facet>
- <h:outputText
value="#{type.type.type}"/>
+ <h:outputText
value="#{type.name}"/>
</rich:column>
<rich:column>
@@ -54,6 +54,7 @@
</rich:column>
<h:column>
+ <f:facet
name="header">#{lbl['company.permtypes.form.action']}</f:facet>
<div
class="list-operations-main">
<div
class="list-operations-item">
<a4j:commandButton id="RevokePermittedType"
@@ -95,11 +96,12 @@
<h:column>
<f:facet
name="header">#{lbl['company.permtypes.form.name']}</f:facet>
- <h:outputText
value="#{type.type.type}"/>
+ <h:outputText
value="#{type.name}"/>
</h:column>
<h:column>
+ <f:facet
name="header">#{lbl['company.permtypes.form.action']}</f:facet>
<div
class="list-operations-main">
<div
class="list-operations-item">
<a4j:commandButton id="PermitNewType"
@@ -140,7 +142,7 @@
<h:form id="RevokePermittedModalContent">
<b><h:outputText>#{lbl['company.list.body.delete.tooltip.question']}</h:outputText></b>
<br/>
- <h:outputText
value="#{companyPermittedTypesBean.selectedCt.type.type}:"/>
+ <h:outputText
value="#{companyPermittedTypesBean.selectedCt.name}:"/>
<br/>
<h:panelGrid columns="2">
<a4j:commandButton
value="#{lbl['company.permtypes.form.yes']}"
Other related posts:
- » [elvystrac] r1954 - * update labels - add translations for file types - elvys
