not-locale 0.0.16 → 0.0.20

package/.nyc_output/2a1b074f-0174-4a72-b52a-b4d152a1738b.json

@@ -0,0 +1 @@
+{}

package/.nyc_output/898162e7-334a-49a5-a474-011ccd8f196e.json

@@ -0,0 +1 @@
+{}

package/.nyc_output/ac32ae4c-fb5f-435c-a4f0-acca848abb5d.json

@@ -0,0 +1 @@
+{"/home/cypher/proj/not-lib/not-locale/index.js":{"path":"/home/cypher/proj/not-lib/not-locale/index.js","statementMap":{"0":{"start":{"line":10,"column":4},"end":{"line":10,"column":34}},"1":{"start":{"line":12,"column":0},"end":{"line":20,"column":2}}},"fnMap":{},"branchMap":{},"s":{"0":1,"1":1},"f":{},"b":{},"_coverageSchema":"1a1c01bbd47fc00a2c39e90264f33305004495a9","hash":"a938b7754dc99ed6454876c19f1a63d93dd2a549","contentHash":"22c1682fdb71284685be8a57e0a08f5213a2e8e6592e9317f7b4fb9df56e466f"},"/home/cypher/proj/not-lib/not-locale/src/common/lib.js":{"path":"/home/cypher/proj/not-lib/not-locale/src/common/lib.js","statementMap":{"0":{"start":{"line":7,"column":7},"end":{"line":7,"column":47}},"1":{"start":{"line":8,"column":6},"end":{"line":8,"column":19}},"2":{"start":{"line":9,"column":11},"end":{"line":9,"column":30}},"3":{"start":{"line":10,"column":8},"end":{"line":10,"column":23}},"4":{"start":{"line":12,"column":12},"end":{"line":12,"column":14}},"5":{"start":{"line":13,"column":8},"end":{"line":16,"column":2}},"6":{"start":{"line":24,"column":2},"end":{"line":28,"column":3}},"7":{"start":{"line":25,"column":3},"end":{"line":25,"column":30}},"8":{"start":{"line":27,"column":3},"end":{"line":27,"column":40}},"9":{"start":{"line":29,"column":2},"end":{"line":33,"column":3}},"10":{"start":{"line":30,"column":3},"end":{"line":30,"column":31}},"11":{"start":{"line":32,"column":3},"end":{"line":32,"column":36}},"12":{"start":{"line":34,"column":2},"end":{"line":34,"column":9}},"13":{"start":{"line":43,"column":0},"end":{"line":53,"column":2}},"14":{"start":{"line":44,"column":1},"end":{"line":51,"column":2}},"15":{"start":{"line":45,"column":2},"end":{"line":47,"column":3}},"16":{"start":{"line":46,"column":3},"end":{"line":46,"column":34}},"17":{"start":{"line":48,"column":2},"end":{"line":50,"column":3}},"18":{"start":{"line":49,"column":3},"end":{"line":49,"column":32}},"19":{"start":{"line":52,"column":1},"end":{"line":52,"column":15}},"20":{"start":{"line":61,"column":0},"end":{"line":75,"column":2}},"21":{"start":{"line":62,"column":1},"end":{"line":69,"column":2}},"22":{"start":{"line":63,"column":12},"end":{"line":63,"column":14}},"23":{"start":{"line":64,"column":15},"end":{"line":64,"column":32}},"24":{"start":{"line":65,"column":2},"end":{"line":67,"column":5}},"25":{"start":{"line":66,"column":3},"end":{"line":66,"column":39}},"26":{"start":{"line":68,"column":2},"end":{"line":68,"column":13}},"27":{"start":{"line":70,"column":1},"end":{"line":74,"column":2}},"28":{"start":{"line":71,"column":2},"end":{"line":71,"column":53}},"29":{"start":{"line":73,"column":2},"end":{"line":73,"column":42}},"30":{"start":{"line":82,"column":0},"end":{"line":107,"column":2}},"31":{"start":{"line":83,"column":1},"end":{"line":106,"column":4}},"32":{"start":{"line":84,"column":2},"end":{"line":105,"column":5}},"33":{"start":{"line":85,"column":3},"end":{"line":104,"column":4}},"34":{"start":{"line":86,"column":4},"end":{"line":86,"column":16}},"35":{"start":{"line":88,"column":4},"end":{"line":102,"column":5}},"36":{"start":{"line":88,"column":16},"end":{"line":88,"column":17}},"37":{"start":{"line":89,"column":20},"end":{"line":89,"column":54}},"38":{"start":{"line":90,"column":14},"end":{"line":90,"column":36}},"39":{"start":{"line":91,"column":5},"end":{"line":101,"column":6}},"40":{"start":{"line":92,"column":6},"end":{"line":98,"column":7}},"41":{"start":{"line":93,"column":18},"end":{"line":93,"column":35}},"42":{"start":{"line":94,"column":23},"end":{"line":94,"column":42}},"43":{"start":{"line":95,"column":7},"end":{"line":95,"column":50}},"44":{"start":{"line":97,"column":7},"end":{"line":97,"column":20}},"45":{"start":{"line":100,"column":6},"end":{"line":100,"column":15}},"46":{"start":{"line":103,"column":4},"end":{"line":103,"column":14}},"47":{"start":{"line":116,"column":1},"end":{"line":127,"column":2}},"48":{"start":{"line":117,"column":13},"end":{"line":117,"column":34}},"49":{"start":{"line":118,"column":12},"end":{"line":118,"column":14}},"50":{"start":{"line":119,"column":2},"end":{"line":123,"column":3}},"51":{"start":{"line":120,"column":3},"end":{"line":120,"column":46}},"52":{"start":{"line":122,"column":3},"end":{"line":122,"column":17}},"53":{"start":{"line":124,"column":2},"end":{"line":124,"column":16}},"54":{"start":{"line":126,"column":2},"end":{"line":126,"column":15}},"55":{"start":{"line":130,"column":0},"end":{"line":130,"column":17}},"56":{"start":{"line":136,"column":0},"end":{"line":136,"column":43}},"57":{"start":{"line":136,"column":28},"end":{"line":136,"column":41}},"58":{"start":{"line":142,"column":0},"end":{"line":142,"column":56}},"59":{"start":{"line":142,"column":23},"end":{"line":142,"column":54}},"60":{"start":{"line":145,"column":0},"end":{"line":151,"column":2}},"61":{"start":{"line":146,"column":1},"end":{"line":150,"column":2}},"62":{"start":{"line":147,"column":2},"end":{"line":147,"column":23}},"63":{"start":{"line":149,"column":2},"end":{"line":149,"column":12}},"64":{"start":{"line":154,"column":0},"end":{"line":156,"column":2}},"65":{"start":{"line":155,"column":1},"end":{"line":155,"column":27}},"66":{"start":{"line":160,"column":1},"end":{"line":160,"column":51}},"67":{"start":{"line":160,"column":20},"end":{"line":160,"column":50}},"68":{"start":{"line":163,"column":0},"end":{"line":163,"column":36}},"69":{"start":{"line":165,"column":0},"end":{"line":173,"column":2}},"70":{"start":{"line":166,"column":1},"end":{"line":172,"column":2}},"71":{"start":{"line":167,"column":2},"end":{"line":171,"column":4}}},"fnMap":{"0":{"name":"detect","decl":{"start":{"line":22,"column":10},"end":{"line":22,"column":16}},"loc":{"start":{"line":22,"column":34},"end":{"line":35,"column":2}},"line":22},"1":{"name":"(anonymous_1)","decl":{"start":{"line":43,"column":24},"end":{"line":43,"column":25}},"loc":{"start":{"line":43,"column":35},"end":{"line":53,"column":1}},"line":43},"2":{"name":"(anonymous_2)","decl":{"start":{"line":61,"column":19},"end":{"line":61,"column":20}},"loc":{"start":{"line":61,"column":48},"end":{"line":75,"column":1}},"line":61},"3":{"name":"(anonymous_3)","decl":{"start":{"line":65,"column":15},"end":{"line":65,"column":16}},"loc":{"start":{"line":65,"column":24},"end":{"line":67,"column":3}},"line":65},"4":{"name":"(anonymous_4)","decl":{"start":{"line":82,"column":18},"end":{"line":82,"column":19}},"loc":{"start":{"line":82,"column":48},"end":{"line":107,"column":1}},"line":82},"5":{"name":"(anonymous_5)","decl":{"start":{"line":83,"column":20},"end":{"line":83,"column":21}},"loc":{"start":{"line":83,"column":39},"end":{"line":106,"column":2}},"line":83},"6":{"name":"(anonymous_6)","decl":{"start":{"line":84,"column":28},"end":{"line":84,"column":29}},"loc":{"start":{"line":84,"column":44},"end":{"line":105,"column":3}},"line":84},"7":{"name":"say","decl":{"start":{"line":115,"column":9},"end":{"line":115,"column":12}},"loc":{"start":{"line":115,"column":56},"end":{"line":128,"column":1}},"line":115},"8":{"name":"(anonymous_8)","decl":{"start":{"line":136,"column":21},"end":{"line":136,"column":22}},"loc":{"start":{"line":136,"column":27},"end":{"line":136,"column":42}},"line":136},"9":{"name":"(anonymous_9)","decl":{"start":{"line":142,"column":15},"end":{"line":142,"column":16}},"loc":{"start":{"line":142,"column":21},"end":{"line":142,"column":55}},"line":142},"10":{"name":"(anonymous_10)","decl":{"start":{"line":145,"column":14},"end":{"line":145,"column":15}},"loc":{"start":{"line":145,"column":24},"end":{"line":151,"column":1}},"line":145},"11":{"name":"(anonymous_11)","decl":{"start":{"line":154,"column":20},"end":{"line":154,"column":21}},"loc":{"start":{"line":154,"column":24},"end":{"line":156,"column":1}},"line":154},"12":{"name":"modulePhrase","decl":{"start":{"line":159,"column":9},"end":{"line":159,"column":21}},"loc":{"start":{"line":159,"column":38},"end":{"line":161,"column":1}},"line":159},"13":{"name":"(anonymous_13)","decl":{"start":{"line":160,"column":8},"end":{"line":160,"column":9}},"loc":{"start":{"line":160,"column":20},"end":{"line":160,"column":50}},"line":160},"14":{"name":"(anonymous_14)","decl":{"start":{"line":165,"column":23},"end":{"line":165,"column":24}},"loc":{"start":{"line":165,"column":44},"end":{"line":173,"column":1}},"line":165},"15":{"name":"(anonymous_15)","decl":{"start":{"line":166,"column":8},"end":{"line":166,"column":9}},"loc":{"start":{"line":166,"column":56},"end":{"line":172,"column":2}},"line":166}},"branchMap":{"0":{"loc":{"start":{"line":24,"column":2},"end":{"line":28,"column":3}},"type":"if","locations":[{"start":{"line":24,"column":2},"end":{"line":28,"column":3}},{"start":{"line":24,"column":2},"end":{"line":28,"column":3}}],"line":24},"1":{"loc":{"start":{"line":29,"column":2},"end":{"line":33,"column":3}},"type":"if","locations":[{"start":{"line":29,"column":2},"end":{"line":33,"column":3}},{"start":{"line":29,"column":2},"end":{"line":33,"column":3}}],"line":29},"2":{"loc":{"start":{"line":44,"column":1},"end":{"line":51,"column":2}},"type":"if","locations":[{"start":{"line":44,"column":1},"end":{"line":51,"column":2}},{"start":{"line":44,"column":1},"end":{"line":51,"column":2}}],"line":44},"3":{"loc":{"start":{"line":45,"column":2},"end":{"line":47,"column":3}},"type":"if","locations":[{"start":{"line":45,"column":2},"end":{"line":47,"column":3}},{"start":{"line":45,"column":2},"end":{"line":47,"column":3}}],"line":45},"4":{"loc":{"start":{"line":45,"column":6},"end":{"line":45,"column":51}},"type":"binary-expr","locations":[{"start":{"line":45,"column":6},"end":{"line":45,"column":21}},{"start":{"line":45,"column":25},"end":{"line":45,"column":51}}],"line":45},"5":{"loc":{"start":{"line":48,"column":2},"end":{"line":50,"column":3}},"type":"if","locations":[{"start":{"line":48,"column":2},"end":{"line":50,"column":3}},{"start":{"line":48,"column":2},"end":{"line":50,"column":3}}],"line":48},"6":{"loc":{"start":{"line":48,"column":6},"end":{"line":48,"column":60}},"type":"binary-expr","locations":[{"start":{"line":48,"column":6},"end":{"line":48,"column":20}},{"start":{"line":48,"column":24},"end":{"line":48,"column":60}}],"line":48},"7":{"loc":{"start":{"line":61,"column":34},"end":{"line":61,"column":45}},"type":"default-arg","locations":[{"start":{"line":61,"column":43},"end":{"line":61,"column":45}}],"line":61},"8":{"loc":{"start":{"line":62,"column":1},"end":{"line":69,"column":2}},"type":"if","locations":[{"start":{"line":62,"column":1},"end":{"line":69,"column":2}},{"start":{"line":62,"column":1},"end":{"line":69,"column":2}}],"line":62},"9":{"loc":{"start":{"line":70,"column":1},"end":{"line":74,"column":2}},"type":"if","locations":[{"start":{"line":70,"column":1},"end":{"line":74,"column":2}},{"start":{"line":70,"column":1},"end":{"line":74,"column":2}}],"line":70},"10":{"loc":{"start":{"line":82,"column":34},"end":{"line":82,"column":45}},"type":"default-arg","locations":[{"start":{"line":82,"column":43},"end":{"line":82,"column":45}}],"line":82},"11":{"loc":{"start":{"line":85,"column":3},"end":{"line":104,"column":4}},"type":"if","locations":[{"start":{"line":85,"column":3},"end":{"line":104,"column":4}},{"start":{"line":85,"column":3},"end":{"line":104,"column":4}}],"line":85},"12":{"loc":{"start":{"line":91,"column":5},"end":{"line":101,"column":6}},"type":"if","locations":[{"start":{"line":91,"column":5},"end":{"line":101,"column":6}},{"start":{"line":91,"column":5},"end":{"line":101,"column":6}}],"line":91},"13":{"loc":{"start":{"line":115,"column":21},"end":{"line":115,"column":32}},"type":"default-arg","locations":[{"start":{"line":115,"column":30},"end":{"line":115,"column":32}}],"line":115},"14":{"loc":{"start":{"line":115,"column":34},"end":{"line":115,"column":55}},"type":"default-arg","locations":[{"start":{"line":115,"column":43},"end":{"line":115,"column":55}}],"line":115},"15":{"loc":{"start":{"line":119,"column":2},"end":{"line":123,"column":3}},"type":"if","locations":[{"start":{"line":119,"column":2},"end":{"line":123,"column":3}},{"start":{"line":119,"column":2},"end":{"line":123,"column":3}}],"line":119},"16":{"loc":{"start":{"line":146,"column":1},"end":{"line":150,"column":2}},"type":"if","locations":[{"start":{"line":146,"column":1},"end":{"line":150,"column":2}},{"start":{"line":146,"column":1},"end":{"line":150,"column":2}}],"line":146},"17":{"loc":{"start":{"line":159,"column":22},"end":{"line":159,"column":37}},"type":"default-arg","locations":[{"start":{"line":159,"column":35},"end":{"line":159,"column":37}}],"line":159},"18":{"loc":{"start":{"line":165,"column":24},"end":{"line":165,"column":39}},"type":"default-arg","locations":[{"start":{"line":165,"column":37},"end":{"line":165,"column":39}}],"line":165},"19":{"loc":{"start":{"line":166,"column":17},"end":{"line":166,"column":28}},"type":"default-arg","locations":[{"start":{"line":166,"column":26},"end":{"line":166,"column":28}}],"line":166},"20":{"loc":{"start":{"line":166,"column":30},"end":{"line":166,"column":51}},"type":"default-arg","locations":[{"start":{"line":166,"column":39},"end":{"line":166,"column":51}}],"line":166}},"s":{"0":1,"1":1,"2":1,"3":1,"4":1,"5":1,"6":3,"7":1,"8":2,"9":3,"10":2,"11":1,"12":3,"13":1,"14":5,"15":3,"16":1,"17":3,"18":1,"19":5,"20":1,"21":4,"22":0,"23":0,"24":0,"25":0,"26":0,"27":4,"28":1,"29":3,"30":1,"31":3,"32":3,"33":3,"34":1,"35":2,"36":2,"37":4,"38":4,"39":4,"40":3,"41":3,"42":2,"43":2,"44":1,"45":1,"46":2,"47":8,"48":8,"49":7,"50":7,"51":6,"52":1,"53":1,"54":2,"55":1,"56":1,"57":4,"58":1,"59":3,"60":1,"61":0,"62":0,"63":0,"64":1,"65":0,"66":1,"67":1,"68":1,"69":1,"70":1,"71":1},"f":{"0":3,"1":5,"2":4,"3":0,"4":3,"5":3,"6":3,"7":8,"8":4,"9":3,"10":0,"11":0,"12":1,"13":1,"14":1,"15":1},"b":{"0":[1,2],"1":[2,1],"2":[3,2],"3":[1,2],"4":[3,1],"5":[1,2],"6":[3,1],"7":[2],"8":[0,4],"9":[1,3],"10":[3],"11":[1,2],"12":[3,1],"13":[4],"14":[3],"15":[6,1],"16":[0,0],"17":[0],"18":[0],"19":[1],"20":[1]},"_coverageSchema":"1a1c01bbd47fc00a2c39e90264f33305004495a9","hash":"6d7e3f0e9a52618562ded9da1771c08e8087b293","contentHash":"509355475609984f70c664919bcf7b545f5b94e1b6484630019ae597319720a2"}}

