You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ba...@apache.org on 2015/05/04 03:42:30 UTC
svn commit: r1677505 - in /continuum/trunk/continuum-webapp/src/main:
java/org/apache/continuum/web/action/ViewBuildsReportAction.java
resources/localization/Continuum.properties
Author: batkinson
Date: Mon May 4 01:42:29 2015
New Revision: 1677505
URL: http://svn.apache.org/r1677505
Log:
Made build report action messages localizable.
Modified:
continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ViewBuildsReportAction.java
continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ViewBuildsReportAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ViewBuildsReportAction.java?rev=1677505&r1=1677504&r2=1677505&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ViewBuildsReportAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ViewBuildsReportAction.java Mon May 4 01:42:29 2015
@@ -151,8 +151,9 @@ public class ViewBuildsReportAction
return REQUIRES_AUTHORIZATION;
}
- if (permittedGroups.isEmpty()) {
- addActionError( "You are not authorized to view any project groups." );
+ if ( permittedGroups.isEmpty() )
+ {
+ addActionError( getText( "projectBuilds.report.noGroupsAuthorized" ) );
return REQUIRES_AUTHORIZATION;
}
@@ -172,8 +173,9 @@ public class ViewBuildsReportAction
return REQUIRES_AUTHORIZATION;
}
- if (permittedGroups.isEmpty()) {
- addActionError( "You are not authorized to view any project groups." );
+ if ( permittedGroups.isEmpty() )
+ {
+ addActionError( getText( "projectBuilds.report.noGroupsAuthorized" ) );
return REQUIRES_AUTHORIZATION;
}
@@ -187,13 +189,13 @@ public class ViewBuildsReportAction
}
catch ( ParseException e )
{
- addActionError( "Error parsing date(s): " + e.getMessage() );
+ addActionError( getText( "projectBuilds.report.badDates", new String[] { e.getMessage() } ) );
return ERROR;
}
if ( fromDate != null && toDate != null && fromDate.after( toDate ) )
{
- addFieldError( "startDate", "Start Date must be earlier than the End Date" );
+ addFieldError( "startDate", getText( "projectBuilds.report.endBeforeStartDate" ) );
return INPUT;
}
@@ -225,8 +227,7 @@ public class ViewBuildsReportAction
if ( filteredResults.size() == MAX_BROWSE_SIZE )
{
- addActionMessage( "Results may have been limited due to size."
- + " Refine your search criteria or try exporting." );
+ addActionMessage( getText( "projectBuilds.report.limitedResults" ) );
}
int resultSize = filteredResults.size();
@@ -234,7 +235,7 @@ public class ViewBuildsReportAction
if ( page < 1 || page > pageTotal )
{
- addActionError( "Specified page does not exist" );
+ addActionError( getText( "projectBuilds.report.invalidPage" ) );
return ERROR;
}
@@ -261,8 +262,9 @@ public class ViewBuildsReportAction
return REQUIRES_AUTHORIZATION;
}
- if (permittedGroups.isEmpty()) {
- addActionError( "You are not authorized to view any project groups." );
+ if ( permittedGroups.isEmpty() )
+ {
+ addActionError( getText( "projectBuilds.report.noGroupsAuthorized" ) );
return REQUIRES_AUTHORIZATION;
}
@@ -276,13 +278,13 @@ public class ViewBuildsReportAction
}
catch ( ParseException e )
{
- addActionError( "Error parsing date(s): " + e.getMessage() );
+ addActionError( getText( "projectBuilds.report.badDates", new String[] { e.getMessage() } ) );
return ERROR;
}
if ( fromDate != null && toDate != null && fromDate.after( toDate ) )
{
- addFieldError( "startDate", "Start Date must be earlier than the End Date" );
+ addFieldError( "startDate", getText( "projectBuilds.report.endBeforeStartDate" ) );
return INPUT;
}
@@ -384,7 +386,7 @@ public class ViewBuildsReportAction
}
catch ( IOException e )
{
- addActionError( "Error occurred while generating CSV file." );
+ addActionError( getText( "projectBuilds.report.exportIOError", new String[] { e.getMessage() } ) );
return ERROR;
}
Modified: continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties?rev=1677505&r1=1677504&r2=1677505&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties Mon May 4 01:42:29 2015
@@ -1327,6 +1327,12 @@ projectBuilds.report.projectGroup = Proj
projectBuilds.report.project=Project Name
projectBuilds.report.buildDate=Build Date
projectBuilds.report.noResult=No Results Found
+projectBuilds.report.noGroupsAuthorized=You are not authorized to view any project groups.
+projectBuilds.report.limitedResults=Results may have been limited due to size. Refine your search criteria or use export.
+projectBuilds.report.invalidPage=Specified page does not exist.
+projectBuilds.report.exportIOError=There was an input/output error during export: {0}
+projectBuilds.report.badDates=Failed to parse date(s): {0}
+projectBuilds.report.endBeforeStartDate=Invalid date range: start date must be earlier than the end date.
build.project.success=successfully queued build
build.projects.success=successfully queued builds