WIP organizing language pages strings, yet to perform final cleanup

zanata-war/src/main/java/org/zanata/action/UserAction.java

@@ -148,7 +148,7 @@ public String save()
          }
          else
          {
-            FacesMessages.instance().addToControl("username", "Username '" + getUsername() + "' is not available");
+            FacesMessages.instance().addToControl("username", messages.get("jsf.UsernameNotAvailable"));
             setUsername(originalUsername); // reset the username field
             return "failure";
          }

zanata-war/src/main/resources/messages.properties

@@ -2,6 +2,8 @@
 
 ! the name of this web application
 jsf.Zanata=Zanata
+jsf.ZanataMainTitle=#{messages['jsf.Zanata']}
+jsf.ZanataMainDescription=#{messages['jsf.Zanata']}
 
 jsf.Help=Help
 jsf.Description=Description
@@ -46,6 +48,14 @@ jsf.AlreadyInGroup=Already in Group
 jsf.Search=Search
 jsf.Upload=Upload
 jsf.Delete=Delete
+! this is shown when trying to access a project, version or other item that does not exist in the system.
+! e.g. navigate to a project, then change the project slug in the URL to make it invalid and press enter.
+jsf.RecordNotFound=Record not found
+jsf.DuplicatedRecord=Duplicated record
+jsf.AnotherUserChangedTheSameDataPleaseTryAgain=Another user changed the same data. Please try again.
+jsf.YouDoNotHavePermissionToAccessThisResource=You do not have permission to access this resource.
+jsf.YourSessionHasTimedOutPleaseTryAgain=Your session has timed out. Please try again.
+jsf.UnexpectedErrorPleaseTryAgain=Unexpected error. Please try again.
 
 
 #------ [home] > Projects > [project-id] > [version-id] > [group-id] > Request To Join Group ------
@@ -62,6 +72,7 @@ jsf.email.MessageBody=Message
 jsf.email.Send=Send Message
 jsf.NoProjects=No projects to display.
 jsf.SelectProjectVersions=Select Project Versions
+jsf.NoProjectVersionSelected=No project version selected.
 jsf.ClickSendMessageToProceedRequest=Enter additional information and click 'Send Message' to proceed
 jsf.email.joingrouprequest.Subject=Request to join group '#{versionGroupJoinAction.group.name}'
 jsf.email.joingrouprequest.AdditionalInfoMessage=To ensure your request is processed without delay, please provide any additional information that will help the group maintainers to process your request.
@@ -70,6 +81,7 @@ jsf.RequestToJoinLanguageTeamTitle=Request To Join '#{sendEmail.locale.localeId.
 jsf.email.joinrequest.Subject=User '#{sendEmail.fromLoginName}' wants to join the '#{sendEmail.locale.localeId.id}' language team
 jsf.email.joinrequest.AdditionalInfoMessage=To ensure your request is processed without delay, please provide any additional information that will help the team coordinators identify you and process your request.
 jsf.email.ContactCoordinatorTitle=Contact '#{sendEmail.locale.retrieveDisplayName()}' Coordinator
+jsf.contactLanguageTeamCoordinatorForLocale=Contact '#{sendEmail.locale.localeId.id} (#{sendEmail.locale.retrieveNativeName()})' Language Team Coordinators
 
 
 
@@ -139,6 +151,7 @@ jsf.FilterActiveProjects=Filter active projects
 jsf.FilterReadOnlyProjects=Filter read-only projects
 jsf.FilterObsoleteProjects=Filter obsolete projects
 jsf.ProjectName=Project Name
+jsf.NoProjectExists=No project exists.
 
 
 
@@ -219,13 +232,15 @@ jsf.AddProjectMaintainer=Add Project Maintainer
 jsf.AreYouSureYouWishToRemoveThisPersonAsProjectMaintainer=Are you sure you wish to remove this person as project maintainer?
 jsf.AddGroupMaintainer=Add Group Maintainer
 jsf.AreYouSureYouWishToRemoveThisPersonAsGroupMaintainer=Are you sure you wish to remove this person as group maintainer?
+jsf.YouAreNoLongerMaintainerForThisProject=You are no longer a maintainer for this project.
 
 
 
 #------ [home] > Projects > [project-id] > Copy Trans Options ------
 #------ [home] > Projects > [project-id] > [version-id] > Copy Translations ------
 # Some of these strings are only visible while copytrans is running
 jsf.project.CopyTransOpts.title=Copy Trans Options
+jsf.project.CopyTransOpts.saved=Copy Trans options saved.
 jsf.iteration.CopyTrans.pageTitle=Copy Trans for #{viewAllStatusAction.projectSlug}:#{viewAllStatusAction.iterationSlug}
 jsf.iteration.CopyTrans.Condition=Condition
 jsf.iteration.CopyTrans.Condition.onContentMismatch=On Content mismatch:
