From 29c4b0c3d8bc78fa7c3357cab14cf7af70d13147 Mon Sep 17 00:00:00 2001
From: Patrick Huang <pahuang@redhat.com>
Date: Thu, 25 Jun 2015 11:53:22 +1000
Subject: [PATCH] rhbz1235495,ZANATA-20 - fix error in uploading po file from
 web UI

---
 docs/release-notes.md                                       | 1 +
 .../org/zanata/service/impl/TranslationFileServiceImpl.java | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/release-notes.md b/docs/release-notes.md
index 3f7499cf00..8d0cd3499b 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -59,6 +59,7 @@ Example usage in html file: `<link rel="shortcut icon" href="#{assets['img/logo/
 * [1230424](https://bugzilla.redhat.com/show_bug.cgi?id=1230424) - Update message "Archived" to "Deleted" in activity table
 * [1231054](https://bugzilla.redhat.com/show_bug.cgi?id=1231054) - Exception when clicking "more activity" when there is no valid "editor url"
 * [1234687](https://bugzilla.redhat.com/show_bug.cgi?id=1234687) - [REGRESSION] can not upload pot file from web UI 
+* [1235495](https://bugzilla.redhat.com/show_bug.cgi?id=1235495) - [REGRESSION] can not upload po file from web UI
 
 -----------------------
 
diff --git a/zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
index 71da934890..7ce6b0d3ee 100644
--- a/zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
+++ b/zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
@@ -230,7 +230,11 @@ public boolean hasMultipleDocumentTypes(String fileNameOrExtension) {
     @Override
     public Set<DocumentType> getDocumentTypes(String fileNameOrExtension) {
         String extension = FilenameUtils.getExtension(fileNameOrExtension);
-        return DocumentType.fromSourceExtension(extension);
+        Set<DocumentType> documentTypes =
+                DocumentType.fromSourceExtension(extension);
+        documentTypes
+                .addAll(DocumentType.fromTranslationExtension(extension));
+        return documentTypes;
     }
 
     @Override