package/.nyc_output/processinfo/2a1b074f-0174-4a72-b52a-b4d152a1738b.json

@@ -0,0 +1 @@
+{"parent":"898162e7-334a-49a5-a474-011ccd8f196e","pid":901929,"argv":["/usr/local/bin/node","/home/cypher/proj/not-lib/not-locale/node_modules/.bin/mocha","--reporter","spec"],"execArgv":[],"cwd":"/home/cypher/proj/not-lib/not-locale","time":1634507330748,"ppid":901928,"coverageFilename":"/home/cypher/proj/not-lib/not-locale/.nyc_output/2a1b074f-0174-4a72-b52a-b4d152a1738b.json","externalId":"","uuid":"2a1b074f-0174-4a72-b52a-b4d152a1738b","files":[]}

package/.nyc_output/processinfo/898162e7-334a-49a5-a474-011ccd8f196e.json

@@ -0,0 +1 @@
+{"parent":null,"pid":901915,"argv":["/usr/local/bin/node","/usr/local/bin/npm","run","test"],"execArgv":[],"cwd":"/home/cypher/proj/not-lib/not-locale","time":1634507330515,"ppid":901904,"coverageFilename":"/home/cypher/proj/not-lib/not-locale/.nyc_output/898162e7-334a-49a5-a474-011ccd8f196e.json","externalId":"","uuid":"898162e7-334a-49a5-a474-011ccd8f196e","files":[]}

