Merge pull request #65 from gadcam/master

Add full support of translation by 'locale' directory

drivers/bookmarklet/js/driver.js

@@ -45,7 +45,7 @@
 						'<div class="app' + ( i == 0 ? ' first' : '' ) + '">' +
 							'<a target="_blank" class="application" href="' + w.config.websiteURL + 'applications/' + app.toLowerCase().replace(/ /g, '-').replace(/[^a-z0-9-]/g, '') + '">' +
 								'<strong>' +
-									'<img src="images/icons/' + app + '.ico" width="16" height="16"/> ' + app +
+									'<img src="images/icons/' + app + '.png" width="16" height="16"/> ' + app +
 								'</strong>' +
 							'</a>'
 							;

drivers/firefox/content/js/driver.js

@@ -108,7 +108,7 @@
 			if ( w.detected[url] != null && w.detected[url].length ) {
 				if ( !prefs.getBoolPref('showIcons') ) {
 					var image = w$('<image/>')
-						.attr('src', 'chrome://wappalyzer/skin/images/icon16x16_hot.ico')
+						.attr('src', 'chrome://wappalyzer/skin/images/icon16x16_hot.png')
 						;
 
 					w$('#wappalyzer-container').prepend(image);
@@ -128,7 +128,7 @@
 					if ( display ) {
 						if ( prefs.getBoolPref('showIcons') ) {
 							var image = w$('<image/>')
-								.attr('src', 'chrome://wappalyzer/skin/images/icons/' + app + '.ico')
+								.attr('src', 'chrome://wappalyzer/skin/images/icons/' + app + '.png')
 								;
 
 							w$('#wappalyzer-container').prepend(image);
@@ -140,7 +140,7 @@
 
 						var menuItem = w$('<menuitem/>')
 							.attr('class', 'wappalyzer-application menuitem-iconic')
-							.attr('image', 'chrome://wappalyzer/skin/images/icons/' + app + '.ico')
+							.attr('image', 'chrome://wappalyzer/skin/images/icons/' + app + '.png')
 							.attr('label', app)
 							;
 
@@ -153,7 +153,7 @@
 						for ( cat in w.apps[app].cats ) {
 							var menuItem = w$('<menuitem/>')
 								.attr('class', 'wappalyzer-category')
-								.attr('label', w.categories[w.apps[app].cats[cat]].name)
+								.attr('label', strings.getString('wappalyzer.cat' + w.apps[app].cats[cat]))
 								;
 
 							menuItem.bind('command', function() {
@@ -166,7 +166,7 @@
 				});
 			} else {
 				var image = w$('<image/>')
-					.attr('src', 'chrome://wappalyzer/skin/images/icon16x16.ico')
+					.attr('src', 'chrome://wappalyzer/skin/images/icon16x16.png')
 					;
 
 				w$('#wappalyzer-container').prepend(image);
@@ -287,11 +287,6 @@
 				container();
 			});
 
-		w$(prefix + 'categories')
-			.bind('command', function() {
-				w.driver.goToURL({ url: 'chrome://wappalyzer/content/xul/categories.xul' })
-			});
-
 		w$(prefix + 'donate')
 			.bind('command', function() {
 				w.driver.goToURL({ url: w.config.websiteURL + 'donate' })

drivers/firefox/locale/en-US/wappalyzer.properties

@@ -1,2 +1,32 @@
 wappalyzer.name           	= Wappalyzer
 wappalyzer.noAppsDetected 	= No applications detected
+
+wappalyzer.cat1				= CMS
+wappalyzer.cat2				= Message Board 
+wappalyzer.cat3				= Database Manager
+wappalyzer.cat4				= Documentation Tool
+wappalyzer.cat5				= Widget
+wappalyzer.cat6				= Web Shop
+wappalyzer.cat7				= Photo Gallery
+wappalyzer.cat8				= Wiki
+wappalyzer.cat9				= Hosting Panel
+wappalyzer.cat10			= Analytics
+wappalyzer.cat11			= Blog
+wappalyzer.cat12			= JavaScript Framework
+wappalyzer.cat13			= Issue Tracker
+wappalyzer.cat14			= Video Player
+wappalyzer.cat15			= Comment System
+wappalyzer.cat16			= CAPTCHA
+wappalyzer.cat17			= Font Script
+wappalyzer.cat18			= Web Framework
+wappalyzer.cat19			= Miscellaneous
+wappalyzer.cat20			= Editor
+wappalyzer.cat21			= LMS
+wappalyzer.cat22			= Web Server
+wappalyzer.cat23			= Cache Tool
+wappalyzer.cat24			= Rich Text Editor
+wappalyzer.cat25			= Javascript Graphics
+wappalyzer.cat26			= Mobile Framework
+wappalyzer.cat27			= Programming Language
+wappalyzer.cat28			= Operating System
+wappalyzer.cat29			= Search Engine

drivers/firefox/locale/fr-FR/wappalyzer.properties

@@ -1,2 +1,32 @@
 wappalyzer.name           = Wappalyzer
 wappalyzer.noAppsDetected = Pas d'applications détectées
+
+wappalyzer.cat1				= CMS
+wappalyzer.cat2				= Forum
+wappalyzer.cat3				= Gestionnaire de base de données
+wappalyzer.cat4				= Outil de documentation
+wappalyzer.cat5				= Widget
+wappalyzer.cat6				= Boutique en ligne
+wappalyzer.cat7				= Galerie photo
+wappalyzer.cat8				= Wiki
+wappalyzer.cat9				= Gestionnaires de serveur
+wappalyzer.cat10			= Outil de statistiques
+wappalyzer.cat11			= Blog
+wappalyzer.cat12			= Framework JavaScript
+wappalyzer.cat13			= Outils de suivi de problèmes
+wappalyzer.cat14			= Lecteur de vidéos
+wappalyzer.cat15			= Système de commentaires
+wappalyzer.cat16			= CAPTCHA
+wappalyzer.cat17			= Script de police
+wappalyzer.cat18			= Framework web
+wappalyzer.cat19			= Divers
+wappalyzer.cat20			= Editeur
+wappalyzer.cat21			= LMS
+wappalyzer.cat22			= Serveur web
+wappalyzer.cat23			= Outil de cache
+wappalyzer.cat24			= Editeur WYSIWYG
+wappalyzer.cat25			= Graphismes JavaScript
+wappalyzer.cat26			= Framework pour mobiles
+wappalyzer.cat27			= Language de programmation
+wappalyzer.cat28			= Système d'exploitation
+wappalyzer.cat29			= Moteur de recherche

drivers/html/js/driver.js

@@ -31,7 +31,7 @@
 			document.getElementById('apps').innerHTML = '';
 
 			args.apps.map(function(app) {
-				document.getElementById('apps').innerHTML += '<img src="images/icons/' + app + '.ico" width="16" height="16"/> ' + app + '<br/>';
+				document.getElementById('apps').innerHTML += '<img src="images/icons/' + app + '.png" width="16" height="16"/> ' + app + '<br/>';
 			});
 		},