tr8n 3.2.0 → 3.2.1

data/app/models/tr8n/language_case.rb

@@ -32,14 +32,32 @@ class Tr8n::LanguageCase < ActiveRecord::Base
   
   serialize :definition
   
+  def self.cache_key(locale, keyword)
+    "language_case_#{locale}_#{keyword}"
+  end
+
+  def cache_key
+    self.class.cache_key(language.locale, keyword)
+  end
+
+  def self.by_keyword(keyword, language = Tr8n::Config.current_language)
+    Tr8n::Cache.fetch(cache_key(language.locale, keyword)) do 
+      where(:language_id => language.id, :keyword => keyword).first
+    end
+  end
+
   def self.by_id(case_id)
     Tr8n::Cache.fetch("language_case_#{case_id}") do 
       find_by_id(case_id)
     end
   end
-  
-  def self.by_language(language)
-    find(:all, :conditions => ["language_id = ?", language.id])
+
+  def add_rule(definition, opts = {})
+    opts[:position] ||= language_case_rules.count
+    opts[:translator] ||= Tr8n::Config.current_translator
+    Tr8n::LanguageCaseRule.create(:language_case => self,           :language => language, 
+                                  :translator => opts[:translator], :position => opts[:position], 
+                                  :definition => definition)
   end
 
   def rules
@@ -70,7 +88,10 @@ class Tr8n::LanguageCase < ActiveRecord::Base
     destroy
   end
 
-  def apply(object, value, options)
+  def apply(object, value, options = {})
+    value = value.to_s
+    # pp value
+    
     html_tag_expression = /<\/?[^>]*>/
     html_tokens = value.scan(html_tag_expression).uniq
     sanitized_value = value.gsub(html_tag_expression, "")
@@ -86,18 +107,15 @@ class Tr8n::LanguageCase < ActiveRecord::Base
       value = value.gsub(html_token, "{$#{index}}")
     end
     
-#    pp words
+    # pp words
     words.each do |word|
       lcvm = Tr8n::LanguageCaseValueMap.by_language_and_keyword(language, word)
       
       if lcvm
-        # first see if there is an exception for the value
         map_case_value = lcvm.value_for(object, keyword)
         case_value = map_case_value unless map_case_value.blank?
       else
-        # try evaluating the rules
-        case_rule = evaluate_rules(object, word)
-#        pp case_rule, word
+        case_rule = rules.detect{|rule| rule.evaluate(object, word)}
         case_value = case_rule.apply(word) if case_rule  
       end
 
@@ -112,13 +130,6 @@ class Tr8n::LanguageCase < ActiveRecord::Base
     value
   end
 
-  def evaluate_rules(object, value)
-    rules.each do |rule|
-      return rule if rule.evaluate(object, value)
-    end
-    nil
-  end
-
   def decorate_language_case(case_map_key, case_value, case_rule, options = {})
     return case_value if options[:skip_decorations]
     return case_value if language.default?

data/app/models/tr8n/language_case_rule.rb

@@ -29,13 +29,26 @@ class Tr8n::LanguageCaseRule < ActiveRecord::Base
   belongs_to :translator,     :class_name => "Tr8n::Translator"   
   
   serialize :definition
-  
+
+  def definition
+    @indifferent_def ||= HashWithIndifferentAccess.new(super)
+  end
+
+  def self.cache_key(id)
+    "language_case_rule_#{id}"
+  end
+
+  def cache_key
+    self.class.cache_key(id)
+  end
+
+  # TODO: what is this for?
   def self.by_id(id)
-    Tr8n::Cache.fetch("language_case_rule_#{id}") do 
+    Tr8n::Cache.fetch(cache_key(id)) do 
       find_by_id(id)
     end
   end
-  
+
   def self.gender_options
     [["not applicable", "none"], ["unknown", "unknown"], ["male", "male"], ["female", "female"]]
   end
@@ -60,7 +73,9 @@ class Tr8n::LanguageCaseRule < ActiveRecord::Base
   end
 
   def evaluate(object, value)
-    if definition["gender"] != "none"
+    value = value.to_s
+
+    if ["male", "female", "unknown", "neutral"].include?(definition["gender"])
       object_gender = Tr8n::GenderRule.gender_token_value(object)
       return false if definition["gender"] == "male"    and object_gender != Tr8n::GenderRule.gender_object_value_for("male")
       return false if definition["gender"] == "female"  and object_gender != Tr8n::GenderRule.gender_object_value_for("female")
@@ -74,12 +89,12 @@ class Tr8n::LanguageCaseRule < ActiveRecord::Base
       return false if definition["operator"] == "or"  and !(result1 or result2)
     end  
     
-    return result1
+    result1
   end
   
   def evaluate_part(token_value, index)
     values = sanitize_values(definition["value#{index}"])
-    
+
     case definition["part#{index}"]
       when "starts_with" 
         values.each do |value|
@@ -111,6 +126,8 @@ class Tr8n::LanguageCaseRule < ActiveRecord::Base
   end
   
   def apply(value)
+    value = value.to_s
+
     values = sanitize_values(definition["value1"])
     regex = values.join('|')
     case definition["operation"]
@@ -156,7 +173,7 @@ class Tr8n::LanguageCaseRule < ActiveRecord::Base
     desc << " token value"
     desc << describe_part(1)
   
-    if definition["multipart"] == "true"
+    if ["true", true].include?(definition["multipart"])
       desc << " " << definition["operator"]
       desc << describe_part(2)
     end

data/app/models/tr8n/translation_key.rb

@@ -57,7 +57,7 @@ class Tr8n::TranslationKey < ActiveRecord::Base
       existing_key = where(:key => key).first
       
       unless existing_key
-        if options[:api] and (not Tr8n::Config.api[:allow_key_registration])
+        if options[:api]==:translate and (not Tr8n::Config.api[:allow_key_registration])
           raise Tr8n::KeyRegistrationException.new("Key registration through API is disabled!")  
         end
       end
@@ -92,7 +92,7 @@ class Tr8n::TranslationKey < ActiveRecord::Base
   end
 
   # for backwards compatibility only - new keys will be marked as such
-  def self.mark_as_admin(tkey, options)
+  def self.mark_as_admin(tkey, options = {})
     return if options[:skip_block_options]
     return unless Tr8n::Config.block_options[:admin]
     return if tkey.admin?
@@ -100,7 +100,7 @@ class Tr8n::TranslationKey < ActiveRecord::Base
   end
   
   # for backwards compatibility only - if locale is provided update it in the key
-  def self.update_default_locale(tkey, options)
+  def self.update_default_locale(tkey, options = {})
     return if options[:skip_block_options]
     return unless tkey.locale.blank?
     key_locale = Tr8n::Config.block_options[:default_locale] || Tr8n::Config.default_locale
@@ -109,34 +109,36 @@ class Tr8n::TranslationKey < ActiveRecord::Base
 
   # creates associations between the translation keys and sources
   # used for the site map and javascript support
-  def self.track_source(translation_key, options)
+  def self.track_source(translation_key, options = {})
 
-    # key source tracking or client sdk must be enabled for this to work
-    return unless Tr8n::Config.enable_key_source_tracking? or Tr8n::Config.enable_client_sdk?
+    # key source tracking must be enabled or request must come from an API (JavaScript) to get it registered with a source
+    if Tr8n::Config.enable_key_source_tracking? or options[:api] == :translate
 
-    # source can be passed into an individual key, or as a block or fall back on the controller/action
-    source = options[:source] || Tr8n::Config.block_options[:source] || Tr8n::Config.current_source
+      # source can be passed into an individual key, or as a block or fall back on the controller/action
+      source = options[:source] || Tr8n::Config.block_options[:source] || Tr8n::Config.current_source
 
-    # should never be blank
-    return if source.blank?
+      # should never be blank
+      return if source.blank?
 
-    # each page or component is identified by a translation source
-    translation_source = Tr8n::TranslationSource.find_or_create(source, options[:url])
+      # each page or component is identified by a translation source
+      translation_source = Tr8n::TranslationSource.find_or_create(source, options[:url])
 
-    # each key is associated with one or more sources
-    translation_key_source = Tr8n::TranslationKeySource.find_or_create(translation_key, translation_source)
+      # each key is associated with one or more sources
+      translation_key_source = Tr8n::TranslationKeySource.find_or_create(translation_key, translation_source)
+
+    end
 
     # for debugging purposes only - this will track the actual location of the key in the source
-    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])
-    translation_key_source.update_details!(options)
+    if 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])
+      translation_key_source.update_details!(options)
+    end
+
   end
   
   def self.generate_key(label, desc = "")
-    # TODO: there is something iffy going on with the strings from the hash
-    # without the extra ~ = the strings are not seen in the sqlite database - wtf?
     "#{Digest::MD5.hexdigest("#{label};;;#{desc}")}~"[0..-2]
   end
 

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

