Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Clean up some strings and files
Browse files Browse the repository at this point in the history
Fix some incorrect UI strings
Remove unused files and their redirects
  • Loading branch information
djansen-redhat committed Oct 8, 2014
1 parent 2b38cdd commit d071744
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 276 deletions.
127 changes: 0 additions & 127 deletions zanata-war/src/main/java/org/zanata/action/PasswordChangeAction.java

This file was deleted.

6 changes: 3 additions & 3 deletions zanata-war/src/main/resources/messages.properties
Expand Up @@ -444,7 +444,7 @@ jsf.Documents=Documents
jsf.Statistics=Statistics
! statistics based on words in source
jsf.ByWords=By Words
! statistics based on entier message strings
! statistics based on entire message strings
jsf.Message=By Messages
! used in tooltip for statistics bar
jsf.stats.Total=Total:
Expand Down Expand Up @@ -507,7 +507,7 @@ jsf.iteration.files.Path=Path
jsf.iteration.files.Filter.title=Filter by document name
jsf.Upload.Label=Upload translation
jsf.iteration.files.Merge=Merge
jsf.iteration.files.Merge.title=When checked, current data will merge with uploaded document. Otherwise data will be override by uploaded document.
jsf.iteration.files.Merge.title=When checked, current data will merge with uploaded document. Otherwise data will be overridden by uploaded document.
jsf.iteration.files.MergeCheckbox.Title=When checked, updated translations will be written, leaving all others unchanged.

jsf.iteration.files.Download=Download
Expand All @@ -521,7 +521,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 file?
jsf.iteration.files.DocumentDeleted=Document succesfully deleted.
jsf.iteration.files.DocumentDeleted=Document successfully deleted.
jsf.iteration.files.ProcessDlgTitle=Processing project files...

jsf.iteration.files.UpdateDocument=Update this document
Expand Down
54 changes: 0 additions & 54 deletions zanata-war/src/main/webapp/WEB-INF/pages.xml
Expand Up @@ -157,15 +157,6 @@
execute="#{breadcrumbs.addLocation('', msgs['jsf.ResetPassword'])}" />
</page>

<page view-id="/account/changepassword.xhtml" login-required="true">
<restrict>#{applicationConfiguration.internalAuth}</restrict>
<action execute="#{breadcrumbs.clear}" />
<action
execute="#{breadcrumbs.addLocation('/profile/view.xhtml', msgs['jsf.MyProfile'])}" />
<action
execute="#{breadcrumbs.addLocation('', msgs['jsf.ChangePassword'])}" />
</page>

<page view-id="/account/register.xhtml">
<action execute="#{identity.isLoggedIn()}" />
<navigation from-action="#{identity.isLoggedIn()}">
Expand Down Expand Up @@ -445,22 +436,6 @@
</navigation>
</page>

<!-- Profile -->
<page view-id="/profile/edit.xhtml">
<restrict>#{identity.preAuthenticated}</restrict>
<action execute="#{breadcrumbs.clear}" />
<action
execute="#{breadcrumbs.addLocation('/profile/view.xhtml', msgs['jsf.MyProfile'])}" />
<action
execute="#{breadcrumbs.addLocation('', msgs['jsf.EditProfile'])}" />
<navigation from-action="#{profileAction.edit}">
<redirect view-id="/profile/view.xhtml" />
</navigation>
<navigation from-action="#{profileAction.cancel}">
<redirect view-id="/profile/view.xhtml" />
</navigation>
</page>

<page view-id="/profile/create_user.xhtml">
<restrict>#{identity.preAuthenticated}</restrict>
<navigation from-action="#{newProfileAction.createUser}">
Expand All @@ -471,35 +446,6 @@
</navigation>
</page>

<page view-id="/profile/view.xhtml" login-required="true">
<action execute="#{breadcrumbs.clear}" />
<action
execute="#{breadcrumbs.addLocation('', msgs['jsf.MyProfile'])}" />
</page>

<page view-id="/profile/identities.xhtml" login-required="true">
<action execute="#{breadcrumbs.clear}" />
<action
execute="#{breadcrumbs.addLocation('/profile/view.xhtml', msgs['jsf.MyProfile'])}" />
<action
execute="#{breadcrumbs.addLocation('', msgs['jsf.identities.Title'])}" />
<action execute="#{credentialsAction.loadUserCredentials}" />
</page>

<page view-id="/profile/add_identity.xhtml" login-required="true">
<action execute="#{breadcrumbs.clear}" />
<action
execute="#{breadcrumbs.addLocation('/profile/view.xhtml', msgs['jsf.MyProfile'])}" />
<action
execute="#{breadcrumbs.addLocation('/profile/identities.xhtml', msgs['jsf.identities.Title'])}" />
<action
execute="#{breadcrumbs.addLocation('', msgs['jsf.identities.AddIdentity'])}" />

<navigation from-action="#{credentialsAction.cancel}">
<redirect view-id="/profile/identities.xhtml" />
</navigation>
</page>

<page view-id="/profile/merge_account.xhtml" login-required="true">
<action execute="#{accountMergeAction.validateAccounts}" />

Expand Down
35 changes: 1 addition & 34 deletions zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
Expand Up @@ -198,16 +198,6 @@
<to last="true">/profile/create_user.seam$1</to>
</rule>

<rule>
<from casesensitive="true">^/profile/view(.+)?$</from>
<to last="true">/profile/view.seam$1</to>
</rule>

<rule>
<from casesensitive="true">^/profile/identities(\?.*)?$</from>
<to last="true">/profile/identities.seam$1</to>
</rule>

<rule>
<from casesensitive="true">^/profile/add_identity(\?.*)?$</from>
<to last="true">/profile/add_identity.seam$1</to>
Expand Down Expand Up @@ -425,10 +415,7 @@
<from>^(/.+)?/account/password_reset.seam\?key=(.+)$</from>
<to>$1/account/password_reset/$2</to>
</outbound-rule>
<outbound-rule>
<from>^(/.+)?/account/changepassword.seam(.+)?$</from>
<to>$1/account/changepassword$2</to>
</outbound-rule>

<outbound-rule>
<from>^(/.+)?/account/inactive_account.seam(.+)?$</from>
<to>$1/account/inactive$2</to>
Expand Down Expand Up @@ -459,31 +446,11 @@
<!-- <to>$1/glossary/view$2</to> -->
<!-- </outbound-rule> -->

<outbound-rule>
<from>^(/.+)?/profile/edit.seam(.+)?$</from>
<to>$1/profile/edit$2</to>
</outbound-rule>

<outbound-rule>
<from>^(/.+)?/profile/create_user.seam(.+)?$</from>
<to>$1/profile/create$2</to>
</outbound-rule>

<outbound-rule>
<from>^(/.+)?/profile/view.seam(.+)?$</from>
<to>$1/profile/view$2</to>
</outbound-rule>

<outbound-rule>
<from>^(/.+)?/profile/identities.seam(.+)?$</from>
<to>$1/profile/identities$2</to>
</outbound-rule>

<outbound-rule>
<from>^(/.+)?/profile/add_identity.seam(.+)?$</from>
<to>$1/profile/add_identity$2</to>
</outbound-rule>

<outbound-rule>
<from>^(/.+)?/profile/merge_account.seam(.+)?$</from>
<to>$1/profile/merge_account$2</to>
Expand Down
58 changes: 0 additions & 58 deletions zanata-war/src/main/webapp/account/changepassword.xhtml

This file was deleted.

0 comments on commit d071744

Please sign in to comment.