i18n fixes, jakefile polish, update about

zzplab · Jul 9, 2011 · 4a6f536 · 4a6f536
1 parent 7699736
commit 4a6f536
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 31 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ _*
 .DS_Store
 php-old
 extensions
+build
diff --git a/Jakefile.js b/Jakefile.js
@@ -52,10 +52,11 @@ var dirmode = 0755,
 			],
 		'misc':
 			[
+				path.join(src, 'js', 'proxy', 'elFinderSupportVer1.js'),
 				path.join(src, 'Changelog'),
 				path.join(src, 'README.md')
 			]
-};
+	};
 
 // custom functions
 function grep(prefix, mask, exculde) {
@@ -175,7 +176,7 @@ file({'js/elfinder.min.js': ['js/elfinder.full.js']}, function () {
 });
 
 // IMG + I18N + PHP
-desc('misc')
+desc('copy misc files')
 task('misc', function(){
 	console.log('copy misc files');
 	var cf = files['images']
@@ -206,7 +207,7 @@ task('clean', function(){
 			.concat(grep(path.join('js', 'i18n')))
 			.concat(path.join('css', 'theme.css'))
 			.concat(grep('php'))
-			.concat(['Changelog', 'README.md']);
+			.concat([path.join('js', 'proxy', 'elFinderSupportVer1.js'), 'Changelog', 'README.md']);
 	}
 	for (f in uf) {
 		var file = uf[f];
@@ -227,13 +228,3 @@ task('clean', function(){
 	}
 });
 
-desc('help')
-task('help', function(){
-	console.log(
-		'Usage: jake [command]',
-		'\n\nCommands:',
-		'\n	build		 Build elFinder',
-		'\n	clean		 Clean build files'
-	);
-});
-
diff --git a/elfinder.src.html b/elfinder.src.html
@@ -84,10 +84,10 @@
 
 	<script src="extensions/jplayer/elfinder.quicklook.jplayer.js" type="text/javascript" charset="utf-8"></script>
 
+	<script src="js/i18n/elfinder.ar.js" type="text/javascript" charset="utf-8"></script>
 	<script src="js/i18n/elfinder.en.js" type="text/javascript" charset="utf-8"></script>
 	<script src="js/i18n/elfinder.ru.js" type="text/javascript" charset="utf-8"></script>
-	<script src="js/i18n/elfinder.ar.js" type="text/javascript" charset="utf-8"></script>
-
+
 	<script src="js/proxy/elFinderSupportVer1.js" type="text/javascript" charset="utf-8"></script>
 	<script src="js/jquery.dialogelfinder.js" type="text/javascript" charset="utf-8"></script>
 

diff --git a/js/commands/help.js b/js/commands/help.js
@@ -53,19 +53,19 @@ elFinder.prototype.commands.help = function() {
 
 			html.push(sep);
 
-			html.push(linktpl[r](url, 'http://elrte.org/elfider/')[r](link, fm.i18n('homepage')));
-			html.push(linktpl[r](url, 'http://elrte.org/elfider/')[r](link, fm.i18n('docs')));
+			html.push(linktpl[r](url, 'http://elfinder.org/')[r](link, fm.i18n('homepage')));
+			html.push(linktpl[r](url, 'https://github.com/Studio-42/elFinder/wiki')[r](link, fm.i18n('docs')));
 			html.push(linktpl[r](url, 'https://github.com/Studio-42/elFinder')[r](link, fm.i18n('github')));
-			html.push(linktpl[r](url, 'http://twitter.com/#!/elrte_elfinder')[r](link, fm.i18n('twitter')));
-			html.push(linktpl[r](url, 'http://facebook.com/')[r](link, fm.i18n('facebook')));
+			html.push(linktpl[r](url, 'http://twitter.com/elrte_elfinder')[r](link, fm.i18n('twitter')));
+			//html.push(linktpl[r](url, 'http://facebook.com/')[r](link, fm.i18n('facebook')));
 
 			html.push(sep);
 
 			html.push('<div class="'+prim+'">'+fm.i18n('team')+'</div>');
 
 			html.push(atpl[r](author, 'Dmitry "dio" Levashov &lt;[email protected]&gt;')[r](work, fm.i18n('chiefdev')));
-			html.push(atpl[r](author, 'Troex Nevelin &lt;[email protected]&gt;')[r](work, fm.i18n('mantainer')+', '+fm.i18n('dev')));
-			html.push(atpl[r](author, 'Alexey Sukhotin &lt;[email protected]&gt;')[r](work, fm.i18n('dev')));
+			html.push(atpl[r](author, 'Troex Nevelin &lt;[email protected]&gt;')[r](work, fm.i18n('maintainer')));
+			html.push(atpl[r](author, 'Alexey Sukhotin &lt;[email protected]&gt;')[r](work, fm.i18n('contributor')));
 
 			fm.i18[fm.lang].translator && html.push(atpl[r](author, fm.i18[fm.lang].translator)[r](work, fm.i18n('translator')+' ('+fm.i18[fm.lang].language+')'));
 
@@ -136,4 +136,4 @@ elFinder.prototype.commands.help = function() {
 		this.fm.dialog(content, {title : this.title, width : 530});
 	}
 
-}
+}
diff --git a/js/elFinder.version.js b/js/elFinder.version.js
@@ -3,5 +3,5 @@
  *
  * @type String
  **/
-elFinder.prototype.version = '2.0 beta';
+elFinder.prototype.version = '2.0 beta1';
 
diff --git a/js/i18n/elfinder.LANG.js b/js/i18n/elfinder.LANG.js
@@ -185,8 +185,9 @@ if (elFinder && elFinder.prototype && typeof(elFinder.prototype.i18) == 'object'
 			'facebook'        : 'Join us on facebook',
 			'team'            : 'Team',
 			'chiefdev'        : 'chief developer',
-			'dev'             : 'developer',
-			'mantainer'       : 'mantainer',
+			'developer'       : 'developer',
+			'contributor'     : 'contributor',
+			'maintainer'      : 'maintainer',
 			'translator'      : 'translator',
 			'icons'           : 'Icons',
 			'dontforget'      : 'and don\'t forget to take your towel',

diff --git a/js/i18n/elfinder.ar.js b/js/i18n/elfinder.ar.js
@@ -181,8 +181,9 @@ if (elFinder && elFinder.prototype && typeof(elFinder.prototype.i18) == 'object'
 			'facebook'        : 'انضم إلينا على الفيس بوك',
 			'team'            : 'الفريق',
 			'chiefdev'        : 'رئيس المبرمجين',
-			'dev'             : 'مبرمح',
-			'mantainer'       : 'مشارك',
+			'developer'       : 'مبرمح',
+			'contributor'     : 'مبرمح',
+			'maintainer'      : 'مشارك',
 			'translator'      : 'مترجم',
 			'icons'           : 'أيقونات',
 			'dontforget'      : 'and don\'t forget to take your towel',

diff --git a/js/i18n/elfinder.en.js b/js/i18n/elfinder.en.js
@@ -181,8 +181,9 @@ if (elFinder && elFinder.prototype && typeof(elFinder.prototype.i18) == 'object'
 			'facebook'        : 'Join us on facebook',
 			'team'            : 'Team',
 			'chiefdev'        : 'chief developer',
-			'dev'             : 'developer',
-			'mantainer'       : 'mantainer',
+			'developer'       : 'developer',
+			'contributor'     : 'contributor',
+			'maintainer'      : 'maintainer',
 			'translator'      : 'translator',
 			'icons'           : 'Icons',
 			'dontforget'      : 'and don\'t forget to take your towel',

diff --git a/js/i18n/elfinder.ru.js b/js/i18n/elfinder.ru.js
@@ -180,8 +180,9 @@ if (elFinder && elFinder.prototype && typeof(elFinder.prototype.i18) == 'object'
 			'facebook'        : 'Join us on facebook',
 			'team'            : 'Авторы',
 			'chiefdev'        : 'ведущий разработчик',
-			'dev'             : 'разработчик',
-			'mantainer'       : 'сопровождение проекта',
+			'developer'       : 'разработчик',
+			'contributor'     : 'участник',
+			'maintainer'      : 'сопровождение проекта',
 			'translator'      : 'переводчик',
 			'icons'           : 'Иконки',
 			'dontforget'      : 'и не забудьте взять своё полотенце',
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,3 +4,4 @@ _* @@
     .DS_Store
     php-old
     extensions
+    build