package/.nyc_output/processinfo/ac32ae4c-fb5f-435c-a4f0-acca848abb5d.json

@@ -0,0 +1 @@
+{"parent":"2a1b074f-0174-4a72-b52a-b4d152a1738b","pid":901936,"argv":["/usr/local/bin/node","/home/cypher/proj/not-lib/not-locale/node_modules/mocha/bin/_mocha","--reporter","spec"],"execArgv":[],"cwd":"/home/cypher/proj/not-lib/not-locale","time":1634507330834,"ppid":901929,"coverageFilename":"/home/cypher/proj/not-lib/not-locale/.nyc_output/ac32ae4c-fb5f-435c-a4f0-acca848abb5d.json","externalId":"","uuid":"ac32ae4c-fb5f-435c-a4f0-acca848abb5d","files":["/home/cypher/proj/not-lib/not-locale/index.js","/home/cypher/proj/not-lib/not-locale/src/common/lib.js"]}

package/.nyc_output/processinfo/index.json

@@ -0,0 +1 @@
+{"processes":{"2a1b074f-0174-4a72-b52a-b4d152a1738b":{"parent":"898162e7-334a-49a5-a474-011ccd8f196e","children":["ac32ae4c-fb5f-435c-a4f0-acca848abb5d"]},"898162e7-334a-49a5-a474-011ccd8f196e":{"parent":null,"children":["2a1b074f-0174-4a72-b52a-b4d152a1738b"]},"ac32ae4c-fb5f-435c-a4f0-acca848abb5d":{"parent":"2a1b074f-0174-4a72-b52a-b4d152a1738b","children":[]}},"files":{"/home/cypher/proj/not-lib/not-locale/index.js":["ac32ae4c-fb5f-435c-a4f0-acca848abb5d"],"/home/cypher/proj/not-lib/not-locale/src/common/lib.js":["ac32ae4c-fb5f-435c-a4f0-acca848abb5d"]},"externalIds":{}}

