socialcast-i18n-js 4.0.0.rc1 → 4.0.0.rc2

data/lib/i18n/js/version.rb

@@ -4,7 +4,7 @@ module I18n
       MAJOR = 4
       MINOR = 0
       PATCH = 0
-      STRING = "#{MAJOR}.#{MINOR}.#{PATCH}.rc1"
+      STRING = "#{MAJOR}.#{MINOR}.#{PATCH}.rc2"
     end
   end
 end

data/vendor/assets/javascripts/i18n/translations.js.erb

@@ -1,9 +1,8 @@
-<%# encoding: utf-8%>
-
-<% SimplesIdeias::I18n.assert_usable_configuration! %>
-var I18n = I18n || {};
-I18n.translations = <%=
-  SimplesIdeias::I18n.translation_segments.each_with_object({}) do |(name, segment),translations|
-    translations.merge!(segment)
-  end.to_json
-%>;
+//= require i18n
+<%#encoding: utf-8 %>
+<% translations = I18n::Js::Translator.new(I18n::Js.config[:only]).translations %>
+<% current_locale = __FILE__[/translation\-(\w*)/, 1] %>
+<% default_locale = Rails.application.config.i18n.default_locale %>
+<% scoped_translation = translations.select { |locale, value| [nil, locale.to_s].include?(current_locale) } %>
+<% scoped_translation = { current_locale.to_sym => translations[default_locale.to_sym].deep_merge(scoped_translation[current_locale.to_sym])} unless current_locale == default_locale %>
+;I18n.translations = <%= scoped_translation.to_json %>;