[zanata/zanata-server] 062565: Implement override plural forms:

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-server
  Commit: 062565c69a67bdfba201613c3a47a41a012a0edf
      https://github.com/zanata/zanata-server/commit/062565c69a67bdfba201613c3a47a41a012a0edf
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
    R functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    R functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
    M functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    M zanata-model/src/main/java/org/zanata/model/HLocale.java
    M zanata-war/pom.xml
    A zanata-war/src/main/java/org/zanata/action/LanguageAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
    R zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
    R zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    A zanata-war/src/main/java/org/zanata/action/LanguagesAction.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    A zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    M zanata-war/src/main/resources/db/db.changelog.xml
    M zanata-war/src/main/resources/messages.properties
    R zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coodinator_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coordinator_modal.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/language/language_list.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/language/language_view.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/new_language_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/search_user_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/zip_download_progress_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/admin/home.xhtml
    R zanata-war/src/main/webapp/admin/language.xhtml
    R zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M zanata-war/src/main/webapp/language/home.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsJpaTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java

  Log Message:
  -----------
  Implement override plural forms:
https://bugzilla.redhat.com/show_bug.cgi?id=1184708

Squashed commit of the following:

commit 863b2bb5727cd993cbb9982e0a2267c285b40369
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Feb 6 14:39:25 2015 +1000

    Implement override plural forms: https://bugzilla.redhat.com/show_bug.cgi?id=1184708

commit f147b27487715611901dc45aa45417fc31712919
Merge: d42e58f f374e74
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Feb 6 11:10:57 2015 +1000

    Merge branch 'integration/master' into rhbz1184708

commit d42e58ff84ac3e5b24531c274f58c8694a71125d
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Feb 5 09:53:45 2015 +1000

    Implement override plural forms:
    https://bugzilla.redhat.com/show_bug.cgi?id=1184708