added: direct translation

petersirka · petersirka · commit 51b603c6d13f · 2015-03-28T10:15:52.000+01:00
diff --git a/bin/total b/bin/total
@@ -617,6 +617,13 @@ function main() {
                 var content = fs.readFileSync(filename).toString('utf8');
                 var command = Internal.findLocalization(content, 0);
                 while (command !== null) {
+
+                    // Skip for direct reading
+                    if (command.command[0] === '#' && command.command[1] !== ' ') {
+                        command = Internal.findLocalization(content, command.end);
+                        continue;
+                    }
+
                     var key = 'T' + command.command.hash();
                     var file = filename.substring(root.length);
                     texts[key] = command.command;
diff --git a/changes.txt b/changes.txt
@@ -40,6 +40,7 @@ source-code: "tabs" instead of "spaces"
 - updated: framework.mail() --> returns MailMessage
 - updated: controller.mail() --> returns MailMessage
 - updated: SchemaBuilderEntity.$async(callback, [return-only-this-index])
+- updated: translation @(#KEY) (direct reading) or @(TEXT TO TRANSLATE) (hash reading)
 
 - fixed: F.usage() --> fixed queue pendings
 - fixed: (CRITICAL) SchemaBuilderEntity preparing (problem with prototypes)
diff --git a/index.js b/index.js
@@ -169,7 +169,7 @@ function Framework() {
 
 	this.id = null;
 	this.version = 1730;
-	this.version_header = '1.7.3 (build: 30)';
+	this.version_header = '1.7.3 (build: 31)';
 
 	var version = process.version.toString().replace('v', '').replace(/\./g, '');
 
@@ -5787,7 +5787,7 @@ Framework.prototype.resource = function(name, key) {
 };
 
 /**
- * Translate text
+ * Translates text
  * @param {String} language A resource filename, optional.
  * @param {String} text
  * @return {String}
@@ -5799,6 +5799,9 @@ Framework.prototype.translate = function(language, text) {
 		language = undefined;
 	}
 
+	if (text[0] === '#' && text[1] !== ' ')
+		return this.resource(language, text.substring(1));
+
 	var value = this.resource(language, 'T' + text.hash());
 	if (!value)
 		return text;
diff --git a/minify/merged/total.js b/minify/merged/total.js
diff --git a/minify/total.js/bin/total b/minify/total.js/bin/total
diff --git a/minify/total.js/index.js b/minify/total.js/index.js
diff --git a/minify/total.js/package.json b/minify/total.js/package.json
@@ -67,5 +67,5 @@
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1"
     },
-    "version": "1.7.3-30"
+    "version": "1.7.3-31"
 }
diff --git a/package.json b/package.json
@@ -67,5 +67,5 @@
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1"
     },
-    "version": "1.7.3-30"
+    "version": "1.7.3-31"
 }
diff --git a/test/test-framework-debug.js b/test/test-framework-debug.js
@@ -168,11 +168,11 @@ function test_routing(next) {
 		utils.request(url + 'translate/?language=', 'GET', null, function(error, data, code, headers) {
 			if (error)
 				throw error;
-			assert(data === '---translate---', 'translate problem (EN)');
+			assert(data === '---translate---######', 'translate problem (EN)');
 			utils.request(url + 'translate/?language=sk', 'GET', null, function(error, data, code, headers) {
 				if (error)
 					throw error;
-				assert(data === '---preklad---', 'translate problem (SK)');
+				assert(data === '---preklad---###preklad###', 'translate problem (SK)');
 				complete();
 			});
 		});
diff --git a/test/test-framework-release.js b/test/test-framework-release.js
@@ -168,11 +168,11 @@ function test_routing(next) {
 		utils.request(url + 'translate/?language=', 'GET', null, function(error, data, code, headers) {
 			if (error)
 				throw error;
-			assert(data === '---translate---', 'translate problem (EN)');
+			assert(data === '---translate---######', 'translate problem (EN)');
 			utils.request(url + 'translate/?language=sk', 'GET', null, function(error, data, code, headers) {
 				if (error)
 					throw error;
-				assert(data === '---preklad---', 'translate problem (SK)');
+				assert(data === '---preklad---###preklad###', 'translate problem (SK)');
 				complete();
 			});
 		});
diff --git a/test/views/translate.html b/test/views/translate.html
@@ -1,2 +1,3 @@
 @{layout('')}
----@(translate)---
+---@(translate)---
+###@(#T1052832078)###

Original file line number	Diff line number	Diff line change
`@@ -67,5 +67,5 @@`
`67`	`67`	`"scripts": {`
`68`	`68`	`"test": "echo \"Error: no test specified\" && exit 1"`
`69`	`69`	`},`
`70`		`- "version": "1.7.3-30"`
	`70`	`+ "version": "1.7.3-31"`
`71`	`71`	`}`