@@ -2,8 +2,15 @@
 
 	<%= tr8n_splash_screen_tag %>
 
+  <% if Tr8n::Config.enable_software_keyboard? %>
+    <script> 
+      VKI_default_layout = "<%=Tr8n::KeyboardMapping.current_1_49%>";
+    </script>     
+    <%=stylesheet_link_tag("tr8n/keyboard_1_49.css") -%>
+  <% end %>  
+
   <%=stylesheet_link_tag("tr8n/tr8n.css") -%>
-  <%=javascript_include_tag("tr8n/tr8n.js") -%>
+  <%=javascript_include_tag("tr8n/tr8n-compiled.js", :charset => "UTF-8") -%>
 
   <script type="text/javascript">
      initializeTr8n();
@@ -24,16 +31,7 @@
 		</script>
   <% end %>
 
-  <% if Tr8n::Config.enable_software_keyboard? %>
-	  <script> 
-		  VKI_default_layout = "<%=Tr8n::KeyboardMapping.current_1_36%>";
-		</script> 	  
-    <%=javascript_include_tag("tr8n/keyboard_1_36.js", :charset => "UTF-8") -%>
-    <%=stylesheet_link_tag("tr8n/keyboard_1_36.css") -%>
-  <% end %>  
-
   <% if Tr8n::Config.enable_keyboard_shortcuts? %>  
