Merge pull request #887 from zanata/rhbz1235495-po-upload-fix

rhbz1235495,ZANATA-20 - fix error in uploading po file from web UI
zanata · Jun 25, 2015 · 9988b4b · 9988b4b
2 parents b0459f9 + 29c4b0c
commit 9988b4b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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