diff --git a/webs/resources-importer-web/docroot/WEB-INF/src/com/liferay/resourcesimporter/util/FileSystemImporter.java b/webs/resources-importer-web/docroot/WEB-INF/src/com/liferay/resourcesimporter/util/FileSystemImporter.java index 75d58771481c..40f13770dadb 100644 --- a/webs/resources-importer-web/docroot/WEB-INF/src/com/liferay/resourcesimporter/util/FileSystemImporter.java +++ b/webs/resources-importer-web/docroot/WEB-INF/src/com/liferay/resourcesimporter/util/FileSystemImporter.java @@ -136,6 +136,7 @@ protected void addApplicationDisplayTemplate( throws PortalException, SystemException { String fileName = FileUtil.stripExtension(file.getName()); + String language = getDDMTemplateLanguage(file.getName()); String name = getName(fileName); @@ -164,7 +165,7 @@ protected void addApplicationDisplayTemplate( userId, groupId, classNameId, 0, getKey(fileName), getMap(name), null, DDMTemplateConstants.TEMPLATE_TYPE_DISPLAY, - StringPool.BLANK, getDDMTemplateLanguage(name), script, + StringPool.BLANK, language, script, false, false, StringPool.BLANK, null, serviceContext); } else { @@ -172,7 +173,7 @@ StringPool.BLANK, getDDMTemplateLanguage(name), script, ddmTemplate.getTemplateId(), ddmTemplate.getClassPK(), getMap(name), null, DDMTemplateConstants.TEMPLATE_TYPE_DISPLAY, - StringPool.BLANK, getDDMTemplateLanguage(name), script, + StringPool.BLANK, language, script, false, false, StringPool.BLANK, null, serviceContext); } } @@ -574,6 +575,8 @@ protected void addDDMTemplates( String ddmStructureKey, String fileName, InputStream inputStream) throws Exception { + String language = getDDMTemplateLanguage(fileName); + fileName = FileUtil.stripExtension(fileName); String name = getName(fileName); @@ -614,7 +617,7 @@ protected void addDDMTemplates( ddmStructure.getStructureId(), getKey(fileName), getMap(name), null, DDMTemplateConstants.TEMPLATE_TYPE_DISPLAY, null, - getDDMTemplateLanguage(fileName), replaceFileEntryURL(xsl), + language, replaceFileEntryURL(xsl), false, false, null, null, serviceContext); } else { @@ -622,7 +625,7 @@ protected void addDDMTemplates( ddmTemplate.getTemplateId(), PortalUtil.getClassNameId(DDMStructure.class), getMap(name), null, DDMTemplateConstants.TEMPLATE_TYPE_DISPLAY, null, - getDDMTemplateLanguage(fileName), replaceFileEntryURL(xsl), + language, replaceFileEntryURL(xsl), false, false, null, null, serviceContext); } }