tolk 1.3.1 → 1.3.2

data/app/helpers/tolk/application_helper.rb

@@ -1,7 +1,7 @@
 module Tolk
   module ApplicationHelper
     def format_i18n_value(value)
-      h(yaml_value(value)).gsub(/\n/, '<br />')
+      h(yaml_value(value)).gsub(/\n/, '<br />').html_safe
     end
 
     def format_i18n_text_area_value(value)

data/app/views/tolk/locales/show.html.erb

@@ -33,7 +33,7 @@
               <% if params[:q].present? -%>
                 <%= highlight(format_i18n_value(phrase.translations.primary.text), params[:q]) -%>
               <% else -%>
-                <%= format_i18n_value(phrase.translations.primary.text).html_safe -%>
+                <%= format_i18n_value(phrase.translations.primary.text) -%>
               <% end -%>
               <span class="key" title="<%= phrase.key %>"><%= truncate(phrase.key, :length => 100) %></span>
             </td>

data/lib/tolk/import.rb

@@ -22,6 +22,7 @@ module Tolk
       def import_locale(locale_name)
         locale = Tolk::Locale.find_or_create_by_name(locale_name)
         data = locale.read_locale_file
+        return unless data
 
         phrases = Tolk::Phrase.all
         count = 0
@@ -46,7 +47,14 @@ module Tolk
       locale_file = "#{self.locales_config_path}/#{self.name}.yml"
       raise "Locale file #{locale_file} does not exists" unless File.exists?(locale_file)
 
-      self.class.flat_hash(YAML::load(IO.read(locale_file))[self.name])
+      puts "[INFO] Reading #{locale_file} for locale #{self.name}"
+      begin
+        self.class.flat_hash(YAML::load(IO.read(locale_file))[self.name])
+      rescue
+        puts "[ERROR] File #{locale_file} expected to declare #{self.name} locale, but it does not. Skipping this file."
+        nil
+      end
+
     end
 
   end

data/lib/tolk/version.rb

@@ -1,3 +1,3 @@
 module Tolk
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tolk
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-07 00:00:00.000000000 Z
+date: 2012-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: will_paginate
@@ -91,10 +91,7 @@ files:
 - app/views/tolk/searches/show.html.erb
 homepage: http://github.com/tolk/tolk
 licenses: []
-post_install_message: ! "##################################\n# Tolk, if upgrading
-  from pre-1.3.\n##################################\n  - A configuration file is now
-  available, run tolk:setup.\n  - Mapping has been updated, use update_locale rake
-  task if necessary."
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib