diff --git a/zanata-war/src/main/java/org/zanata/action/PasswordChangeAction.java b/zanata-war/src/main/java/org/zanata/action/PasswordChangeAction.java
deleted file mode 100644
index df28e67790..0000000000
--- a/zanata-war/src/main/java/org/zanata/action/PasswordChangeAction.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright 2010, Red Hat, Inc. and individual contributors as indicated by the
- * @author tags. See the copyright.txt file in the distribution for a full
- * listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this software; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
- * site: http://www.fsf.org.
- */
-package org.zanata.action;
-
-import java.io.Serializable;
-
-import javax.validation.constraints.Size;
-
-import org.hibernate.validator.constraints.NotEmpty;
-import org.jboss.seam.ScopeType;
-import org.jboss.seam.annotations.Begin;
-import org.jboss.seam.annotations.End;
-import org.jboss.seam.annotations.In;
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.faces.FacesMessages;
-import org.jboss.seam.security.RunAsOperation;
-import org.jboss.seam.security.management.IdentityManager;
-import org.jboss.seam.security.management.JpaIdentityStore;
-import org.zanata.model.HAccount;
-
-@Name("passwordChange")
-@Scope(ScopeType.PAGE)
-public class PasswordChangeAction implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER)
- HAccount authenticatedAccount;
-
- @In
- private IdentityManager identityManager;
-
- private String passwordOld;
- private String passwordNew;
- private String passwordConfirm;
-
- public void setPasswordOld(String passwordOld) {
- this.passwordOld = passwordOld;
- }
-
- @NotEmpty
- @Size(min = 6, max = 20)
- public String getPasswordOld() {
- return passwordOld;
- }
-
- @Begin(join = true)
- public void setPasswordNew(String passwordNew) {
- this.passwordNew = passwordNew;
- }
-
- @NotEmpty
- @Size(min = 6, max = 20)
- // @Pattern(regex="(?=^.{6,}$)((?=.*\\d)|(?=.*\\W+))(?![.\\n])(?=.*[A-Z])(?=.*[a-z]).*$",
- // message="Password is not secure enough!")
- public
- String getPasswordNew() {
- return passwordNew;
- }
-
- @Begin(join = true)
- public void setPasswordConfirm(String passwordConfirm) {
- this.passwordConfirm = passwordConfirm;
- validatePasswordsMatch();
- }
-
- public String getPasswordConfirm() {
- return passwordConfirm;
- }
-
- public boolean validatePasswordsMatch() {
- if (passwordNew == null || !passwordNew.equals(passwordConfirm)) {
- FacesMessages.instance().addToControl("passwordConfirm",
- "Passwords do not match");
- return false;
- }
- return true;
- }
-
- @End
- public String change() {
- if (!validatePasswordsMatch())
- return null;
-
- if (!isFirstPasswordChange()
- && !identityManager.authenticate(
- authenticatedAccount.getUsername(), passwordOld)) {
- FacesMessages.instance().addToControl("passwordOld",
- "Old password is incorrect, please check and try again.");
- return null;
- }
-
- new RunAsOperation() {
- public void execute() {
- identityManager.changePassword(
- authenticatedAccount.getUsername(), getPasswordNew());
- }
- }.addRole("admin").run();
-
- FacesMessages.instance().add(
- "Your password has been successfully changed.");
-
- return "/profile/view.xhtml";
- }
-
- public boolean isFirstPasswordChange() {
- return authenticatedAccount.getPasswordHash() == null;
- }
-}
diff --git a/zanata-war/src/main/resources/messages.properties b/zanata-war/src/main/resources/messages.properties
index 5411d97397..2ba0b65069 100644
--- a/zanata-war/src/main/resources/messages.properties
+++ b/zanata-war/src/main/resources/messages.properties
@@ -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:
@@ -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
@@ -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
diff --git a/zanata-war/src/main/webapp/WEB-INF/pages.xml b/zanata-war/src/main/webapp/WEB-INF/pages.xml
index bc3b785fe1..281af7fafa 100644
--- a/zanata-war/src/main/webapp/WEB-INF/pages.xml
+++ b/zanata-war/src/main/webapp/WEB-INF/pages.xml
@@ -157,15 +157,6 @@
execute="#{breadcrumbs.addLocation('', msgs['jsf.ResetPassword'])}" />
-
- #{applicationConfiguration.internalAuth}
-
-
-
-
-
@@ -445,22 +436,6 @@
-
-
- #{identity.preAuthenticated}
-
-
-
-
-
-
-
-
-
-
-
#{identity.preAuthenticated}
@@ -471,35 +446,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml b/zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
index ba744379e9..7cfedb8181 100644
--- a/zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
+++ b/zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
@@ -198,16 +198,6 @@
/profile/create_user.seam$1
-
- ^/profile/view(.+)?$
- /profile/view.seam$1
-
-
-
- ^/profile/identities(\?.*)?$
- /profile/identities.seam$1
-
-
^/profile/add_identity(\?.*)?$
/profile/add_identity.seam$1
@@ -425,10 +415,7 @@
^(/.+)?/account/password_reset.seam\?key=(.+)$
$1/account/password_reset/$2
-
- ^(/.+)?/account/changepassword.seam(.+)?$
- $1/account/changepassword$2
-
+
^(/.+)?/account/inactive_account.seam(.+)?$
$1/account/inactive$2
@@ -459,31 +446,11 @@
-
- ^(/.+)?/profile/edit.seam(.+)?$
- $1/profile/edit$2
-
-
^(/.+)?/profile/create_user.seam(.+)?$
$1/profile/create$2
-
- ^(/.+)?/profile/view.seam(.+)?$
- $1/profile/view$2
-
-
-
- ^(/.+)?/profile/identities.seam(.+)?$
- $1/profile/identities$2
-
-
-
- ^(/.+)?/profile/add_identity.seam(.+)?$
- $1/profile/add_identity$2
-
-
^(/.+)?/profile/merge_account.seam(.+)?$
$1/profile/merge_account$2
diff --git a/zanata-war/src/main/webapp/account/changepassword.xhtml b/zanata-war/src/main/webapp/account/changepassword.xhtml
deleted file mode 100644
index 9fd9837a62..0000000000
--- a/zanata-war/src/main/webapp/account/changepassword.xhtml
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
- #{msgs['jsf.ChangePassword']}
-
- #{msgs['jsf.ChangePassword']}
-
-
-
- #{msgs['jsf.ChangePassword']}
-
- #{msgs['jsf.OldPassword']}
-
-
-
-
-
- #{msgs['jsf.NewPassword']}
-
-
-
-
-
- #{msgs['jsf.ConfirmPassword']}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-