[jboss-svn-commits] JBL Code SVN: r5238 - in labs/jbossforums/trunk/forums/src: main/org/jboss/portlet/forums/ui/action resources/portal-forums-war/WEB-INF/classes resources/portal-forums-war/views/admin resources/portal-forums-war/views/common resources/portal-forums-war/views/errors resources/portal-forums-war/views/forums resources/portal-forums-war/views/moderator resources/portal-forums-war/views/pref resources/portal-forums-war/views/topics resources/portal-forums-war/views/watches
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jul 21 19:39:54 EDT 2006
Author: unibrew
Date: 2006-07-21 19:39:44 -0400 (Fri, 21 Jul 2006)
New Revision: 5238
Modified:
labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java
labs/jbossforums/trunk/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties
labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/admin/deleteCategory.xhtml
labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/admin/deleteForum.xhtml
labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/admin/editForum.xhtml
labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/common/common.xhtml
labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/errors/error_body.xhtml
labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml
labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/delete_topic.xhtml
labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/modcp_move.xhtml
labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/pref/index.xhtml
labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/attachmentsview.xhtml
labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/delete_poll.xhtml
labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/delete_post.xhtml
labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/posting_edit_body.xhtml
labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/posting_new_body.xhtml
labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/watches/forumWatch.xhtml
Log:
[JBFORUMS-102] Reading through all xhtml files and repairing all messages to be drawed from ResourceBundle.
Modified: labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java
===================================================================
--- labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java 2006-07-21 23:29:57 UTC (rev 5237)
+++ labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java 2006-07-21 23:39:44 UTC (rev 5238)
@@ -204,7 +204,9 @@
try
{
BaseController.getForumsModule().createCategory(this.categoryName);
- JSFUtil.setMessage(Constants.FEEDBACK,"The Category \""+this.categoryName+"\" was successfully created.");
+ String start = JSFUtil.getBundleMessage("ResourceJSF","Category_created_0");
+ String end = JSFUtil.getBundleMessage("ResourceJSF","Category_created_1");
+ JSFUtil.setMessage(Constants.FEEDBACK,start+"\""+this.categoryName+"\""+end);
success = true;
}
catch(Exception e)
@@ -233,17 +235,20 @@
try
{
int categoryId = -1;
- String cour = ForumUtil.getParameter(Constants.p_categoryId);
- if(cour!=null && cour.trim().length()>0)
- {
- categoryId = Integer.parseInt(cour);
- }
+ String cour = ForumUtil.getParameter(Constants.p_categoryId);
+ if(cour!=null && cour.trim().length()>0)
+ {
+ categoryId = Integer.parseInt(cour);
+ }
//grab the category from the module and set the title
- Category category = BaseController.getForumsModule().findCategoryById(new Integer(categoryId));
- category.setTitle(this.categoryName);
+ Category category = BaseController.getForumsModule().findCategoryById(new Integer(categoryId));
+ category.setTitle(this.categoryName);
- JSFUtil.setMessage(Constants.FEEDBACK,"The Category \""+this.categoryName+"\" was successfully updated.");
+ String start = JSFUtil.getBundleMessage("ResourceJSF","Category_updated_0");
+ String end = JSFUtil.getBundleMessage("ResourceJSF","Category_updated_1");
+ JSFUtil.setMessage(Constants.FEEDBACK,start+"\""+this.categoryName+"\""+end);
+
navState = Constants.EDIT_CATEGORY;
success = true;
}
@@ -272,26 +277,29 @@
boolean success = false;
try
{
- int categoryId = -1;
- String cour = ForumUtil.getParameter(Constants.p_categoryId);
- if(cour!=null && cour.trim().length()>0)
- {
- categoryId = Integer.parseInt(cour);
- }
+ int categoryId = -1;
+ String cour = ForumUtil.getParameter(Constants.p_categoryId);
+ if(cour!=null && cour.trim().length()>0)
+ {
+ categoryId = Integer.parseInt(cour);
+ }
//grab the category from the module and set the title
- Category source = BaseController.getForumsModule().findCategoryById(new Integer(categoryId));
- Category target = BaseController.getForumsModule().findCategoryById(new Integer(this.selectedCategory));
+ Category source = BaseController.getForumsModule().findCategoryById(new Integer(categoryId));
+ Category target = BaseController.getForumsModule().findCategoryById(new Integer(this.selectedCategory));
- //move all the forums from source category to the selected target category
- BaseController.getForumsModule().addAllForums(source,target);
-
- //remove the source category
- BaseController.getForumsModule().removeCategory(source);
+ //move all the forums from source category to the selected target category
+ BaseController.getForumsModule().addAllForums(source,target);
+
+ //remove the source category
+ BaseController.getForumsModule().removeCategory(source);
- JSFUtil.setMessage(Constants.FEEDBACK,"The Category \""+this.categoryName+"\" was successfully deleted.");
- navState = Constants.DELETE_CATEGORY;
- success = true;
+ String start = JSFUtil.getBundleMessage("ResourceJSF","Category_deleted_0");
+ String end = JSFUtil.getBundleMessage("ResourceJSF","Category_deleted_1");
+ JSFUtil.setMessage(Constants.FEEDBACK,start+"\""+this.categoryName+"\""+end);
+
+ navState = Constants.DELETE_CATEGORY;
+ success = true;
}
catch(Exception e)
{
@@ -330,7 +338,10 @@
Category category = BaseController.getForumsModule().findCategoryById(new Integer(categoryId));
BaseController.getForumsModule().createForum(category,this.forumName,this.forumDescription);
- JSFUtil.setMessage(Constants.FEEDBACK,"The Forum \""+this.forumName+"\" was successfully created.");
+ String start = JSFUtil.getBundleMessage("ResourceJSF","Forum_created_0");
+ String end = JSFUtil.getBundleMessage("ResourceJSF","Forum_created_1");
+ JSFUtil.setMessage(Constants.FEEDBACK,start+"\""+this.forumName+"\""+end);
+
success = true;
}
catch(Exception e)
@@ -359,22 +370,26 @@
try
{
int forumId = -1;
- String cour = ForumUtil.getParameter(Constants.p_forumId);
- if(cour!=null && cour.trim().length()>0)
- {
- forumId = Integer.parseInt(cour);
- }
+ String cour = ForumUtil.getParameter(Constants.p_forumId);
+ if(cour!=null && cour.trim().length()>0)
+ {
+ forumId = Integer.parseInt(cour);
+ }
//grab the forum from the module and set the proper information
- Forum forum = getForumsModule().findForumById(new Integer(forumId));
- Category selectedCategory = getForumsModule().findCategoryById(new Integer(this.selectedCategory));
- forum.setCategory(selectedCategory);
- forum.setName(this.forumName);
- forum.setDescription(this.forumDescription);
- getForumsModule().getHibernate().getSessionFactory().getCurrentSession().flush();
- JSFUtil.setMessage(Constants.FEEDBACK,"The Forum \""+this.forumName+"\" was successfully updated.");
- navState = Constants.EDIT_FORUM;
- success = true;
+ Forum forum = getForumsModule().findForumById(new Integer(forumId));
+ Category selectedCategory = getForumsModule().findCategoryById(new Integer(this.selectedCategory));
+ forum.setCategory(selectedCategory);
+ forum.setName(this.forumName);
+ forum.setDescription(this.forumDescription);
+ getForumsModule().getHibernate().getSessionFactory().getCurrentSession().flush();
+
+ String start = JSFUtil.getBundleMessage("ResourceJSF","Forum_updated_0");
+ String end = JSFUtil.getBundleMessage("ResourceJSF","Forum_updated_1");
+ JSFUtil.setMessage(Constants.FEEDBACK,start+"\""+this.forumName+"\""+end);
+
+ navState = Constants.EDIT_FORUM;
+ success = true;
}
catch(Exception e)
{
@@ -431,10 +446,12 @@
//means delete all topic/posts on this forum
BaseController.getForumsModule().removeForum(source);
-
- JSFUtil.setMessage(Constants.FEEDBACK,"The Forum \""+this.forumName+"\" was successfully deleted.");
- navState = Constants.DELETE_FORUM;
- success = true;
+ String start = JSFUtil.getBundleMessage("ResourceJSF","Forum_deleted_0");
+ String end = JSFUtil.getBundleMessage("ResourceJSF","Forum_deleted_1");
+ JSFUtil.setMessage(Constants.FEEDBACK,start+"\""+this.forumName+"\""+end);
+
+ navState = Constants.DELETE_FORUM;
+ success = true;
}
catch(Exception e)
{
Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties 2006-07-21 23:29:57 UTC (rev 5237)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties 2006-07-21 23:39:44 UTC (rev 5238)
@@ -58,6 +58,7 @@
Enabled=Enabled
Disabled=Disabled
Error=Error
+Back=Back
Next=Next
Previous=Previous
@@ -105,13 +106,16 @@
Click_return_group_1=Here
Click_return_group_2= to return to group information
-Admin_panel=Admin Panel
+Admin_panel=Administration
+Home=Home
+
Board_disable=Sorry, but this board is currently unavailable. Please try again later.
#
# Forums Preferences
#
+L_LOGIN_REQUIRED=You must be logged in to manage your Forum Preferences
L_ITEMS_REQUIRED=This items are required
L_USERNAME=Username
L_EMAIL_ADDRESS=Email address
@@ -341,6 +345,10 @@
Display_topics=Display topics from previous
All_Topics=All Topics
+Announcements=Announcements
+Sticky_Threads=Sticky Threads
+Normal_Threads=Normal Threads
+
Topic_Announcement=<b>Announcement:</b>
Topic_Sticky=<b>Sticky:</b>
Topic_Moved=<b>Moved:</b>
@@ -1255,6 +1263,8 @@
An_error_occured=An Error Occurred
A_critical_error=A Critical Error Occurred
+Please_try_again=Please try again.
+
##################
# lang_admin.php #
##################
@@ -1400,7 +1410,7 @@
Reply=Reply
Edit=Edit
Delete=Delete
-Sticky=Sticky
+`nie =Sticky
Announce=Announce
Vote=Vote
Pollcreate=Poll create
@@ -1572,10 +1582,19 @@
Forum_admin_explain=From this panel you can add, delete, edit, re-order and re-synchronise categories and forums
Edit_forum=Edit forum
Create_forum=Create new forum
+Forum_created_0=The Forum
+Forum_created_1=was successfully created.
+Forum_updated_0=The Forum
+Forum_updated_1=was successfully updated.
+Forum_deleted_0=The Forum
+Forum_deleted_1=was successfully deleted.
Create_category=Create new category
-Category_created=The Category \"{0}\" was successfully created.
-Category_updated=The Category \"{0}\" was successfully updated.
-Category_deleted=The Category \"{0}\" was successfully deleted.
+Category_created_0=The Category
+Category_created_1=was successfully created.
+Category_updated_0=The Category
+Category_updated_1=was successfully updated.
+Category_deleted_0=The Category
+Category_deleted_1=was successfully deleted.
Remove=Remove
Action=Action
Update_order=Update Order
@@ -1588,7 +1607,7 @@
No_mode=No mode was set
Forum_edit_delete_explain=The form below will allow you to customize all the general board options. For User and Forum configurations use the related links on the left hand side
-Move_contents=Move all contents
+Move_contents=Move all contents to -
Forum_delete=Delete Forum
Forum_delete_explain=The form below will allow you to delete a forum (or category) and decide where you want to put all topics (or forums) it contained.
@@ -1968,6 +1987,9 @@
# From the mod "Watched Topics List" (http://www.netclectic.com/)
# plus some custom for the forum watches
#
+Watch_Login_Requirement=You must be logged in to Watch Forums
+Watches_Admin=Forum Watches Administration
+Watch_Forum_Info=Here you can administer your forum watches
Watched_Topics=Watched Topics
Watched_Forums=Watched Forums
No_Watched_Topics=You are not watching any topics
Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/admin/deleteCategory.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/admin/deleteCategory.xhtml 2006-07-21 23:29:57 UTC (rev 5237)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/admin/deleteCategory.xhtml 2006-07-21 23:39:44 UTC (rev 5238)
@@ -48,7 +48,7 @@
<td class="row1"><span class="row1">#{adminController.categoryName}</span></td>
</tr>
<tr>
- <td class="row1">${resource.Move_contents} to - </td>
+ <td class="row1">${resource.Move_contents}</td>
<td class="row1">
<h:selectOneMenu value="#{adminController.selectedCategory}">
<c:forEach items="#{adminPanel.categories}" var="category">
@@ -61,7 +61,7 @@
</tr>
<tr>
<td class="catBottom" colspan="2" align="center">
- <h:commandButton value="Submit" styleClass="mainoption" action="#{adminController.deleteCategory}"/>
+ <h:commandButton value="{resource.Confirm}" styleClass="mainoption" action="#{adminController.deleteCategory}"/>
</td>
</tr>
</table>
Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/admin/deleteForum.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/admin/deleteForum.xhtml 2006-07-21 23:29:57 UTC (rev 5237)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/admin/deleteForum.xhtml 2006-07-21 23:39:44 UTC (rev 5238)
@@ -48,7 +48,7 @@
<td class="row1"><span class="row1">#{adminController.forumName}</span></td>
</tr>
<tr>
- <td class="row1">${resource.Move_contents} to - </td>
+ <td class="row1">${resource.Move_contents}</td>
<td class="row1">
<h:selectOneMenu value="#{adminController.selectedForum}">
<f:selectItem itemValue="-1" itemLabel="Delete All Topics/Posts" />
@@ -62,7 +62,7 @@
</tr>
<tr>
<td class="catBottom" colspan="2" align="center">
- <h:commandButton value="Submit" styleClass="mainoption" action="#{adminController.deleteForum}"/>
+ <h:commandButton value="${resource.Confirm}" styleClass="mainoption" action="#{adminController.deleteForum}"/>
</td>
</tr>
</table>
Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/admin/editForum.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/admin/editForum.xhtml 2006-07-21 23:29:57 UTC (rev 5237)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/admin/editForum.xhtml 2006-07-21 23:39:44 UTC (rev 5238)
@@ -69,7 +69,7 @@
</tr>
<tr>
<td class="catBottom" colspan="2" align="center">
- <h:commandButton value="Update" styleClass="mainoption" action="#{adminController.editForum}"/>
+ <h:commandButton value="${resource.Confirm}" styleClass="mainoption" action="#{adminController.editForum}"/>
</td>
</tr>
</table>
Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/common/common.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/common/common.xhtml 2006-07-21 23:29:57 UTC (rev 5237)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/common/common.xhtml 2006-07-21 23:39:44 UTC (rev 5238)
@@ -44,14 +44,14 @@
<span class="mainmenu">&nbsp;&nbsp;
<h:outputLink value="#{forums:outputLink(shared.links['category'],true)}" styleClass="mainmenu">
<img src="/portal-forums/subSilver/images/icon_mini_search.gif" width="12" height="13" border="0" alt="Home" hspace="3"/>
- Home
+ ${resource.Home}
</h:outputLink>&nbsp;&nbsp;
</span>
<c:if test="#{shared.anonymous==false && forums:isRunningInPortal()==false}">
<span class="mainmenu">&nbsp;&nbsp;
<h:outputLink value="#{forums:outputLink(shared.links['pref'],true)}" styleClass="mainmenu">
<img src="/portal-forums/subSilver/images/icon_mini_watch.gif" width="12" height="13" border="0" alt="Preferences" hspace="3"/>
- Preferences
+ ${resource.Preferences}
</h:outputLink>&nbsp;&nbsp;
</span>
</c:if>
@@ -59,7 +59,7 @@
<span class="mainmenu">&nbsp;&nbsp;
<h:outputLink value="#{forums:outputLink(shared.links['forumWatch'],true)}" styleClass="mainmenu">
<img src="/portal-forums/subSilver/images/icon_mini_watch.gif" width="12" height="13" border="0" alt="Watched Forums" hspace="3"/>
- Watched Forums
+ ${resource.Watched_Forums}
</h:outputLink>&nbsp;&nbsp;
</span>
</c:if>
@@ -68,7 +68,7 @@
<span class="mainmenu">&nbsp;&nbsp;
<h:outputLink value="#{forums:outputLink(shared.links['admin'],true)}" styleClass="mainmenu">
<img src="/portal-forums/subSilver/images/icon_mini_admin.gif" width="12" height="13" border="0" alt="Administration" hspace="3"/>
- Administration
+ ${resource.Admin_panel}
</h:outputLink>&nbsp;&nbsp;
</span>
</forums:isAllowed>
Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/errors/error_body.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/errors/error_body.xhtml 2006-07-21 23:29:57 UTC (rev 5237)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/errors/error_body.xhtml 2006-07-21 23:39:44 UTC (rev 5238)
@@ -40,7 +40,7 @@
</tr>
<tr>
<td align="center">
- <h:outputText value="${forums:errorMsg()}. Please try again." styleClass="gen"/>
+ <h:outputText value="${forums:errorMsg()}. ${resource.Please_try_again}" styleClass="gen"/>
</td>
</tr>
<tr>
@@ -48,7 +48,7 @@
</tr>
<tr>
<td align="center">
- <h:commandButton type="button" value="Back" onclick="javascript:history.back();"/>
+ <h:commandButton type="button" value="${resource.Back}" onclick="javascript:history.back();"/>
</td>
</tr>
<tr>
Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml 2006-07-21 23:29:57 UTC (rev 5237)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml 2006-07-21 23:39:44 UTC (rev 5238)
@@ -163,7 +163,7 @@
<td class="catLeft" colspan="2" height="28">
<span class="cattitle">
<a href="" class="cattitle">
- <span>Announcements</span>
+ <span>${resource.Announcements}</span>
</a>
</span>
</td>
@@ -186,7 +186,7 @@
</f:verbatim>
</h:outputLink>
<!-- topicType -->
- <b>Announcement:</b>
+ <b>${resource.Topic_Announcement}</b>
<!-- description of the topic -->
<h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}" styleClass="topictitle">
<f:param name="t" value="${topicrow.id}"/>
@@ -197,7 +197,7 @@
<c:if test="#{forum.topicNavigator[topicrow.id] ne null && forum.topicNavigator[topicrow.id].totalPages gt 1}">
<span class="gensmall">
<br/>
- <img src="#{forums:themeURL('resourceIconMinipostURL')}" alt="Goto page" title="Goto page"/>Goto page:
+ <img src="#{forums:themeURL('resourceIconMinipostURL')}" alt="Goto page" title="Goto page"/>${resource.Goto_page}:
[
<c:forEach items="#{forum.topicNavigator[topicrow.id].pages}" var="page" varStatus="idx">
<h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
@@ -264,7 +264,7 @@
<td class="catLeft" colspan="2" height="28">
<span class="cattitle">
<a href="" class="cattitle">
- <span>Sticky Threads</span>
+ <span>${resource.Sticky_Threads}</span>
</a>
</span>
</td>
@@ -287,7 +287,7 @@
</f:verbatim>
</h:outputLink>
<!-- topicType -->
- <b>Sticky:</b>
+ <b>${resource.Topic_Sticky}</b>
<!-- description of the topic -->
<h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}" styleClass="topictitle">
<f:param name="t" value="${topicrow.id}"/>
@@ -298,7 +298,7 @@
<c:if test="#{forum.topicNavigator[topicrow.id] ne null && forum.topicNavigator[topicrow.id].totalPages gt 1}">
<span class="gensmall">
<br/>
- <img src="#{forums:themeURL('resourceIconMinipostURL')}" alt="Goto page" title="Goto page"/>Goto page:
+ <img src="#{forums:themeURL('resourceIconMinipostURL')}" alt="Goto page" title="Goto page"/>${resource.Goto_page}:
[
<c:forEach items="#{forum.topicNavigator[topicrow.id].pages}" var="page" varStatus="idx">
<h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
@@ -365,7 +365,7 @@
<td class="catLeft" colspan="2" height="28">
<span class="cattitle">
<a href="" class="cattitle">
- <span>Normal Threads</span>
+ <span>${resource.Normal_Threads}</span>
</a>
</span>
</td>
@@ -398,7 +398,7 @@
<c:if test="#{forum.topicNavigator[topicrow.id] ne null && forum.topicNavigator[topicrow.id].totalPages gt 1}">
<span class="gensmall">
<br/>
- <img src="#{forums:themeURL('resourceIconMinipostURL')}" alt="Goto page" title="Goto page"/>Goto page:
+ <img src="#{forums:themeURL('resourceIconMinipostURL')}" alt="Goto page" title="Goto page"/>${resource.Goto_page}:
[
<c:forEach items="#{forum.topicNavigator[topicrow.id].pages}" var="page" varStatus="idx">
<h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
@@ -646,47 +646,44 @@
<!-- post new topics link -->
<forums:isAllowedChoose>
<forums:isAllowedWhen fragment="acl://newTopic">
- You <b>can</b> post new topics in this forum <br/>
+ ${resource.Rules_post_can}<br/>
</forums:isAllowedWhen>
<forums:isAllowedOtherwise>
- You <b>cannot</b> post new topics in this forum <br/>
+ ${resource.Rules_post_cannot}<br/>
</forums:isAllowedOtherwise>
</forums:isAllowedChoose>
<!-- manage poll link -->
<forums:isAllowedChoose>
<forums:isAllowedWhen fragment="acl://managePoll">
- You <b>can</b> create polls in this forum <br/>
+ ${resource.Rules_poll_can}<br/>
</forums:isAllowedWhen>
<forums:isAllowedOtherwise>
- You <b>cannot</b> create polls in this forum <br/>
+ ${resource.Rules_poll_cannot}<br/>
</forums:isAllowedOtherwise>
</forums:isAllowedChoose>
<!-- votePoll link -->
<forums:isAllowedChoose>
<forums:isAllowedWhen fragment="acl://votePoll">
- You <b>can</b> vote in polls in this forum <br/>
+ ${resource.Rules_vote_can}<br/>
</forums:isAllowedWhen>
<forums:isAllowedOtherwise>
- You <b>cannot</b> vote in polls in this forum <br/>
+ ${resource.Rules_vote_cannot}<br/>
</forums:isAllowedOtherwise>
</forums:isAllowedChoose>
<!-- moderate forum link -->
<forums:isAllowedChoose>
<forums:isAllowedWhen fragment="acl://moderateForum" contextData="#{forum.forum}">
- You <b>can</b>
+ ${resource.Rules_moderate_0}
<h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
<f:param name="f" value="#{forum.forum.id}"/>
- moderate
+ ${resource.Rules_moderate_2}
</h:outputLink>
- this forum <b/>
</forums:isAllowedWhen>
<forums:isAllowedOtherwise>
- You <b>cannot</b>
- moderate
- this forum <b/>
+ ${resource.Rules_moderate_1}${resource.Rules_moderate_2}
</forums:isAllowedOtherwise>
</forums:isAllowedChoose>
</span>
@@ -709,7 +706,7 @@
</tr>
<tr>
<td align="center">
- <span class="gen">Forum Not Found....</span>
+ <span class="gen">${resource.Forum_not_exist}</span>
</td>
</tr>
<tr>
Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/delete_topic.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/delete_topic.xhtml 2006-07-21 23:29:57 UTC (rev 5237)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/delete_topic.xhtml 2006-07-21 23:39:44 UTC (rev 5238)
@@ -47,11 +47,11 @@
<span class="gen"><br/>
${resource.Topic_delete_confirm}
<br/><br/>
- <h:commandButton type="submit" value="Yes" styleClass="mainoption" action="#{moderator.deleteTopic}">
+ <h:commandButton type="submit" value="${resource.Yes}" styleClass="mainoption" action="#{moderator.deleteTopic}">
<f:param name="f" value="#{moderator.forum.id}"/>
</h:commandButton>
&nbsp;&nbsp;
- <h:commandButton type="button" value="No" styleClass="liteoption" onclick="javascript:history.back();">
+ <h:commandButton type="button" value="${resource.No}" styleClass="liteoption" onclick="javascript:history.back();">
<f:param name="f" value="#{moderator.forum.id}"/>
</h:commandButton>
</span>
Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/modcp_move.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/modcp_move.xhtml 2006-07-21 23:29:57 UTC (rev 5237)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/modcp_move.xhtml 2006-07-21 23:39:44 UTC (rev 5238)
@@ -95,14 +95,14 @@
</span>
<br/>
<br/>
- <h:commandButton type="submit" value="Yes"
+ <h:commandButton type="submit" value="${resource.Yes}"
styleClass="mainoption"
action="#{moderator.moveTopic}">
<f:param name="f"
value="#{moderator.forum.id}"/>
</h:commandButton>
&nbsp;&nbsp;
- <h:commandButton type="button" value="No"
+ <h:commandButton type="button" value="${resource.No}"
styleClass="liteoption"
onclick="javascript:history.back();">
<f:param name="f"
Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/pref/index.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/pref/index.xhtml 2006-07-21 23:29:57 UTC (rev 5237)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/pref/index.xhtml 2006-07-21 23:39:44 UTC (rev 5238)
@@ -240,7 +240,7 @@
<td class="catBottom" colspan="2" align="center" height="28">
<h:commandButton value="${resource.L_SUBMIT}" styleClass="mainoption" action="#{prefController.execute}"/>
&nbsp;&nbsp;
- <h:commandButton type="reset" value="${L_RESET}" styleClass="liteoption"/>
+ <h:commandButton type="reset" value="${resource.L_RESET}" styleClass="liteoption"/>
</td>
</tr>
</table>
@@ -258,7 +258,7 @@
</tr>
<tr>
<td align="center">
- <h:outputText value="You must be logged in to manage your Forum Preferences" styleClass="gen"/>
+ <h:outputText value="${resource.L_LOGIN_REQUIRED}" styleClass="gen"/>
</td>
</tr>
<tr>
Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/attachmentsview.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/attachmentsview.xhtml 2006-07-21 23:29:57 UTC (rev 5237)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/attachmentsview.xhtml 2006-07-21 23:39:44 UTC (rev 5238)
@@ -40,7 +40,7 @@
<span class="gen">${attachment.file.name}</span></b></td>
</tr>
<tr>
- <td width="15%" class="attachrow"><span class="genmed">&nbsp;Description:</span></td>
+ <td width="15%" class="attachrow"><span class="genmed">&nbsp;{resource.Description}:</span></td>
<td width="75%" class="attachrow">
<table width="100%" border="0" cellpadding="0" cellspacing="4" align="center">
<tr>
@@ -51,18 +51,18 @@
<td rowspan="4" align="center" width="10%" class="attachrow"><br/>
<h:outputLink value="/portal-forums/downloadAttachment" styleClass="genmed">
<f:param name="id" value="${attachment.id}"/>
- <b>Download </b>
+ <b>{resource.Download} </b>
</h:outputLink>
</td>
</tr>
<tr>
- <td width="15%" class="attachrow"><span class="genmed">&nbsp;Filename:</span></td>
+ <td width="15%" class="attachrow"><span class="genmed">&nbsp;${resource.Filename}:</span></td>
<td width="75%" class="attachrow"><span class="genmed">&nbsp;${attachment.file.name}</span>
</td>
</tr>
<tr>
- <td width="15%" class="attachrow"><span class="genmed">&nbsp;Filesize:</span></td>
+ <td width="15%" class="attachrow"><span class="genmed">&nbsp;${resource.Filesize}:</span></td>
<td width="75%" class="attachrow"><span class="genmed">&nbsp;${attachment.file.size}</span></td>
</tr>
</table>
Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/delete_poll.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/delete_poll.xhtml 2006-07-21 23:29:57 UTC (rev 5237)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/delete_poll.xhtml 2006-07-21 23:39:44 UTC (rev 5238)
@@ -37,17 +37,17 @@
<table class="forumline" width="100%" cellspacing="1" cellpadding="3" border="0">
<tr>
- <th class="thHead" height="25" valign="middle"><span class="tableTitle">Information</span></th>
+ <th class="thHead" height="25" valign="middle"><span class="tableTitle">${resource.Information}</span></th>
</tr>
<tr>
<td class="row1" align="center">
<h:form>
<span class="gen"><br/>
- Are you sure you want to delete this poll?
+ ${resource.Confirm_delete_poll}
<br/><br/>
- <h:commandButton type="submit" value="Yes" styleClass="mainoption" action="#{editPost.deletePoll}"/>
+ <h:commandButton type="submit" value="${resource.Yes}" styleClass="mainoption" action="#{editPost.deletePoll}"/>
&nbsp;&nbsp;
- <h:commandButton type="button" value="No" styleClass="liteoption" onclick="javascript:history.back();"/>
+ <h:commandButton type="button" value="${resource.No}" styleClass="liteoption" onclick="javascript:history.back();"/>
</span>
</h:form>
</td>
Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/delete_post.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/delete_post.xhtml 2006-07-21 23:29:57 UTC (rev 5237)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/delete_post.xhtml 2006-07-21 23:39:44 UTC (rev 5238)
@@ -37,20 +37,20 @@
<table class="forumline" width="100%" cellspacing="1" cellpadding="3" border="0">
<tr>
- <th class="thHead" height="25" valign="middle"><span class="tableTitle">Information</span></th>
+ <th class="thHead" height="25" valign="middle"><span class="tableTitle">${resource.Information}</span></th>
</tr>
<tr>
<td class="row1" align="center">
<h:form>
<span class="gen"><br/>
- Are you sure you want to delete this post?
+ ${resource.Confirm_delete}
<br/><br/>
<input type="hidden" name="p" value="#{param['p']}"/>
<input type="hidden" name="t" value="#{param['t']}"/>
<input type="hidden" name="f" value="#{param['f']}"/>
- <h:commandButton type="submit" value="Yes" styleClass="mainoption" action="#{deletePost.confirmDelete}"/>
+ <h:commandButton type="submit" value="${resource.Yes}" styleClass="mainoption" action="#{deletePost.confirmDelete}"/>
&nbsp;&nbsp;
- <h:commandButton type="button" value="No" styleClass="liteoption" onclick="javascript:history.back();"/>
+ <h:commandButton type="button" value="${resource.No}" styleClass="liteoption" onclick="javascript:history.back();"/>
</span>
</h:form>
</td>
Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/posting_edit_body.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/posting_edit_body.xhtml 2006-07-21 23:29:57 UTC (rev 5237)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/posting_edit_body.xhtml 2006-07-21 23:39:44 UTC (rev 5238)
@@ -456,7 +456,7 @@
<td></td>
<td>
<span class="gen">
- <span class="gen">Post topic as:
+ <span class="gen">${resource.Post_topic_as}:
<h:selectOneRadio value="#{editPost.topicType}" styleClass="gen">
<f:selectItem itemValue="0" itemLabel="Normal">
<f:verbatim>&nbsp;&nbsp;&nbsp;</f:verbatim>
Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/posting_new_body.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/posting_new_body.xhtml 2006-07-21 23:29:57 UTC (rev 5237)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/posting_new_body.xhtml 2006-07-21 23:39:44 UTC (rev 5238)
@@ -456,7 +456,7 @@
<td></td>
<td>
<span class="gen">
- <span class="gen">Post topic as:
+ <span class="gen">${resource.Post_topic_as}:
<h:selectOneRadio value="#{newTopic.topicType}" styleClass="gen">
<f:selectItem itemValue="0" itemLabel="Normal">
<f:verbatim>&nbsp;&nbsp;&nbsp;</f:verbatim>
Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/watches/forumWatch.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/watches/forumWatch.xhtml 2006-07-21 23:29:57 UTC (rev 5237)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/watches/forumWatch.xhtml 2006-07-21 23:39:44 UTC (rev 5238)
@@ -33,21 +33,21 @@
<ui:define name="mainContent">
<c:if test="#{forumWatch.anonymous==false}">
-<h1>Forum Watches Administration</h1>
+<h1>${resource.Watches_Admin}</h1>
-<p>Here you can administer your forum watches</p>
+<p>${resource.Watch_Forum_Info}</p>
<h:form>
<!-- Add Forum Watch widget -->
<table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
<tr>
- <th class="thHead" colspan="2">Add a forum watch</th>
+ <th class="thHead" colspan="2">${resource.Add_forum_watch}</th>
</tr>
<!-- display a list of all the registered forums -->
<tr>
- <td class="row1" align="center">Forum:</td>
+ <td class="row1" align="center">${resource.Forum}:</td>
<td class="row2" align="center">
<h:selectOneMenu value="#{forumWatch.selectedForum}">
<f:selectItem itemLabel="" itemValue="0"/>
@@ -59,7 +59,7 @@
</tr>
<!-- display a list of watch modes that the forum watch should have -->
<tr>
- <td class="row1" align="center">Mode:</td>
+ <td class="row1" align="center">${resource.Watch_mode}:</td>
<td class="row2" align="center">
<h:selectOneRadio value="#{forumWatch.watchMode}">
<f:selectItem itemLabel="Linked" itemValue="0"/>
@@ -70,7 +70,7 @@
<!-- button binds to activateWatch functionality -->
<tr>
<td class="catBottom" colspan="2" align="center">
- <h:commandButton value="Watch" styleClass="mainoption" action="#{forumWatch.activateWatch}"/>
+ <h:commandButton value="${resource.Watch}" styleClass="mainoption" action="#{forumWatch.activateWatch}"/>
</td>
</tr>
</table>
@@ -81,9 +81,9 @@
<input type="hidden" name="w"/>
<table cellspacing="1" cellpadding="2" border="0" align="center" class="forumline">
<tr>
- <td class="cat">Forum</td>
- <td class="cat">Mode</td>
- <td class="cat">Action</td>
+ <td class="cat">${resource.Forum}</td>
+ <td class="cat">${resource.Watch_mode}</td>
+ <td class="cat">${resource.Watch_action}</td>
</tr>
<c:forEach items="#{forumWatch.forumWatches}" var="watch">
@@ -108,14 +108,14 @@
</td>
<!-- actions that can be done on this forum watch -->
<td class="row2" align="center">
- <h:commandButton value="Unwatch" action="#{forumWatch.deActivateWatch}" onclick="javascript:w.value='#{watch.id}';"/>
+ <h:commandButton value="${resource.Unwatch}" action="#{forumWatch.deActivateWatch}" onclick="javascript:w.value='#{watch.id}';"/>
</td>
</tr>
</c:forEach>
<!-- button binds to updateWatch functionality -->
<tr>
<td class="catBottom" colspan="3" align="center">
- <h:commandButton value="Update" styleClass="mainoption" action="#{forumWatch.updateWatch}"/>
+ <h:commandButton value="${resource.Update}" styleClass="mainoption" action="#{forumWatch.updateWatch}"/>
</td>
</tr>
</table>
@@ -136,7 +136,7 @@
</tr>
<tr>
<td align="center">
- <h:outputText value="You must be logged in to Watch Forums" styleClass="gen"/>
+ <h:outputText value="${resource.Watch_Login_Requirement}" styleClass="gen"/>
</td>
</tr>
<tr>
More information about the jboss-svn-commits
mailing list