-    <%=javascript_include_tag("tr8n/shortcut.js", :charset => "UTF-8") -%>
     <script type="text/javascript">
        <% Tr8n::Config.default_shortcuts.each do |key, data| %>     	
 				  shortcut.add("<%=key%>", function() {

data/app/views/tr8n/language_cases/_manager_header.html.erb

@@ -1,16 +1,16 @@
 <div class="original_text">
   <div class="supplemental">
   	<% if @map.id %>
-      <%=link_to_function(image_tag("/tr8n/images/exclamation.png", :title=>trla("Report these language case values")), "tr8nLanguageCaseManager.reportCaseMap('#{@map.id}')")%>
+      <%=link_to_function(image_tag("tr8n/exclamation.png", :title=>trla("Report these language case values")), "tr8nLanguageCaseManager.reportCaseMap('#{@map.id}')")%>
 		<% end %>
     <%= tr8n_help_icon_tag %>
   </div>
   
   <div class="quiet small"><%=trl("Original Word")%></div>
   <div class="quote">
-    <%=image_tag("/tr8n/images/left_quote.png") %>
+    <%=image_tag("tr8n/left_quote.png") %>
     <%=@map.keyword %>
-    <%=image_tag("/tr8n/images/right_quote.png") %>
+    <%=image_tag("tr8n/right_quote.png") %>
   </div>
 </div>
 

data/app/views/tr8n/language_cases/manager.html.erb

@@ -2,12 +2,12 @@
 
 	<% if params[:stem_type] %>
 	  <% left_right = params[:stem_type].index("right") ? "right" : "left" %>  
-	  <%=image_tag("/tr8n/images/top_left_stem.png", :class => "stem #{params[:stem_type]}", :style => "#{left_right}:#{params[:stem_offset]}px")%>
+	  <%=image_tag("tr8n/top_left_stem.png", :class => "stem #{params[:stem_type]}", :style => "#{left_right}:#{params[:stem_offset]}px")%>
 	<% end %>  
 	
 	<div class="hd">
 	  <div class="supplemental">
-	    <%=link_to_function(image_tag("/tr8n/images/close.gif", :title=>trl("Close")), "tr8nLanguageCaseManager.hide()")%>
+	    <%=link_to_function(image_tag("tr8n/close.gif", :title=>trl("Close")), "tr8nLanguageCaseManager.hide()")%>
 	  </div>
 	  <%= tr8n_language_flag_tag(tr8n_current_language) %>
 	  <%= trla("{language} Language Cases", nil, :language => tr8n_current_language.native_name) %>

data/app/views/tr8n/translations/_original_phrase.html.erb

@@ -1,7 +1,7 @@
 <% color = translation.key.locked? ? "#ECFFEF" : "#FDFDDF" %>
 <div style="font-size: 11px; color: grey; margin-top:5px; margin-bottom:5px; padding:3px; background:<%=color%>; border:1px dotted #ccc;">
   <% if translation.key.locked? %>
-    <div style="float:right"><%=image_tag("/tr8n/images/lock.png", :style=>"width:12px", :title => trla("This phrase is locked"))%></div>
+    <div style="float:right"><%=image_tag("tr8n/lock.png", :style=>"width:12px", :title => trla("This phrase is locked"))%></div>
   <% end %>
 
   <%=tra("Original Phrase:", "Translation section header")%> <%=link_to(translation.key.sanitized_label, :controller => "/tr8n/phrases", :action => :view, :locale => translation.language.locale, :translation_key_id => translation.key.id) %>

data/lib/tr8n/extensions/action_view_extension.rb

@@ -89,7 +89,8 @@ module Tr8n
 
         client_var_name = opts[:client_var_name] || :tr8nProxy
 
-        html = [javascript_include_tag("tr8n/tr8n_client_sdk.js")]
+        html = []
+        # html << [javascript_include_tag("tr8n/tr8n_client_sdk.js")]
         html << "<script>"
         html << "  var #{client_var_name} = new Tr8n.Proxy(#{opts.to_json});"
         html << "  function reloadTranslations() { "
@@ -101,6 +102,12 @@ module Tr8n
         html << "  function trl(label, description, tokens, options) { "
         html << "    return #{client_var_name}.trl(label, description, tokens, options); "
         html << "  } "
+
+        # TODO: check if TML is enabled
+        html << "  Tr8n.Utils.addEvent(window, 'load', function() { "
+        html << "    #{client_var_name}.initTml(); "                               
+        html << "  }) "                              
+
         html << "</script>"
         html.join("\n").html_safe
       end

data/lib/tr8n/keyboard_mapping.rb

@@ -172,5 +172,106 @@ module Tr8n
     
       return "US International"
     end    
+
+    def self.current_1_49
+      [
+        {:key => '\u0627\u0644\u0639\u0631\u0628\u064a\u0629', :name => 'Arabic', :locale => ''},
+        {:key => '\u0985\u09b8\u09ae\u09c0\u09df\u09be', :name => 'Assamese', :locale => ''},
+        {:key => '\u0410\u0437\u04d9\u0440\u0431\u0430\u0458\u04b9\u0430\u043d\u04b9\u0430', :name => 'Azerbaijani Cyrillic', :locale => ''},
+        {:key => 'Az\u0259rbaycanca', :name => 'Azerbaijani Latin', :locale => ''},
+        {:key => '\u0411\u0435\u043b\u0430\u0440\u0443\u0441\u043a\u0430\u044f', :name => 'Belarusian', :locale => ''},
+        {:key => 'Belgische / Belge', :name => 'Belgian', :locale => ''},
+        {:key => '\u0411\u044a\u043b\u0433\u0430\u0440\u0441\u043a\u0438 \u0424\u043e\u043d\u0435\u0442\u0438\u0447\u0435\u043d', :name => 'Bulgarian Phonetic', :locale => ''},
+        {:key => '\u0411\u044a\u043b\u0433\u0430\u0440\u0441\u043a\u0438', :name => 'Bulgarian BDS', :locale => ''},
+        {:key => '\u09ac\u09be\u0982\u09b2\u09be', :name => 'Bengali', :locale => ''},
+        {:key => 'Bosanski', :name => 'Bosnian', :locale => ''},
+        {:key => 'Canadienne-fran\u00e7aise', :name => 'Canadian French', :locale => ''},
+        {:key => '\u010cesky', :name => 'Czech', :locale => ''},
+        {:key => 'Dansk', :name => 'Danish', :locale => ''},
+        {:key => 'Deutsch', :name => 'German', :locale => ''},
+        {:key => 'Dingbats', :name => 'Dingbats', :locale => ''},
+        {:key => '\u078b\u07a8\u0788\u07ac\u0780\u07a8\u0784\u07a6\u0790\u07b0', :name => 'Divehi', :locale => ''},
+        {:key => 'Dvorak', :name => 'Dvorak', :locale => ''},
+        {:key => '\u0395\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac', :name => 'Greek', :locale => ''},
+        {:key => 'Eesti', :name => 'Estonian', :locale => ''},
+        {:key => 'Espa\u00f1ol', :name => 'Spanish', :locale => ''},
+        {:key => '\u062f\u0631\u06cc', :name => 'Dari', :locale => ''},
+        {:key => '\u0641\u0627\u0631\u0633\u06cc', :name => 'Farsi', :locale => ''},
+        {:key => 'F\u00f8royskt', :name => 'Faeroese', :locale => ''},
+        {:key => 'Fran\u00e7ais', :name => 'French', :locale => ''},
+        {:key => 'Gaeilge', :name => 'Irish / Gaelic', :locale => ''},
+        {:key => '\u0a97\u0ac1\u0a9c\u0ab0\u0abe\u0aa4\u0ac0', :name => 'Gujarati', :locale => ''},
+        {:key => '\u05e2\u05d1\u05e8\u05d9\u05ea', :name => 'Hebrew', :locale => ''},
+        {:key => '\u0926\u0947\u0935\u0928\u093e\u0917\u0930\u0940', :name => 'Devanagari', :locale => ''},
+        {:key => '\u0939\u093f\u0902\u0926\u0940', :name => 'Hindi', :locale => ''},
+        {:key => 'Hrvatski', :name => 'Croatian', :locale => ''},
+        {:key => '\u0540\u0561\u0575\u0565\u0580\u0565\u0576 \u0561\u0580\u0565\u0582\u0574\u0578\u0582\u057f\u0584', :name => 'Western Armenian', :locale => ''},
+        {:key => '\u0540\u0561\u0575\u0565\u0580\u0565\u0576 \u0561\u0580\u0565\u0582\u0565\u056c\u0584', :name => 'Eastern Armenian', :locale => ''},
+        {:key => '\u00cdslenska', :name => 'Icelandic', :locale => ''},
+        {:key => 'Italiano', :name => 'Italian', :locale => ''},
+        {:key => '\u65e5\u672c\u8a9e', :name => 'Japanese Hiragana/Katakana', :locale => ''},
+        {:key => '\u10e5\u10d0\u10e0\u10d7\u10e3\u10da\u10d8', :name => 'Georgian', :locale => ''},
+        {:key => '\u049a\u0430\u0437\u0430\u049b\u0448\u0430', :name => 'Kazakh', :locale => ''},
+        {:key => '\u1797\u17b6\u179f\u17b6\u1781\u17d2\u1798\u17c2\u179a', :name => 'Khmer', :locale => ''},
+        {:key => '\u0c95\u0ca8\u0ccd\u0ca8\u0ca1', :name => 'Kannada', :locale => ''},
+        {:key => '\ud55c\uad6d\uc5b4', :name => 'Korean', :locale => ''},
+        {:key => 'Kurd\u00ee', :name => 'Kurdish', :locale => ''},
+        {:key => '\u041a\u044b\u0440\u0433\u044b\u0437\u0447\u0430', :name => 'Kyrgyz', :locale => ''},
+        {:key => 'Latvie\u0161u', :name => 'Latvian', :locale => ''},
+        {:key => 'Lietuvi\u0173', :name => 'Lithuanian', :locale => ''},
+        {:key => 'Magyar', :name => 'Hungarian', :locale => ''},
+        {:key => 'Malti', :name => 'Maltese 48', :locale => ''},
+        {:key => '\u041c\u0430\u043a\u0435\u0434\u043e\u043d\u0441\u043a\u0438', :name => 'Macedonian Cyrillic', :locale => ''},
+        {:key => '\u0d2e\u0d32\u0d2f\u0d3e\u0d33\u0d02', :name => 'Malayalam', :locale => ''},
+        {:key => 'Misc. Symbols', :name => 'Misc. Symbols', :locale => ''},
+        {:key => '\u041c\u043e\u043d\u0433\u043e\u043b', :name => 'Mongolian Cyrillic', :locale => ''},
+        {:key => '\u092e\u0930\u093e\u0920\u0940', :name => 'Marathi', :locale => ''},
+        {:key => '\u1019\u103c\u1014\u103a\u1019\u102c\u1018\u102c\u101e\u102c', :name => 'Burmese', :locale => ''},
+        {:key => 'Nederlands', :name => 'Dutch', :locale => ''},
+        {:key => 'Norsk', :name => 'Norwegian', :locale => ''},
+        {:key => '\u067e\u069a\u062a\u0648', :name => 'Pashto', :locale => ''},
+        {:key => '\u0a2a\u0a70\u0a1c\u0a3e\u0a2c\u0a40', :name => 'Punjabi (Gurmukhi)', :locale => ''},
+        {:key => '\u62fc\u97f3 (Pinyin)', :name => 'Pinyin', :locale => ''},
+        {:key => 'Polski', :name => 'Polish (214)', :locale => ''},
+        {:key => 'Polski Programisty', :name => 'Polish Programmers', :locale => ''},
+        {:key => 'Portugu\u00eas Brasileiro', :name => 'Portuguese (Brazil)', :locale => ''},
+        {:key => 'Portugu\u00eas', :name => 'Portuguese', :locale => ''},
+        {:key => 'Rom\u00e2n\u0103', :name => 'Romanian', :locale => ''},
+        {:key => '\u0420\u0443\u0441\u0441\u043a\u0438\u0439', :name => 'Russian', :locale => ''},
+        {:key => 'Schweizerdeutsch', :name => 'Swiss German', :locale => ''},
+        {:key => 'Shqip', :name => 'Albanian', :locale => ''},
+        {:key => 'Sloven\u010dina', :name => 'Slovak', :locale => ''},
+        {:key => 'Sloven\u0161\u010dina', :name => 'Slovenian', :locale => ''},
+        {:key => '\u0441\u0440\u043f\u0441\u043a\u0438', :name => 'Serbian Cyrillic', :locale => ''},
+        {:key => 'Srpski', :name => 'Serbian Latin', :locale => ''},
+        {:key => 'Suomi', :name => 'Finnish', :locale => ''},
+        {:key => 'Svenska', :name => 'Swedish', :locale => ''},
+        {:key => 'Swiss Fran\u00e7ais', :name => 'Swiss French', :locale => ''},
+        {:key => '\u0723\u0718\u072a\u071d\u071d\u0710', :name => 'Syriac', :locale => ''},
+        {:key => '\u0ba4\u0bae\u0bbf\u0bb4\u0bcd', :name => 'Tamil', :locale => ''},
+        {:key => '\u0c24\u0c46\u0c32\u0c41\u0c17\u0c41', :name => 'Telugu', :locale => ''},
+        {:key => 'Ti\u1ebfng Vi\u1ec7t', :name => 'Vietnamese', :locale => ''},
+        {:key => '\u0e44\u0e17\u0e22 Kedmanee', :name => 'Thai Kedmane', :locale => ''},
+        {:key => '\u0e44\u0e17\u0e22 Pattachote', :name => 'Thai Pattachote', :locale => ''},
+        {:key => '\u0422\u0430\u0442\u0430\u0440\u0447\u0430', :name => 'Tatar', :locale => ''},
+        {:key => 'T\u00fcrk\u00e7e F', :name => 'Turkish F', :locale => ''},
+        {:key => 'T\u00fcrk\u00e7e Q', :name => 'Turkish Q', :locale => ''},
+        {:key => '\u0423\u043a\u0440\u0430\u0457\u043d\u0441\u044c\u043a\u0430', :name => 'Ukrainian', :locale => ''},
+        {:key => 'United Kingdom', :name => 'United Kingdom', :locale => ''},
+        {:key => '\u0627\u0631\u062f\u0648', :name => 'Urdu', :locale => ''},
+        {:key => '\u0627\u0631\u062f\u0648 Phonetic', :name => 'Urdu Phonetic', :locale => ''},
+        {:key => 'US Standard', :name => 'US Standard', :locale => ''},
+        {:key => 'US International', :name => 'US International', :locale => ''},
+        {:key => '\u040e\u0437\u0431\u0435\u043a\u0447\u0430', :name => 'Uzbek Cyrillic', :locale => ''},
+        {:key => '\u05d9\u05d9\u05b4\u05d3\u05d9\u05e9', :name => 'Yiddish', :locale => ''},
+        {:key => '\u05d9\u05d9\u05b4\u05d3\u05d9\u05e9 \u05dc\u05e2\u05d1\u05d8', :name => 'Yiddish (Yidish Lebt)', :locale => ''},
+        {:key => '\u4e2d\u6587\u6ce8\u97f3\u7b26\u53f7', :name => 'Chinese Bopomofo IME', :locale => ''},
+        {:key => '\u4e2d\u6587\u4ed3\u9889\u8f93\u5165\u6cd5', :name => 'Chinese Cangjie IME', :locale => ''}
+      ].each do |kb|
+        return kb[:key] if kb[:name].index(Tr8n::Config.current_language.english_name.split(" ").first)
+      end
+    
+      return "US International"
+    end    
   end
 end

data/lib/tr8n/token.rb

@@ -201,7 +201,7 @@ module Tr8n
           value = ERB::Util.html_escape(value)
         end
       end
-    
+
       if has_case_key?
         value = apply_case(object, value, options, language)
       end
@@ -402,7 +402,6 @@ module Tr8n
     end
   
     def substitute(label, values = {}, options = {}, language = Tr8n::Config.current_language)
-    
       # get the object from the values
       object = values[name_key]