@@ -251,6 +266,9 @@ jsf.iteration.CopyTrans.Help.approve=Translation will be reused and marked as Ap
 jsf.Start=Start
 jsf.iteration.CopyTrans.AlreadyStarted=A Translation Copy has already been started by #{copyTransManager.getCopyTransProcessHandle( copyTransAction.projectIteration ).triggeredBy} for version <b>#{copyTransAction.projectIteration.slug}</b> of project <b>#{copyTransAction.projectIteration.project.name}</b>.
 jsf.CopyTrans.ClickHereToViewProgress=Please click here to view progress.
+jsf.iteration.CopyTrans.AlreadyStarted.flash=Someone else already started a translation copy for this version.
+jsf.iteration.CopyTrans.NoDocuments=There are no documents in this project version.
+jsf.iteration.CopyTrans.Started=Translation copy started.
 
 
 
@@ -330,6 +348,7 @@ jsf.iteration.files.dotofflinepo.description=Special po format that uses msgctxt
 jsf.iteration.files.dotofflinepo.purpose=This format is required by Zanata when uploading po translations for a document that was originally in a non-po format.
 
 jsf.iteration.files.ConfirmDocDeletion=Are you sure you want to remove this Source Document?
+jsf.iteration.files.DocumentDeleted=Document succesfully deleted.
 jsf.iteration.files.ProcessDlgTitle=Processing project files...
 
 jsf.iteration.files.UploadDocument=Upload Document
@@ -461,6 +480,7 @@ jsf.ResetPassword=Reset Password
 jsf.SubmitRequest=Submit Request
 jsf.ResetYourPassword=Reset Your Password
 jsf.NewPassword=New Password
+jsf.OldPassword=Old Password
 jsf.ChangePassword=Change Password
 jsf.RememberMe=Remember me
 jsf.login.openid.SelectProvider=How are you logging in?
@@ -469,6 +489,7 @@ jsf.login.openid.myopenid=MyOpenID User
 jsf.login.openid.yahoo=Yahoo Username
 jsf.login.openid=Open ID
 jsf.login.internal=Username
+jsf.UsernameNotAvailable=Username "#{userAction.username}" is not available
 jsf.FedoraUsername=Fedora Username
 jsf.ActivateAccount=Activate Account
 jsf.ValidateEmail=Validate Email
@@ -480,6 +501,8 @@ jsf.ResendActivationEmail=Re-send activation email
 jsf.or=OR
 jsf.inactiveaccount.UpdateAndResend=Update email address and re-send activation email:
 jsf.UpdateEmail=Update email address
+jsf.InvalidActivationKey=Invalid activation key
+jsf.ActivationLinkExpired=Activation link expired. Please sign in and click "#{messages['jsf.ResendActivationEmail']}".
 
 
 
@@ -584,6 +607,7 @@ jsf.CreateNewUser=Create new user
 jsf.MemberOf=Member of
 jsf.Enabled=Enabled
 jsf.AreYouSureYouWishToDeleteThisUserThisActionCannotBeUndone=Are you sure you wish to delete this user? This action cannot be undone.
+jsf.UserManager.delete.constraintViolation.error=This user cannot be removed from the system. You can deactivate the user instead.
 jsf.AccountEnabled=Account enabled
 
 
@@ -614,6 +638,10 @@ jsf.language.validation.Underscores=Underscores should be replaced with dashes.
 jsf.CountryCode=Country Code
 jsf.LanguageCode=Language Code
 jsf.Variant=Variant
+jsf.language.validation.Invalid=Invalid Language Name
+jsf.language.validation.Existing=This language already exists
+jsf.language.validation.UnknownPluralForm=Warning: No plural information available. Assuming no plurals.
+jsf.language.validation.SimilarLocaleFound=Similar languages found:
 
 
 
@@ -750,6 +778,7 @@ jsf.email.admin.SentNotification=Your message has been sent to the administrator
 ! this string is the start of the subject. The subject entered by the user is appended to this.
 jsf.email.admin.SubjectPrefix=Zanata user email from '#{sendEmail.fromLoginName}':
 jsf.email.admin.Administrator=Administrator
+jsf.ZanataAdministrator=Zanata Administrator
 jsf.email.admin.DearAdmin=Dear #{messages['jsf.email.admin.Administrator']},
 jsf.email.admin.UserMessageIntro=Zanata user '#{sendEmail.fromName}' with id '#{sendEmail.fromLoginName}' has sent the following message:
 jsf.email.ReplyInstructions=You can reply to #{sendEmail.fromName} at #{sendEmail.replyEmail}
@@ -890,91 +919,41 @@ javax.faces.converter.STRING=value could not be converted to a string
 
 
 
