tr8n 3.1.5 → 3.1.6

data/.gitignore

@@ -13,4 +13,8 @@ log/*
 .dotest*
 Thumbs.db
 .tmp*
-local/
+tmp/
+local/tr8n_server/db/*.sqlite3
+local/tr8n_server/log/*.log
+local/tr8n_server/tmp/
+local/tr8n_server/.sass-cache/

data/.rvmrc

@@ -1 +1 @@
-rvm 1.9.2 --create
+rvm 1.9.2@tr8n --create

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tr8n (3.1.5)
+    tr8n (3.1.6)
       coffee-script
       kaminari
       rails (>= 3.1.0)
@@ -56,7 +56,7 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.1.2)
+    coffee-script-source (1.1.3)
     database_cleaner (0.6.7)
     diff-lcs (1.1.3)
     erubis (2.7.0)
@@ -80,7 +80,7 @@ GEM
     mime-types (1.16)
     multi_json (1.0.3)
     nokogiri (1.5.0)
-    polyglot (0.3.2)
+    polyglot (0.3.3)
     pry (0.9.6.2)
       coderay (~> 0.9.8)
       method_source (~> 0.6.5)
@@ -129,7 +129,7 @@ GEM
     ruby_parser (2.0.6)
       sexp_processor (~> 3.0)
     rubyzip (0.9.4)
-    sass (3.1.8)
+    sass (3.1.10)
     selenium-webdriver (2.7.0)
       childprocess (>= 0.2.1)
       ffi (>= 1.0.7)
@@ -150,7 +150,7 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.30)
+    tzinfo (0.3.31)
     will_filter (3.1.3)
       coffee-script
       kaminari

data/README.rdoc

@@ -8,6 +8,8 @@ The language specific context and case rules can be registered and managed for a
 provides a set of powerful administration tools that allow admins to manage any aspect of the engine; enabling and disabling its features 
 and monitoring translation progress.
 
+http://img507.imageshack.us/img507/2876/tr8nlogo.png
+
 The Tr8n engine itself is based on a very robust and flexible pluggable architecture where rule types and the syntax of the "tr" tokens 
 can be configured or extended for any application deployment.
 
@@ -21,21 +23,34 @@ You can visit their web sites and see how it is being used. If your company is u
 
 = Documentation
 
-Tr8n Translation Engine Integration Guide
+Configuration Guide
+
+https://github.com/berk/tr8n/wiki/4.-Configuration-Instructions
+
+Integration Guide
+
+https://github.com/berk/tr8n/wiki/5.-Integration-Instructions
+
+Label Internationalization
+
+https://github.com/berk/tr8n/wiki/6.-Tr8n-Syntax
 
-http://wiki.tr8n.org/index.php?title=Tr8n_Translation_Engine_Integration_Guide
+Rules Engine 
 
-Tr8n Label Internationalization
+https://github.com/berk/tr8n/wiki/7.-Tr8n-Rules-Engine
 
-http://wiki.tr8n.org/index.php?title=Tr8n_Label_Internationalization
+Language Context Rules
 
-Tr8n Rules Engine Configuration Guide
+https://github.com/berk/tr8n/wiki/7.1-Language-Context-Rules
 
-http://wiki.tr8n.org/index.php?title=Tr8n_Rules_Engine_Configuration_Guide
+Language Case Rules
 
-Tr8n Supported Languages
+https://github.com/berk/tr8n/wiki/7.2-Language-Case-Rules
+
+Supported Languages
+
+https://github.com/berk/tr8n/wiki/9.-Supported-Languages
 
-http://wiki.tr8n.org/index.php?title=Tr8n_Languages
 
 = Installation Instructions
 
@@ -92,35 +107,35 @@ Below are a few screenshots of what Tr8n looks like:
 
 == Tr8n Language Selector (in a lightbox)
 
-http://wiki.tr8n.org/images/e/e8/Tr8n1.png
+http://img853.imageshack.us/img853/6784/tr8n1.png
 
 == Tr8n Translation Interface
 
-http://wiki.tr8n.org/images/4/4d/Tr8n2.png
+http://img140.imageshack.us/img140/1272/tr8n2.png
 
 == Tr8n Translation Votes Interface
 
-http://wiki.tr8n.org/images/c/ce/Tr8n3.png
+http://img854.imageshack.us/img854/1341/tr8n3.png
 
 == Tr8n Language Selector (as a dropdown)
 
-http://wiki.tr8n.org/images/6/64/Tr8n4.png
+http://img233.imageshack.us/img233/3973/tr8n4.png
 
 == Tr8n Translation Interface (with a keyboard)
 
-http://wiki.tr8n.org/images/4/47/Tr8n6.png
+http://img717.imageshack.us/img717/9392/tr8n6.png
 
 == Tr8n Translation Tools
 
-http://wiki.tr8n.org/images/0/02/Tr8n8.png
+http://img824.imageshack.us/img824/2263/tr8n8.png
 
 == Tr8n Translator Dashboard
 
-http://wiki.tr8n.org/images/7/7c/Tr8n5.png
+http://img337.imageshack.us/img337/3180/tr8n5.png
 
 == Tr8n Translation Admin Tools
 
-http://wiki.tr8n.org/images/4/44/Tr8n7.png
+http://img225.imageshack.us/img225/3599/tr8n7.png
 
 
 = External Links
@@ -138,12 +153,16 @@ Geni Goes Global With 20 New Languages And A Crowdsourced Translation Tool
 
 http://tcrn.ch/f1VLnj 
 
-
 Quora Discussion - What is the best way to deal with internationlization of text on a large social site?
 
 http://bit.ly/hUU6R9 
 
 
+LinkedIn Discussion 
+
+http://www.linkedin.com/groups/Internationalizing-your-application-using-Tr8n-4090552?gid=4090552
+
+
 RailsCasts - If you would like to see a RailsCasts episode on how to get Tr8n configured and running, please visit the RailsCasts suggestion page and vote it up. Thank you!
   
 http://bit.ly/gz7lFw 

data/app/assets/javascripts/tr8n/tr8n.js

@@ -94,6 +94,7 @@ Tr8n.Translator = function(options) {
   var self = this;
   this.options = options;
   this.translation_key_id = null;
+  this.suggestion_tokens = null;
 
   this.container                = document.createElement('div');
   this.container.className      = 'tr8n_translator';
@@ -291,20 +292,35 @@ Tr8n.Translator.prototype = {
     });
   },
 
-  suggestTranslation: function(translation_key_id, original, tokens, from_lang, to_lang) {
-    google.language.translate(original, from_lang, to_lang, function(result) {
-      if (!result.error) {
-        var suggestion = result.translation;
-        tokens = tokens.split(",");
-        for (var i=0; i<tokens.length; i++) {
-          suggestion = Tr8n.Utils.replaceAll(suggestion, "(" + i + ")", tokens[i]);
-        }
-        Tr8n.element("tr8n_translation_suggestion_" + translation_key_id).innerHTML = suggestion;
-        Tr8n.element("tr8n_google_suggestion_container_" + translation_key_id).style.display = "block";
-        var suggestion_section = Tr8n.element('tr8n_google_suggestion_section');
-        if (suggestion_section) suggestion_section.style.display = "block";
+  processSuggestedTranslation: function(response) {
+    if (response == null ||response.data == null || response.data.translations==null || response.data.translations.length == 0) 
+      return;
+    var suggestion = response.data.translations[0].translatedText;
+    if (this.suggestion_tokens) {
+      var tokens = this.suggestion_tokens.split(",");
+      this.suggestion_tokens = null;
+      for (var i=0; i<tokens.length; i++) {
+        suggestion = Tr8n.Utils.replaceAll(suggestion, "(" + i + ")", tokens[i]);
       }
-    });
+    }  
+    Tr8n.element("tr8n_translation_suggestion_" + this.translation_key_id).innerHTML = suggestion;
+    Tr8n.element("tr8n_google_suggestion_container_" + this.translation_key_id).style.display = "block";
+    var suggestion_section = Tr8n.element('tr8n_google_suggestion_section');
+    if (suggestion_section) suggestion_section.style.display = "block";
+  },
+  
+  suggestTranslation: function(translation_key_id, original, tokens, from_lang, to_lang) {
+    if (Tr8n.google_api_key == null) return;
+    
+    this.suggestion_tokens = tokens;
+    this.translation_key_id = translation_key_id;
+    var new_script = document.createElement('script');
+    new_script.type = 'text/javascript';
+    var source_text = escape(original);
+    var api_source = 'https://www.googleapis.com/language/translate/v2?key=' + Tr8n.google_api_key;
+    var source = api_source + '&source=' + from_lang + '&target=' + to_lang + '&callback=tr8nTranslator.processSuggestedTranslation&q=' + source_text;
+    new_script.src = source;
+    document.getElementsByTagName('head')[0].appendChild(new_script);
   }
 
 }
@@ -851,9 +867,9 @@ Tr8n.Utils = {
       tr8nLightbox.show('/tr8n/help/lb_shortcuts', {width:400, height:480});
   },
 
-  displayCredits: function() {
+  displayStatistics: function() {
     if (tr8nLightbox)
-      tr8nLightbox.show('/tr8n/help/lb_credits', {width:420, height:250});
+      tr8nLightbox.show('/tr8n/help/lb_stats', {width:420, height:400});
   }
 
 }
@@ -886,7 +902,3 @@ function initializeTr8n() {
 
   Tr8n.Utils.addEvent(window, 'load', setup);
 }
-
-function initializeTr8nGoogleSuggestions() {
-   google.load("language", "1");
-}

data/app/controllers/tr8n/help_controller.rb

@@ -23,7 +23,9 @@
 
 class Tr8n::HelpController < Tr8n::BaseController
 
-  before_filter :validate_current_translator
+  before_filter :validate_current_translator, :except => [:lb_shortcuts, :lb_stats, :credits, :license]
+  before_filter :validate_guest_user, :except => [:lb_shortcuts, :lb_stats, :credits, :license]
+  before_filter :validate_current_user, :except => [:lb_shortcuts, :lb_stats, :credits, :license]
   
   def index
 
@@ -33,8 +35,16 @@ class Tr8n::HelpController < Tr8n::BaseController
     render :layout => false
   end
 
-  def lb_credits
+  def lb_stats
     render :layout => false
   end
+  
+  def credits
+    
+  end
 
+  def license
+    
+  end
+  
 end

data/app/models/tr8n/language.rb

@@ -24,8 +24,8 @@
 class Tr8n::Language < ActiveRecord::Base
   set_table_name :tr8n_languages
   
-  after_save      :clear_cache
-  after_destroy   :clear_cache
+  after_save      :update_cache
+  after_destroy   :update_cache
 
   belongs_to :fallback_language,    :class_name => 'Tr8n::Language', :foreign_key => :fallback_language_id
   
@@ -303,7 +303,11 @@ class Tr8n::Language < ActiveRecord::Base
     true
   end
 
-  def clear_cache
+  def translations_changed!
+    # TODO: handle change event - count translations, update total metrics
+  end
+  
+  def update_cache
     Tr8n::Cache.delete("language_#{locale}")
     Tr8n::Cache.delete("featured_languages")
     Tr8n::Cache.delete("enabled_languages")

data/app/models/tr8n/translation.rb

@@ -23,8 +23,8 @@
 
 class Tr8n::Translation < ActiveRecord::Base
   set_table_name :tr8n_translations
-  after_save      :clear_cache
-  after_destroy   :clear_cache
+  after_save      :update_cache
+  after_destroy   :update_cache
 
   belongs_to :language,         :class_name => "Tr8n::Language"
   belongs_to :translation_key,  :class_name => "Tr8n::TranslationKey"
@@ -86,11 +86,14 @@ class Tr8n::Translation < ActiveRecord::Base
 
   # populate language rules from the internal rules hash
   def rules
-    return nil if super.nil? or super.empty?
-    
+    super_rules = super
+    return nil if super_rules == nil
+    return nil unless super_rules.class.name == 'Array'
+    return nil if super_rules.size == 0
+        
     @loaded_rules ||= begin
       rulz = []
-      super.each do |rule|
+      super_rules.each do |rule|
         [rule[:rule_id]].flatten.each do |rule_id|
           language_rule = Tr8n::LanguageRule.by_id(rule_id)
           rulz << rule.merge({:rule => language_rule}) if language_rule
@@ -248,9 +251,9 @@ class Tr8n::Translation < ActiveRecord::Base
     destroy
   end
   
-  def clear_cache
-    Tr8n::Cache.delete("translations_#{language.locale}_#{translation_key.key}")
-    translation_key.update_translation_count!
+  def update_cache
+    language.translations_changed!
+    translation_key.translations_changed!(language)
   end
   
   ###############################################################

data/app/models/tr8n/translation_domain.rb

@@ -34,7 +34,7 @@ class Tr8n::TranslationDomain < ActiveRecord::Base
   alias :key_sources  :translation_key_sources
   alias :keys         :translation_keys
   
-  def self.find_or_create(url)
+  def self.find_or_create(url = nil)
     domain_name = URI.parse(url || 'localhost').host || 'localhost'
     Tr8n::Cache.fetch("translation_domain_#{domain_name}") do 
       find_by_name(domain_name) || create(:name => domain_name)

data/app/models/tr8n/translation_key.rb

@@ -109,12 +109,12 @@ class Tr8n::TranslationKey < ActiveRecord::Base
   # primarely used for the site map and only needs to be enabled 
   # for a short period of time on a single machine
   def self.track_source(tkey, options)
-    return unless Tr8n::Config.enable_key_source_tracking? 
-    return if options[:source].blank?
+    # return unless Tr8n::Config.enable_key_source_tracking? 
+    # return if options[:source].blank?
+
+    key_source = Tr8n::Cache.cache_key_source(tkey, options[:source] || Tr8n::Config.block_options[:source])
     
-    key_source = Tr8n::TranslationKeySource.find_or_create(tkey, Tr8n::TranslationSource.find_or_create(options[:source], options[:url]))
     return unless Tr8n::Config.enable_key_caller_tracking?
-    
     options[:caller] ||= caller
     options[:caller_key] = options[:caller].is_a?(Array) ? options[:caller].join(", ") : options[:caller].to_s
     options[:caller_key] = generate_key(options[:caller_key])
@@ -236,10 +236,18 @@ class Tr8n::TranslationKey < ActiveRecord::Base
   def inline_translations_for(language)
     translations_for(language, -50)
   end
+
+  def translations_cache_key(language)
+    "translations_#{language.locale}_#{key}"
+  end
+  
+  def clear_translations_cache_for_language(language = Tr8n::Config.current_language)
+    Tr8n::Cache.delete(translations_cache_key(language)) 
+  end
   
   # returns only the translations that meet the minimum rank
-  def valid_translations_for(language)
-    Tr8n::Cache.fetch("translations_#{language.locale}_#{key}") do
+  def valid_translations_for_language(language = Tr8n::Config.current_language)
+    Tr8n::Cache.fetch(translations_cache_key(language)) do
       translations_for(language, Tr8n::Config.translation_threshold)
     end
   end
@@ -333,7 +341,7 @@ class Tr8n::TranslationKey < ActiveRecord::Base
 
   def find_first_valid_translation(language, token_values)
     # find the first translation in the order of the rank that matches the rules
-    valid_translations_for(language).each do |translation|
+    valid_translations_for_language(language).each do |translation|
       return translation if translation.matches_rules?(token_values)
     end
     
@@ -372,7 +380,7 @@ class Tr8n::TranslationKey < ActiveRecord::Base
   end
   
   def translate(language = Tr8n::Config.current_language, token_values = {}, options = {})
-    return find_all_valid_translations(valid_translations_for(language)) if options[:api]
+    return find_all_valid_translations(valid_translations_for_language(language)) if options[:api]
     
     if Tr8n::Config.disabled? or language.default?
       return substitute_tokens(label, token_values, options.merge(:fallback => false), language).html_safe
@@ -436,7 +444,7 @@ class Tr8n::TranslationKey < ActiveRecord::Base
 
     classes = ['tr8n_translatable']
 
-    if valid_translations_for(language).any?
+    if valid_translations_for_language(language).any?
       classes << 'tr8n_translated'
     else
       classes << 'tr8n_not_translated'
@@ -486,6 +494,18 @@ class Tr8n::TranslationKey < ActiveRecord::Base
     update_attributes(:verified_at => time)
   end
       
+  def translations_changed!(language = Tr8n::Config.current_language)
+    clear_translations_cache_for_language(language)
+    
+    # update timestamp and clear cache
+    update_translation_count! 
+    
+    # notify all language sources that translation has changed
+    sources.each do |source|
+      Tr8n::TranslationSourceLanguage.touch(source, language)
+    end
+  end
+        
   def update_translation_count!
     update_attributes(:translation_count => Tr8n::Translation.count(:conditions => ["translation_key_id = ?", self.id]))
   end
@@ -504,10 +524,6 @@ class Tr8n::TranslationKey < ActiveRecord::Base
     Tr8n::Cache.delete("translation_key_#{key}")
   end
 
-  def add_translation(label, rules = nil, lang = Tr8n::Config.current_language, translator = Tr8n::Config.current_translator) 
-    Tr8n::Translation.create(:translation_key => self, :label => label, :language => lang, :translator => translator)
-  end
-
   def to_api_hash
     { 
       :key => self.key, 

data/app/models/tr8n/translation_key_source.rb

@@ -23,7 +23,6 @@
 
 class Tr8n::TranslationKeySource < ActiveRecord::Base
   set_table_name :tr8n_translation_key_sources
-  after_save      :clear_cache
   after_destroy   :clear_cache
 
   belongs_to :translation_source, :class_name => "Tr8n::TranslationSource"

data/app/models/tr8n/translation_source.rb

@@ -23,19 +23,19 @@
 
 class Tr8n::TranslationSource < ActiveRecord::Base
   set_table_name :tr8n_translation_sources
-  after_save      :clear_cache
   after_destroy   :clear_cache
   
-  belongs_to  :translation_domain,       :class_name => "Tr8n::TranslationDomain"
+  belongs_to  :translation_domain,            :class_name => "Tr8n::TranslationDomain"
   
-  has_many    :translation_key_sources,  :class_name => "Tr8n::TranslationKeySource",  :dependent => :destroy
-  has_many    :translation_keys,         :class_name => "Tr8n::TranslationKey",        :through => :translation_key_sources
+  has_many    :translation_key_sources,       :class_name => "Tr8n::TranslationKeySource",  :dependent => :destroy
+  has_many    :translation_keys,              :class_name => "Tr8n::TranslationKey",        :through => :translation_key_sources
+  has_many    :translation_source_languages,  :class_name => "Tr8n::TranslationSourceLanguage"
   
   alias :domain   :translation_domain
   alias :sources  :translation_key_sources
   alias :keys     :translation_keys
   
-  def self.find_or_create(source, url)
+  def self.find_or_create(source, url = nil)
     translation_domain = Tr8n::TranslationDomain.find_or_create(url)
     Tr8n::Cache.fetch("translation_source_#{translation_domain.id}_#{source}") do 
       translation_source = where("source = ? and translation_domain_id = ?", source, translation_domain.id).first

data/app/models/tr8n/translation_source_language.rb

@@ -0,0 +1,39 @@
+#--
+# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
+class Tr8n::TranslationSourceLanguage < ActiveRecord::Base
+  set_table_name :tr8n_translation_source_languages
+
+  belongs_to  :translation_source,  :class_name => "Tr8n::TranslationSource"
+  belongs_to  :language,  :class_name => "Tr8n::Language"
+  
+  def self.find_or_create(translation_source, language = Tr8n::Config.current_language)
+    source_lang = where("translation_source_id = ? and language_id = ?", translation_source.id, language.id).first
+    source_lang ||= create(:translation_source => translation_source, :language => language)
+  end  
+  
+  def self.touch(translation_source, language = Tr8n::Config.current_language)
+    find_or_create(translation_source, language).touch
+  end
+  
+end

data/app/models/tr8n/translator.rb

@@ -23,8 +23,6 @@
 
 class Tr8n::Translator < ActiveRecord::Base
   set_table_name :tr8n_translators
-  after_save      :clear_cache
-  after_destroy   :clear_cache
 
   belongs_to :user, :class_name => Tr8n::Config.user_class_name, :foreign_key => :user_id
   
@@ -46,10 +44,7 @@ class Tr8n::Translator < ActiveRecord::Base
     return nil unless user and user.id 
     return nil if Tr8n::Config.guest_user?(user)
     return user if user.is_a?(Tr8n::Translator)
-    
-    Tr8n::Cache.fetch("translator_for_#{user.id}") do 
-      find_by_user_id(user.id)
-    end
+    find_by_user_id(user.id)
   end
   
   def self.find_or_create(user)
@@ -123,7 +118,7 @@ class Tr8n::Translator < ActiveRecord::Base
 
   def switched_language!(language)
     lu = Tr8n::LanguageUser.create_or_touch(user || self, language)
-    lu.update_attributes(:translator => self) unless lu.translator
+    lu.update_attributes(:translator_id => self.id) unless lu.translator
     Tr8n::TranslatorLog.log(self, :switched_language, language.id)
   end
 
@@ -305,10 +300,6 @@ class Tr8n::Translator < ActiveRecord::Base
 #    update_attributes(:last_ip => new_ip, :country_code => (ipl? ? ipl.ctry : nil))
   end
 
-  def clear_cache
-    Tr8n::Cache.delete("translator_for_#{user_id}")
-  end
-
   def to_s
     name
   end

data/app/views/tr8n/common/_language_strip.html.erb

@@ -22,7 +22,7 @@
 			      </span> 
 					</span>
 				<% else %>
-		      <%=link_to("&raquo;".html_safe, :controller => "/tr8n/language", :action => :table) %>
+		      <%=link_to("&raquo;".html_safe, "/tr8n/language/table") %>
 				<% end %>	
     <% end %> 
   </div>

data/app/views/tr8n/common/_scripts.html.erb

@@ -13,11 +13,10 @@
     <%=javascript_include_tag(Tr8n::Config.effects_library_path) -%>
 	<% end %>
 	
-  <% if Tr8n::Config.enable_google_suggestions? and Tr8n::Config.current_user_is_translator? %>
-    <script type="text/javascript" src="<%=request.ssl? ? 'https' : 'http' %>://www.google.com/jsapi"></script>
+  <% if Tr8n::Config.enable_google_suggestions? and Tr8n::Config.current_user_is_translator? %>  
     <script type="text/javascript">
-       initializeTr8nGoogleSuggestions();
-    </script>
+			Tr8n.google_api_key = "<%=Tr8n::Config.google_api_key %>";
+		</script>
   <% end %>
 
   <% if Tr8n::Config.enable_software_keyboard? %>

data/app/views/tr8n/help/lb_shortcuts.html.erb

@@ -1,26 +1,27 @@
-<div style="text-align:center; margin-bottom:25px;">
-  <h2><%=trl("Tr8n Translation Engine Shortcuts", "Help shortcuts title")%></h2>
-  
-	<div style="overflow:auto;max-height:450px;">
-		<table style="width:100%" celppading="0px" cellspacing="0px">
-			<tr>
-				<td style="font-size:12px; font-weight:bold; padding:5px; border-bottom:1px solid #ccc; text-align:left;">Keys</td>
-		    <td style="font-size:12px; font-weight:bold; padding:5px; border-bottom:1px solid #ccc; text-align:left;">Description</td>
-			</tr>
+<div class="inner">
+	<div class="hd">
+		<span style="float:right;">
+			<%=link_to_function(image_tag("tr8n/close.gif"), "tr8nLightbox.hide();")%>
+		</span>
+		<%=trl("Tr8n Translation Engine Shortcuts")%>
+	</div>
+
+	<div class="bd" style="background-color:white;">
+		<div style="overflow:auto;max-height:450px;">
+			<table style="width:100%" celppading="0px" cellspacing="0px">
+				<tr>
+					<td style="font-size:12px; font-weight:bold; padding:5px; border-bottom:1px solid #ccc; text-align:left;"><%=trl("Key", "Shortcut key combination")%></td>
+			    <td style="font-size:12px; font-weight:bold; padding:5px; border-bottom:1px solid #ccc; text-align:left;"><%=trl("Description", "Shortcut key description")%></td>
+				</tr>
 			
-		  <% Tr8n::Config.default_shortcuts.keys.sort.each do |key| %>
-			   <tr>
-			   	 <td style="font-size:10px; padding:5px;border-bottom:1px dotted #ccc; text-align:left;"><%=key%></td>
-		       <td style="font-size:10px; padding:5px;border-bottom:1px dotted #ccc; text-align:left;"><%=Tr8n::Config.default_shortcuts[key][:description]%></td>
-			   </tr>
-			<% end %>       
+			  <% Tr8n::Config.default_shortcuts.keys.sort.each do |key| %>
+				   <tr>
+				   	 <td style="font-size:10px; padding:5px;border-bottom:1px dotted #ccc; text-align:left;"><%=key%></td>
+			       <td style="font-size:10px; padding:5px;border-bottom:1px dotted #ccc; text-align:left;"><%=Tr8n::Config.default_shortcuts[key][:description]%></td>
+				   </tr>
+				<% end %>       
 			
-		</table>
+			</table>
+		</div>
 	</div>
 </div>
-
-<div class="buttons_container" style="text-align:center;">
-    <button type="submit" class="translator_btn translator_submit_btn" onClick="tr8nLightbox.hide(); return false;">
-        <span><%=trl("Close", "Lightbox close button")%></span>
-    </button>
-</div>