package/index.js

@@ -3,6 +3,8 @@ const {
 	fromJSON,
 	fromDir,
 	say,
+	sayForModule,
+	modulePhrase,
 	vocabulary,
 	OPTS
 } = require('./src/common/lib.js');
@@ -14,5 +16,5 @@ module.exports = {
     logics:  __dirname + '/src/logics',
 		routes:  __dirname + '/src/routes',
 	},
-	getMiddleware, fromJSON, fromDir, say, vocabulary, OPTS
+	getMiddleware, fromJSON, fromDir, say, sayForModule, modulePhrase, vocabulary, OPTS
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "not-locale",
-	"version": "0.0.16",
+	"version": "0.0.20",
 	"description": "not-* family module for localization in not- environment",
 	"main": "index.js",
 	"scripts": {
@@ -24,14 +24,15 @@
 	},
 	"homepage": "https://github.com/interrupter/not-locale#readme",
 	"dependencies": {
-		"load-json-file": "^6.2.0"
+		"not-log": "^0.0.20",
+		"not-path": "^1.0.1"
 	},
 	"devDependencies": {
 		"chai": "*",
 		"chai-as-promised": "*",
-		"eslint": "^7.27.0",
+		"eslint": "^8.3.0",
 		"ink-docstrap": "^1.3.2",
-		"jsdoc": "^3.6.6",
+		"jsdoc": "^3.6.7",
 		"mocha": "*",
 		"nyc": "*"
 	}

package/src/common/lib.js

@@ -3,7 +3,7 @@
  * @module not-locale/lib
  */
 
-const loadJsonFile = require('load-json-file'),
+const //loadJsonFile = require('load-json-file'),
 	Log = require('not-log')(module, 'not-locale'),
 	fs = require('fs'),
 	notPath = require('not-path'),
@@ -15,37 +15,37 @@ var store = {},
 		getter: null
 	};
 
-	/**
-	* Express middleware, to determine in which locale should we process response
-	*/
+/**
+ * Express middleware, to determine in which locale should we process response
+ */
 
-	function detect( req, res, next ){
-		let reqLang;
-		if (OPTS.getter){
-			reqLang = OPTS.getter(req);
-		}else{
-			reqLang = req.get('Accept-Language');
-		}
-		if (Object.prototype.hasOwnProperty.call(store, reqLang)){
-			res.locals.locale = reqLang;
-		}else{
-			res.locals.locale = OPTS.default;
-		}
-		next();
+function detect(req, res, next) {
+	let reqLang;
+	if (OPTS.getter) {
+		reqLang = OPTS.getter(req);
+	} else {
+		reqLang = req.get('Accept-Language');
+	}
+	if (Object.prototype.hasOwnProperty.call(store, reqLang)) {
+		res.locals.locale = reqLang;
+	} else {
+		res.locals.locale = OPTS.default;
 	}
+	next();
+}
 
-	/**
-	* Express middleware initializer, to determine in which locale should we process response
-	* @param {object} options - object with `deafult` {string}, `getter` {function} redefined
-	* @return {function} function wich will accept three params (req, res, next) and run as express middleware
-	*/
+/**
+ * Express middleware initializer, to determine in which locale should we process response
+ * @param {object} options - object with `deafult` {string}, `getter` {function} redefined
+ * @return {function} function wich will accept three params (req, res, next) and run as express middleware
+ */
 
-exports.getMiddleware = (options)=>{
-	if (options){
-		if (options.default && options.default.length > 1){
+exports.getMiddleware = (options) => {
+	if (options) {
+		if (options.default && options.default.length > 1) {
 			OPTS.default = options.default;
 		}
-		if (options.getter && typeof options.getter === 'function'){
+		if (options.getter && typeof options.getter === 'function') {
 			OPTS.getter = options.getter;
 		}
 	}
@@ -54,12 +54,12 @@ exports.getMiddleware = (options)=>{
 
 
 /**
-  * Add locale by json object
-  * @param {string} locale - name of locale
-  * @param {json} json - json object
-  */
-exports.fromJSON = (locale, json, prefix = '')=>{
-	if(prefix){
+ * Add locale by json object
+ * @param {string} locale - name of locale
+ * @param {json} json - json object
+ */
+exports.fromJSON = (locale, json, prefix = '') => {
+	if (prefix) {
 		let tmp = {};
 		const keys = Object.keys(json);
 		keys.forEach((key) => {
@@ -67,36 +67,36 @@ exports.fromJSON = (locale, json, prefix = '')=>{
 		});
 		json = tmp;
 	}
-	if (typeof store[locale] !== 'undefined'){
+	if (typeof store[locale] !== 'undefined') {
 		store[locale] = Object.assign(store[locale], json);
-	}else{
+	} else {
 		store[locale] = Object.assign({}, json);
 	}
 };
 
 /**
-  * Load locales from directory, with json files, names as [locale_name].json
-  * @param {number} pathToLocales - absolute path to directory
-  * @return {Promise}
-  */
-exports.fromDir = (pathToLocales, prefix = '')=>{
-	return new Promise((resolve, reject)=>{
+ * Load locales from directory, with json files, names as [locale_name].json
+ * @param {number} pathToLocales - absolute path to directory
+ * @return {Promise}
+ */
+exports.fromDir = (pathToLocales, prefix = '') => {
+	return new Promise((resolve, reject) => {
 		fs.readdir(pathToLocales, (err, items) => {
-			if (err){
+			if (err) {
 				reject(err);
-			}else{
-				for(let i = 0; i < items.length; i++) {
+			} else {
+				for (let i = 0; i < items.length; i++) {
 					let filename = path.join(pathToLocales, items[i]),
 						stats = fs.lstatSync(filename);
-					if (stats.isFile()){
-						try{
-							let file = loadJsonFile.sync(filename),
+					if (stats.isFile()) {
+						try {
+							let file = require(filename),
 								[localeName] = items[i].split('.');
 							exports.fromJSON(localeName, file, prefix);
-						}catch(e){
+						} catch (e) {
 							Log.error(e);
 						}
-					}else{
+					} else {
 						continue;
 					}
 				}
@@ -107,48 +107,74 @@ exports.fromDir = (pathToLocales, prefix = '')=>{
 };
 
 /**
-  * Returns localized variant of code phrase
-  * @param {string} phrase - code phrase
-  * @param {array|object} params - array or hash with params for template parser
-  * @return {string} localized variant
-  */
-exports.say = (phrase, params = {}, locale = OPTS.default) => {
-	try{
+ * Returns localized variant of code phrase
+ * @param {string} phrase - code phrase
+ * @param {array|object} params - array or hash with params for template parser
+ * @return {string} localized variant
+ */
+function say(phrase, params = {}, locale = OPTS.default) {
+	try {
 		let tmpl = store[locale][phrase],
 			result = '';
-		if (params){
+		if (typeof tmpl === 'undefined') {
+			return phrase;
+		}
+		if (params) {
 			return notPath.parseSubs(tmpl, params, {});
-		}else{
+		} else {
 			result = tmpl;
 		}
 		return result;
-	}catch(e){
+	} catch (e) {
 		Log.error(e);
 	}
-};
+}
+
+exports.say = say;
 
 /**
-  * Getter for stores of all locales
-  * @return {objects} all locales
-  */
-exports.vocabulary = () => {return store;};
+ * Getter for stores of all locales
+ * @return {objects} all locales
+ */
+exports.vocabulary = () => {
+	return store;
+};
 
 /**
-  * Getter for OPTS variable
-  * @return {object} copy of OPTS object
-  */
-exports.OPTS = () => { return Object.assign({}, OPTS);};
+ * Getter for OPTS variable
+ * @return {object} copy of OPTS object
+ */
+exports.OPTS = () => {
+	return Object.assign({}, OPTS);
+};
 
 
-exports.get = (locale)=>{
-	if(Object.prototype.hasOwnProperty.call(store, locale)){
+exports.get = (locale) => {
+	if (Object.prototype.hasOwnProperty.call(store, locale)) {
 		return store[locale];
-	}else{
+	} else {
 		return {};
 	}
 };
 
 
-exports.available = ()=>{
+exports.available = () => {
 	return Object.keys(store);
 };
+
+
+function modulePhrase(moduleName = '') {
+	return (phrase) => [moduleName, phrase].join(':');
+}
+
+exports.modulePhrase = modulePhrase;
+
+exports.sayForModule = (moduleName = '') => {
+	return (phrase, params = {}, locale = OPTS.default) => {
+		return say(
+			[moduleName, phrase].join(':'),
+			params,
+			locale
+		);
+	};
+};

package/src/controllers/common/nsLocale.js

@@ -1,62 +1,81 @@
 /**
-* detects current locale, loads dictionary from server
-*
-**/
+ * detects current locale, loads dictionary from server
+ *
+ **/
 
 const SECTION_ID = 'locale';
 
-import {notCommon, notLocale, TopMenu} from 'not-bulma';
+import {
+  notCommon,
+  notLocale,
+  TopMenu
+} from 'not-bulma';
 
-class nsLocale{
-  constructor(app){
+class nsLocale {
+  constructor(app) {
     this.app = app;
     this.locales = [];
-    this.app.on('wsClient:main:ready', this.update.bind(this));
-    notLocale.on('change', ()=>{
+    this.failures = 0;
+    this.app.on('wsClient:main:connected', this.update.bind(this));
+    notLocale.on('change', () => {
       this.app.emit('locale');
     });
   }
 
   /**
-  * Creates network interface for this service
-  */
-  interface(data){
+   * Creates network interface for this service
+   */
+  interface(data) {
     return this.app.getInterface('locale')(data);
   }
 
   /**
-  * Retrieves dictionary for current locale
-  * sets dictionary in notLocale object
-  */
-  async update(){
-    try{
+   * Retrieves dictionary for current locale
+   * sets dictionary in notLocale object
+   */
+  async update() {
+    try {
       await this.updateAvailable();
-      let res = await this.interface({locale: this.getCurrentLocale()}).$get({});
-      if(res.status === 'ok' && res.result){
+      let res = await this.interface({
+        locale: this.getCurrentLocale()
+      }).$get({});
+      if (res.status === 'ok' && res.result) {
         notLocale.set(res.result);
+      } else {
+        this.scheduleUpdate();
       }
-    }catch(e){
+    } catch (e) {
       notCommon.error(e);
+      this.scheduleUpdate();
     }
   }
 
-  async updateAvailable(){
-    try{
+  scheduleUpdate() {
+    this.failures++;
+    if (this.failures < 100) {
+      setTimeout(this.update.bind(this), 1000 * this.failures);
+    } else {
+      notCommon.error('Too many failures of locale loading');
+    }
+  }
+
+  async updateAvailable() {
+    try {
       let res = await this.interface({}).$available({});
-      if(res.status === 'ok' && res.result){
+      if (res.status === 'ok' && res.result) {
         this.setAvailable(res.result);
       }
-    }catch(e){
+    } catch (e) {
       notCommon.error(e);
     }
   }
 
-  updateUI(list){
+  updateUI(list) {
     let menuItems = this.createMenuItems(list);
     TopMenu.updateSectionItems(SECTION_ID, () => {
       return menuItems;
     });
-    setTimeout(()=>{
+    setTimeout(() => {
       this.app.emit(`tag-${SECTION_ID}:update`, {
         title: this.getCurrentLocale()
       });
@@ -78,18 +97,18 @@ class nsLocale{
     };
   }
 
-  changeLocale(locale){
+  changeLocale(locale) {
     this.saveLocaleToStore(locale);
     this.update();
   }
 
   /**
-  * @returns {string}   code of current locale
-  **/
-  getCurrentLocale(){
+   * @returns {string}   code of current locale
+   **/
+  getCurrentLocale() {
     let stored = this.restoreLocaleFromStore();
-    if (stored){
-      if(this.locales.includes(stored)){
+    if (stored) {
+      if (this.locales.includes(stored)) {
         return stored;
       }
     }
@@ -97,22 +116,22 @@ class nsLocale{
   }
 
   /**
-  * @returns {Promise<Array>}   of locales objects {code, title}
-  **/
-  getAvailable(){
+   * @returns {Promise<Array>}   of locales objects {code, title}
+   **/
+  getAvailable() {
     return this.interface().$available({});
   }
 
 
-  setAvailable(list){
+  setAvailable(list) {
     this.locales = list;
     this.updateUI(list);
   }
 
-  restoreLocaleFromStore(){
+  restoreLocaleFromStore() {
     if (window.localStorage) {
-    	try {
-    	  return window.localStorage.getItem('locale');
+      try {
+        return window.localStorage.getItem('locale');
       } catch (e) {
         this.app.error(e);
         return false;
@@ -121,10 +140,10 @@ class nsLocale{
     return false;
   }
 
-  saveLocaleToStore(locale){
+  saveLocaleToStore(locale) {
     if (window.localStorage) {
-    	try {
-    	  return window.localStorage.setItem('locale', locale);
+      try {
+        return window.localStorage.setItem('locale', locale);
       } catch (e) {
         this.app.error(e);
         return false;
@@ -133,12 +152,12 @@ class nsLocale{
     return false;
   }
 
-  selectBest(){
-    if(navigator.languages){
+  selectBest() {
+    if (navigator.languages) {
       let locale = navigator.languages.find((itm) => {
         return this.locales.includes(itm);
       });
-      if(locale){
+      if (locale) {
         return locale;
       }
     }

package/src/routes/locale.js

@@ -6,10 +6,7 @@ async function get(req, res){
   try{
     let locale = req.params.locale;
     let result = await notNode.Application.getLogic('Locale').get({locale});
-    res.status(200).json({
-      status: 'ok',
-      result
-    });
+    res.status(200).json(result);
   }catch(err){
     Log.error(err);
     notNode.Application.report(
@@ -31,10 +28,7 @@ async function get(req, res){
 async function available(req, res){
   try{
     let result = await notNode.Application.getLogic('Locale').available();
-    res.status(200).json({
-      status: 'ok',
-      result
-    });
+    res.status(200).json(result);
   }catch(err){
     Log.error(err);
     notNode.Application.report(

package/src/routes/locale.manifest.js

@@ -1,4 +1,4 @@
-const Log = require('not-log')(module, 'locale:route');
+const {error} = require('not-log')(module, 'locale:route');
 
 try {
 	module.exports = {
@@ -33,5 +33,5 @@ try {
 		}
 	};
 } catch (e) {
-	Log.error(e);
+	error(e);
 }

package/src/routes/locale.ws.js

@@ -11,10 +11,10 @@ async function available(){
 }
 
 module.exports = {
-	servers:{
-		main:{
-			request: {
-				get,
+	servers:{					//collection type
+		main:{					//collection name
+			request: { 		//routes(end-points) type
+				get,				//end-points
 				available
 			}
 		}

package/test/index.js

@@ -48,7 +48,7 @@ describe("fromDir", function() {
 
 	});
 
-	it("try to load falty json files", function() {
+	it("try to load faulty json files", function() {
 		locale.fromDir(path.join(__dirname, 'faulty.locales'))
 			.then(()=>{
 				expect().fail();
@@ -71,7 +71,7 @@ describe("say", function() {
 	});
 
 	it("phrase not exists `like`", function() {
-		expect(locale.say('like')).to.be.undefined;
+		expect(locale.say('like_me')).to.be.equal('like_me');
 	});
 
 	it("locale not exists, should throw", function() {
@@ -91,6 +91,24 @@ describe("say", function() {
 	});
 });
 
+
+describe("say for module", function() {
+	it("say login in default(en) locale for not-user module", function() {
+		let say = locale.sayForModule('not-user');
+		expect(typeof say).to.be.equal('function');
+		expect(say('login')).to.be.equal('login for module version');
+	});
+});
+
+describe("modulePhrase", function() {
+	it("prefixes phrase with module name", function() {
+		let say = locale.modulePhrase('not-user');
+		expect(typeof say).to.be.equal('function');
+		expect(say('login')).to.be.equal('not-user:login');
+	});
+});
+
+
 describe("middleware", function() {
 	it("pass in express request mockup with Accept-Language: ga ", function() {
 		locale.vocabulary()['ga'] = {
@@ -102,18 +120,18 @@ describe("middleware", function() {
 				return 'ga';
 			}
 		},resMock = {locals:{}};
-		locale.middleware()(reqMock, resMock, ()=>{
+		locale.getMiddleware()(reqMock, resMock, ()=>{
 			expect(resMock.locals.locale).to.be.equal('ga');
 		});
 	});
 
 	it("init middleware with option default: ru", function() {
-		locale.middleware({default: 'ru'});
+		locale.getMiddleware({default: 'ru'});
 		expect(locale.OPTS().default).to.be.equal('ru');
 	});
 
 	it("init middleware with empty options", function() {
-		locale.middleware({});
+		locale.getMiddleware({});
 		expect(locale.OPTS().default).to.be.equal('ru');
 	});
 
@@ -123,13 +141,13 @@ describe("middleware", function() {
 				return 'it';
 			}
 		},resMock = {locals:{}};
-		locale.middleware()(reqMock, resMock, ()=>{
+		locale.getMiddleware()(reqMock, resMock, ()=>{
 			expect(resMock.locals.locale).to.be.equal(locale.OPTS().default);
 		});
 	});
 
 	it("init middleware with custom getter", function() {
-		let middleware = locale.middleware({
+		let middleware = locale.getMiddleware({
 			getter:(req)=>{
 				return req.user.lang;
 			}}),resMock = {locals:{}};

package/test/locales/en.json

@@ -1,4 +1,5 @@
 {
     "login": "login",
-    "password": "password"
+    "password": "password",
+    "not-user:login": "login for module version"
 }