-
-
-jsf.ActivationLinkExpired=Activation link expired. Please sign in and click "#{messages['jsf.ResendActivationEmail']}".
+#------ UNUSED ------
 jsf.AdminName=Administrator
-jsf.AnotherUserChangedTheSameDataPleaseTryAgain=Another user changed the same data. Please try again.
 jsf.AvailableValidationOptions=Available validation options
 jsf.ChangeYourGravatar=Change your avatar at gravatar.com
 jsf.Configuration=Configuration
-jsf.contactLanguageTeamCoordinatorForLocale=Contact '#{sendEmail.locale.localeId.id} (#{sendEmail.locale.retrieveNativeName()})' Language Team Coordinators
 jsf.ActiveVersions=Active versions
 jsf.DefinedValidationOptions=Defined validation options
 jsf.Disabled=Disable
-jsf.DuplicatedRecord=Duplicated record
-
-
-
-
-
-
-
-
-
 jsf.Enable=Enable
 jsf.GlossaryStatistics=Glossary Statistics
-
 jsf.HelpUrl=Help URL
 jsf.HelpUrlToolTip=The help URL for the server (shown on welcome page and every page's header)
 jsf.ImportJavaLocales=Import Java Locales
-jsf.InvalidActivationKey=Invalid activation key
-
 jsf.identities.SelectIdentityType=Select the type for the new Identity to add:
-
 jsf.iteration.CopyTrans.noDocuments=Please add documents to this version first.
 jsf.iteration.CopyTrans.success=Translations copied successfully.
-jsf.iteration.CopyTrans.AlreadyStarted.flash=Someone else already started a translation copy for this version.
-jsf.iteration.CopyTrans.NoDocuments=There are no documents in this project version.
-jsf.iteration.CopyTrans.Started=Translation copy started.
-
 jsf.iteration.files.ContentType=Content Type
-jsf.iteration.files.DocumentDeleted=Document succesfully deleted.
 jsf.iteration.files.LocaleId=Locale Id
 jsf.iteration.info.UserNotInLanguageTeam=You can only view this document because you are not part of the language team.
 jsf.iteration.info.UserNotInProjectRoles=You can only view this document because you are not part of the roles allowed for this project.
 jsf.iteration.info.Translate=Translate
-
 jsf.JavaLocaleId=Java Locale Id
-
-jsf.language.validation.Existing=This language already exists
-jsf.language.validation.Invalid=Invalid Language Name
-jsf.language.validation.UnknownPluralForm=Warning: No plural information available. Assuming no plurals.
-jsf.language.validation.SimilarLocaleFound=Similar languages found:
-
 jsf.LatestProjects=Latest Projects
-
 jsf.Membership=Membership
 jsf.CreateANewVersion=Create a New Version
 jsf.NoLocaleExists=No locale exists.
-jsf.NoProjectExists=No project exists.
-jsf.NoProjectVersionSelected=No project version selected.
 jsf.NoProject=No project.
 jsf.Officerships=Officerships
-jsf.OldPassword=Old Password
 jsf.Ownerships=Ownerships
-
-jsf.project.CopyTransOpts.saved=Copy Trans options saved.
 jsf.project.ViewIteration=View >>
-
 jsf.Project=Project
-
-jsf.RecordNotFound=Record not found
 jsf.ReindexingInProgress=Re-indexing...
 jsf.RoleManager=Role Manager
-
 jsf.Script=Script
 jsf.Slug=Slug
 jsf.TotalWords=Total Words
-jsf.UnexpectedErrorPleaseTryAgain=Unexpected error. Please try again.
-jsf.UserManager.delete.constraintViolation.error=This user cannot be removed from the system. You can deactivate the user instead.
-
 jsf.View=View
-
-jsf.YouDoNotHavePermissionToAccessThisResource=You do not have permission to access this resource.
-jsf.YouAreNoLongerMaintainerForThisProject=You are no longer a maintainer for this project. 
-jsf.YourSessionHasTimedOutPleaseTryAgain=Your session has timed out. Please try again.
 jsf.YourLanguageMissing=Your language missing?
-jsf.ZanataAdministrator=Zanata Administrator
-jsf.ZanataMainTitle=#{messages['jsf.Zanata']}
-jsf.ZanataMainDescription=Zanata

zanata-war/src/main/webapp/WEB-INF/layout/breadcrumbs.xhtml

@@ -5,7 +5,7 @@
     xmlns:f="http://java.sun.com/jsf/core"
     xmlns:s="http://jboss.com/products/seam/taglib"
     xmlns:rich="http://richfaces.org/rich">
-  
+
      <h:form>
      	<s:link view="/home.xhtml" propagation="none" rendered="#{not empty breadcrumbs.locations}" styleClass="breadcrumbs_home">
      		<span class="icon-home-1" title="#{messages['jsf.ZanataMainDescription']}"/>