v1.4.7

HISTORY.rst

@@ -3,6 +3,12 @@ History
 -------
 
 
+1.4.7 (2013-10-26)
+++++++++++++++++++
+
+- simplify some language lexer names into more common versions
+
+
 1.4.6 (2013-10-25)
 ++++++++++++++++++
 

README.md

@@ -1,7 +1,7 @@
 sublime-wakatime
 ================
 
-Automatic time tracking for Sublime Text 2 & 3.
+Fully automatic time tracking for Sublime Text 2 & 3.
 
 Installation
 ------------
@@ -29,5 +29,5 @@ Heads Up! For Sublime Text 2 on Windows & Linux, WakaTime depends on [Python](ht
 Screen Shots
 ------------
 
-![Project Overview](https://www.wakati.me/static/img/ScreenShots/Screenshot%20from%202013-08-12%2002:55:03%20\(1\).png)
+![Project Overview](https://www.wakati.me/static/img/ScreenShots/Screen Shot 2013-10-26 at 5.04.01 PM.png)
 

WakaTime.py

@@ -5,7 +5,7 @@ Maintainer:  WakaTi.me <support@wakatime.com>
 Website:     https://www.wakati.me/
 ==========================================================="""
 
-__version__ = '1.4.6'
+__version__ = '1.4.7'
 
 import sublime
 import sublime_plugin

packages/wakatime/wakatime/stats.py

@@ -27,6 +27,15 @@ log = logging.getLogger(__name__)
 EXTENSIONS = {
     'md': 'Markdown',
 }
+TRANSLATIONS = {
+    'CSS+Genshi Text': 'CSS',
+    'CSS+Lasso': 'CSS',
+    'HTML+Django/Jinja': 'HTML',
+    'HTML+Lasso': 'HTML',
+    'JavaScript+Genshi Text': 'JavaScript',
+    'JavaScript+Lasso': 'JavaScript',
+    'Perl6': 'Perl',
+}
 
 
 def guess_language(file_name):
@@ -41,7 +50,7 @@ def guess_language(file_name):
     except:
         pass
     if lexer:
-        return str(lexer.name)
+        return translate_language(str(lexer.name))
     else:
         return None
 
@@ -55,6 +64,12 @@ def guess_language_from_extension(extension):
     return None
 
 
+def translate_language(language):
+    if language in TRANSLATIONS:
+        language = TRANSLATIONS[language]
+    return language
+
+
 def number_lines_in_file(file_name):
     lines = 0
     try: