lib/i18n_screwdriver.rb in i18n_screwdriver-10.7.2 vs lib/i18n_screwdriver.rb in i18n_screwdriver-12.0.0

- old
+ new

@@ -137,11 +137,11 @@ next puts "WARNING: gem #{name} not loaded, so it cannot be scanned for translations!" unless spec gather_ruby_translations(spec.full_gem_path, texts, symbols) gather_js_translations(spec.full_gem_path, texts) end - translations = Hash[texts.uniq.map{ |text| [generate_key(text), extract_text(text)] }] + translations = Hash[texts.uniq.map{ |text| [generate_key(text), text] }] translations.merge(Hash[symbols.uniq.map{ |symbol| [generate_key(symbol), ""] }]) end def self.default_locale @default_locale ||= begin @@ -174,15 +174,10 @@ hash.each{ |k, v| new_hash[k.to_s] = v.to_s } end end def self.translate(string, **options) - I18n.translate!(generate_key(string), **options) + I18n.translate!(generate_key(string), **options).split("|").last rescue I18n::MissingTranslationData I18n.translate(string, **options) - end - - def self.extract_text(string) - namespace, text = string.split("|", 2) - text ? text : namespace end end