Merge 62ba8d9 into 1f97945

README.md

@@ -23,11 +23,12 @@ The FRAU appconfig builder can be run either directly on the console CLI (assumi
 Typical configuration for running in [TRAVIS](https://magnum.travis-ci.com/):
 
 ```javascript
-frau-appconfig-builder --dist|-d ./dist 
+frau-appconfig-builder --dist|-d ./dist
                        --appfile|-f app.js
                        --loader|-l umd
                        --envvar|-e TRAVIS
-                       --showloading|-s
+					   --showloading|-s
+					   --oslo|-o oslo/langterms/
                        + local appresolver options
                        + publisher options
 ```
@@ -90,7 +91,7 @@ builder.buildStream(target)
 - `envVar` (optional) - The environment variable for checking to determine the build environment (local vs. remote), necessary to resolve app end-point
 - `loader` (optional) - The app loader type to be specified in the `appconfig.json`, controls how the FRA will be loaded (ex. umd, iframe, html)
 - `showLoading` (optional umd) - Whether to show the loading indicator when using the umd loader. The defaults to false.
-
+- `oslo` (optional) - The oslo translation xml language terms path (ex. oslo/langterms/)
 ## Contributing
 
 Contributions are welcome, please submit a pull request!

bin/appconfigbuildercli

@@ -11,6 +11,7 @@ argv = argv.usage('Usage: frau-appconfig-builder [--appfile|-f] [--dist|-d] [--l
 	.alias('l', 'loader')
 	.alias('e', 'envvar')
 	.alias('s', 'showloading')
+	.alias('o', 'oslo')
 	.argv;
 
 var opts = {
@@ -21,6 +22,8 @@ var opts = {
 	showLoading: ( (argv.showloading || process.env.npm_package_config_frauAppConfigBuilder_showLoading === 'true') ? true : false)
 };
 
+var oslo = (argv.oslo || process.env.npm_package_config_frauAppConfigBuilder_oslo);
+
 if (!opts.appFile) {
 	console.log(chalk.red('Target appFile not specified.'));
 	process.exit(1);
@@ -41,6 +44,10 @@ if (opts.envVar && process.env[opts.envVar]) {
 	target = publisher.app(publisherOpts)
 		.getLocation() + opts.appFile;
 
+	if (oslo) {
+		opts.oslo = publisher.app(publisherOpts)
+			.getLocation() + oslo;
+	}
 } else {
 
 	var localAppResolver = require('frau-local-appresolver');

lib/appConfigBuilder.js

@@ -32,6 +32,10 @@ function build(opts, loader) {
 		loader: loader
 	};
 
+	if (opts.oslo) {
+		appConfig.oslo = opts.oslo;
+	}
+
 	return appConfig;
 }