Skip to content

Commit

Permalink
[FIX] generateLibraryManifest: i18n/css handling
Browse files Browse the repository at this point in the history
  • Loading branch information
matz3 committed Jul 17, 2018
1 parent 4826821 commit 4e52a96
Show file tree
Hide file tree
Showing 3 changed files with 489 additions and 4 deletions.
6 changes: 3 additions & 3 deletions lib/processors/manifestCreator.js
Original file line number Diff line number Diff line change
Expand Up @@ -399,9 +399,9 @@ async function createManifest(libraryResource, libBundle, descriptorVersion, _in
let i18nElement = findChild(libraryAppData, "i18n");
if ( i18nElement ) {
let i18n = i18nElement._;
if ( "false".equals(i18n) ) {
if ( i18n === "false" ) {
return false;
} else if ( "true".equals(i18n) ) {
} else if ( i18n === "true" ) {
return "messagebundle.properties";
} else {
return i18n;
Expand All @@ -424,7 +424,7 @@ async function createManifest(libraryResource, libBundle, descriptorVersion, _in
let cssElement = findChild(libraryAppData, "css");
if ( cssElement != null ) {
let css = cssElement._;
if ( "false".equals(css) ) {
if ( css === "false" ) {
log.verbose(" sap.ui5/library/css property taken from .library appData: '%s'", false);
return false;
}
Expand Down
3 changes: 2 additions & 1 deletion lib/tasks/generateLibraryManifest.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ module.exports = function({workspace, dependencies, options}) {
// *.json files are needed to avoid overwriting them
// *.js files are needed to identify nested components
// *.less, *.css, *.theming and *.theme files are needed to identify supported themes
return combo.byGlob("/**/*.{js,json,library,less,css,theming,theme}").then((resources) => {
// *.properties to identify existence of i18n bundles (e.g. messagebundle.properties)
return combo.byGlob("/**/*.{js,json,library,less,css,theming,theme,properties}").then((resources) => {
// Find all libraries and create a manifest.json file
return workspace.byGlob("/resources/**/.library").then((libraryIndicatorResources) => {
if (libraryIndicatorResources.length < 1) {
Expand Down
Loading

0 comments on commit 4e52a96

Please sign in to comment.