fix 2 root i18 support

vagnerleitte · Aug 31, 2012 · 121f840 · 121f840
1 parent 02d5f16
commit 121f840
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/js/commands/info.js b/js/commands/info.js
@@ -105,7 +105,7 @@ elFinder.prototype.commands.info = function() {
 
 			content.push(row.replace(l, msg.size).replace(v, size));
 			file.alias && content.push(row.replace(l, msg.aliasfor).replace(v, file.alias));
-			content.push(row.replace(l, msg.path).replace(v, fm.escape(fm.path(file.hash))));
+			content.push(row.replace(l, msg.path).replace(v, fm.escape(fm.path(file.hash, true))));
 			file.read && content.push(row.replace(l, msg.link).replace(v,  '<a href="'+fm.url(file.hash)+'" target="_blank">'+file.name+'</a>'));
 
 			if (file.dim) { // old api

diff --git a/js/elFinder.js b/js/elFinder.js
@@ -684,12 +684,12 @@ window.elFinder = function(node, opts) {
 		return parents;
 	}
 
-	this.path2array = function(hash) {
+	this.path2array = function(hash, i18) {
 		var file, 
 			path = [];
 
 		while (hash && (file = files[hash]) && file.hash) {
-			path.unshift(file.i18 || file.name);
+			path.unshift(i18 && file.i18 ? file.i18 : file.name);
 			hash = file.phash;
 		}
 
@@ -702,10 +702,10 @@ window.elFinder = function(node, opts) {
 	 * @param  Object  file
 	 * @return String
 	 */
-	this.path = function(hash) {
+	this.path = function(hash, i18) { 
 		return files[hash] && files[hash].path
 			? files[hash].path
-			: this.path2array(hash).join(cwdOptions.separator);
+			: this.path2array(hash, i18).join(cwdOptions.separator);
 	}
 
 	/**

diff --git a/js/i18n/elfinder.ru.js b/js/i18n/elfinder.ru.js
@@ -345,7 +345,7 @@ if (elFinder && elFinder.prototype && typeof(elFinder.prototype.i18) == 'object'
 			'kindVideoFlash'  : 'Видео Flash',
 			'kindVideoMKV'    : 'Видео Matroska',
 			'kindVideoOGG'    : 'Видео Ogg'
-
+			,'volume_files' : 'Файлы '
 		}
 	}
 }