Merge branch 'master' into rhbz756235

zanata · Dec 15, 2011 · 9931f26 · 9931f26
2 parents d3759d7 + 1426487
commit 9931f26
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/server/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java b/server/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
@@ -82,7 +82,7 @@ public class ResourceUtils
 
    private static final String   PO_DATE_FORMAT = "yyyy-MM-dd hh:mmZ";
 
-   private static final String[] PO_VALID_CONTENT_TYPES = {"charset=UTF-8", "charset=utf-8", "charset=ASCII"};
+   private static final String[] PO_VALID_CONTENT_TYPES = {"charset=UTF-8", "charset=UTF8", "charset=ASCII", "charset=CHARSET"};
 
 
    /**
@@ -1173,7 +1173,8 @@ public boolean validateResourceEncoding(Resource res)
             {
                for( String acceptedContentType : PO_VALID_CONTENT_TYPES )
                {
-                  if( entry.getValue().contains( acceptedContentType ) )
+                  // Case-insensitive check
+                  if( entry.getValue().toLowerCase().contains( acceptedContentType.toLowerCase() ) )
                   {
                      return true;
                   }